snapshot

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

diff --git a/helm/matita/matitaTypes.ml b/helm/matita/matitaTypes.ml
index 27783ec675daab8b6732c9f113b2b3c9f3d6b0b1..70f912ae08fd586abe7fad584cdcfb4845010886 100644 (file)
--- a/helm/matita/matitaTypes.ml
+++ b/helm/matita/matitaTypes.ml
@@ -38,36 +38,15 @@ exception No_proof  (** no current proof is available *)
 let untitled_con_uri = UriManager.uri_of_string "cic:/untitled.con"
 let untitled_def_uri = UriManager.uri_of_string "cic:/untitled.ind"
 
-class type observer =
-  (* "observer" pattern *)
-  object
-    method update: unit -> unit
-  end
-
-class subject =
-  (* "observer" pattern *)
-  object
-    val mutable observers = []
-    method attach (o: observer) = observers <- o :: observers
-    method detach (o: observer) =
-      observers <- List.filter (fun o' -> o' != o) observers
-    method notify () = List.iter (fun o -> o#update ()) observers
-  end
-
-class type command =
-  (* "command" pattern *)
-  object
-    method execute: unit -> unit
-    method undo: unit -> unit
-  end
+let unopt_uri ?(kind = `Con) = function
+  | Some uri -> uri
+  | None ->
+      (match kind with `Con -> untitled_con_uri | `Def -> untitled_def_uri)
 
 class type parserr =  (* "parser" is a keyword :-( *)
   object
     method parseTerm:     char Stream.t -> DisambiguateTypes.term
-    method parseTactic:   char Stream.t -> DisambiguateTypes.tactic
     method parseTactical: char Stream.t -> DisambiguateTypes.tactical
-    method parseCommand:  char Stream.t -> DisambiguateTypes.command
-    method parseScript:   char Stream.t -> DisambiguateTypes.script
   end
 
 class type disambiguator =
@@ -98,23 +77,18 @@ class type disambiguator =
           (DisambiguateTypes.environment * Cic.metasenv * Cic.term)
   end
 
-class type proofStatus =
-  object
-    inherit subject
-
-      (** {3 properties} *)
-
-    method proof: ProofEngineTypes.proof
-    method setProof: ProofEngineTypes.proof -> unit
-
-    method goal: ProofEngineTypes.goal option
-    method setGoal: ProofEngineTypes.goal option -> unit
+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
 
-      (** @raise MatitaTypes.No_proof *)
-    method status: ProofEngineTypes.status (* proof, goal *)
-    method setStatus: ProofEngineTypes.status -> unit
-
-      (** {3 actions} *)
+class type proof =
+  object
+    inherit [hist_metadata] StatefulProofEngine.status
 
     (** return a pair of "xml" (as defined in Xml module) representing the *
      * current proof type and body, respectively *)
@@ -122,12 +96,14 @@ class type proofStatus =
     method toString: string
   end
 
-class type proof =
-  object
-      (** {3 status} *)
-    method status: proofStatus
-    method setStatus: proofStatus -> unit
-  end
+type proof_handler =
+  { get_proof: unit -> proof; (* return current proof or fail *)
+    set_proof: proof option -> unit;  (* set a proof option as current proof *)
+    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 *)
+    quit: unit -> unit
+  }
 
   (** interpreter for toplevel phrases given via console *)
 class type interpreter =
@@ -135,6 +111,47 @@ class type interpreter =
     method evalPhrase: string -> unit
   end
 
+(** {2 MathML widgets} *)
+
+type mml_of_cic_sequent =
+  Cic.metasenv -> int * Cic.context * Cic.term ->
+    Gdome.document *
+    ((Cic.id, Cic.term) Hashtbl.t *
+    (Cic.id, Cic.id option) Hashtbl.t *
+    (string, Cic.hypothesis) Hashtbl.t)
+
+type mml_of_cic_object =
+  explode_all:bool -> UriManager.uri -> Cic.annobj ->
+  (string, string) Hashtbl.t -> (string, Cic2acic.anntypes) Hashtbl.t ->
+    Gdome.document
+
+  (** TODO Zack to be reviewed and unified with proof_viewer above *)
+class type sequent_viewer =
+  object
+    inherit GMathViewAux.multi_selection_math_view
+
+      (** @return the list of selected terms. Selections which are not terms are
+      * ignored *)
+    method get_selected_terms: Cic.term list
+
+      (** @return the list of selected hypothese. Selections which are not
+      * hypotheses are ignored *)
+    method get_selected_hypotheses: Cic.hypothesis list
+
+      (** load a sequent and render it into parent widget *)
+    method load_sequent: Cic.metasenv -> Cic.conjecture -> unit
+  end
+
+class type proof_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
+
+  end
+
 (** {2 shorthands} *)
 
 type namer = ProofEngineTypes.mk_fresh_name_type