implemented pretty printer for (mutual) (co)inductive types

[helm.git] / helm / matita / matitaTypes.ml

diff --git a/helm/matita/matitaTypes.ml b/helm/matita/matitaTypes.ml
index 70f912ae08fd586abe7fad584cdcfb4845010886..cd9d34f0852e5fe9d9f3f327b5597199eb1da307 100644 (file)
--- a/helm/matita/matitaTypes.ml
+++ b/helm/matita/matitaTypes.ml
@@ -35,6 +35,10 @@ let debug_print s =
 
 exception No_proof  (** no current proof is available *)
 
+exception Cancel
+exception Unbound_identifier of string
+
+(*
 let untitled_con_uri = UriManager.uri_of_string "cic:/untitled.con"
 let untitled_def_uri = UriManager.uri_of_string "cic:/untitled.ind"
 
@@ -42,6 +46,8 @@ let unopt_uri ?(kind = `Con) = function
   | Some uri -> uri
   | None ->
       (match kind with `Con -> untitled_con_uri | `Def -> untitled_def_uri)
+*)
+let unopt_uri = function Some uri -> uri | None -> assert false
 
 class type parserr =  (* "parser" is a keyword :-( *)
   object
@@ -68,27 +74,38 @@ class type disambiguator =
       ?context:Cic.context -> ?metasenv:Cic.metasenv ->
       ?env:DisambiguateTypes.environment ->
         char Stream.t ->
-          (DisambiguateTypes.environment * Cic.metasenv * Cic.term)
+          (DisambiguateTypes.environment * Cic.metasenv * Cic.term * CicUniv.universe_graph)
       (** @param env @see disambiguateTerm above *)
     method disambiguateTermAst:
       ?context:Cic.context -> ?metasenv:Cic.metasenv ->
       ?env:DisambiguateTypes.environment ->
         DisambiguateTypes.term ->
-          (DisambiguateTypes.environment * Cic.metasenv * Cic.term)
+          (DisambiguateTypes.environment * Cic.metasenv * Cic.term * CicUniv.universe_graph) 
   end
 
-type hist_metadata =
-  Cic.annobj *
-  (Cic.id, Cic.term) Hashtbl.t *
-  (Cic.id, Cic.id option) Hashtbl.t *
-  (Cic.id, string) Hashtbl.t *
-  (Cic.id, Cic2acic.anntypes) Hashtbl.t *
-  (Cic.id, Cic.conjecture) Hashtbl.t *
-  (Cic.id, Cic.hypothesis) Hashtbl.t
+(*
+type sequents_metadata =
+  (int *                                  (** sequent (meta) index *)
+    (Cic.annconjecture *                    (** annotated conjecture *)
+    (Cic.id, Cic.term) Hashtbl.t *          (** ids_to_terms *)
+    (Cic.id, Cic.id option) Hashtbl.t *     (** ids_to_father_ids *)
+    (Cic.id, string) Hashtbl.t *            (** ids_to_inner_sorts *)
+    (Cic.id, Cic.hypothesis) Hashtbl.t))    (** ids_to_hypotheses *)
+      list
+type proof_metadata =
+  Cic.annobj *                             (** annotated object    *)
+  (Cic.id, Cic.term) Hashtbl.t *            (** ids_to_terms        *)
+  (Cic.id, Cic.id option) Hashtbl.t *       (** ids_to_father_ids   *)
+  (Cic.id, string) Hashtbl.t *              (** ids_to_inner_sorts  *)
+  (Cic.id, Cic2acic.anntypes) Hashtbl.t *   (** ids_to_inner_types  *)
+  (Cic.id, Cic.conjecture) Hashtbl.t *      (** ids_to_conjectures  *)
+  (Cic.id, Cic.hypothesis) Hashtbl.t        (** ids_to_hypotheses   *)
+type hist_metadata = proof_metadata * sequents_metadata
+*)
 
 class type proof =
   object
-    inherit [hist_metadata] StatefulProofEngine.status
+    inherit [unit] StatefulProofEngine.status
 
     (** return a pair of "xml" (as defined in Xml module) representing the *
      * current proof type and body, respectively *)
@@ -98,7 +115,8 @@ class type proof =
 
 type proof_handler =
   { get_proof: unit -> proof; (* return current proof or fail *)
-    set_proof: proof option -> unit;  (* set a proof option as current proof *)
+    set_proof: proof option -> unit;
+    abort_proof: unit -> unit;(* abort current proof, cleaning up garbage *)
     has_proof: unit -> bool;  (* check if a current proof is available or not *)
     new_proof: proof -> unit; (* as a set_proof but takes care also to register
                               observers *)
@@ -108,13 +126,29 @@ type proof_handler =
   (** interpreter for toplevel phrases given via console *)
 class type interpreter =
   object
-    method evalPhrase: string -> unit
+    method reset: unit  (** return the interpreter to the initial state *)
+
+      (** parse a single phrase contained in the input string. Additional
+      * garbage at the end of the phrase is ignored
+      * @return true if no exception has been raised by the evaluation, false
+      * otherwise
+      *)
+    method evalPhrase: string -> bool
+
+      (** as above, evaluating a command/tactics AST *)
+    method evalAst: DisambiguateTypes.tactical -> bool
+
+      (** offset from the starting of the last string parser by evalPhrase where
+      * parsing stop.
+      * @raise Failure when no offset has been recorded *)
+    method endOffset: int
+
   end
 
 (** {2 MathML widgets} *)
 
 type mml_of_cic_sequent =
-  Cic.metasenv -> int * Cic.context * Cic.term ->
+  Cic.metasenv -> Cic.conjecture ->
     Gdome.document *
     ((Cic.id, Cic.term) Hashtbl.t *
     (Cic.id, Cic.id option) Hashtbl.t *
@@ -125,7 +159,13 @@ type mml_of_cic_object =
   (string, string) Hashtbl.t -> (string, Cic2acic.anntypes) Hashtbl.t ->
     Gdome.document
 
-  (** TODO Zack to be reviewed and unified with proof_viewer above *)
+class type proof_viewer =
+  object
+    inherit GMathViewAux.single_selection_math_view
+
+    method load_proof: StatefulProofEngine.proof_status -> unit
+  end
+
 class type sequent_viewer =
   object
     inherit GMathViewAux.multi_selection_math_view
@@ -139,17 +179,14 @@ class type sequent_viewer =
     method get_selected_hypotheses: Cic.hypothesis list
 
       (** load a sequent and render it into parent widget *)
-    method load_sequent: Cic.metasenv -> Cic.conjecture -> unit
+    method load_sequent: Cic.metasenv -> int -> unit
   end
 
-class type proof_viewer =
+class type sequents_viewer =
   object
-    inherit GMathViewAux.single_selection_math_view
-
-      (** @return the annotated cic term and the ids_to_inner_types and
-      * ids_to_inner_sorts maps *)
-    method load_proof: Gdome.document -> hist_metadata -> unit
-
+    method reset: unit
+    method load_sequents: Cic.metasenv -> unit
+    method goto_sequent: int -> unit  (* to be called _after_ load_sequents *)
   end
 
 (** {2 shorthands} *)