snapshot

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

diff --git a/helm/matita/matitaTypes.ml b/helm/matita/matitaTypes.ml
index 864e9604c3d9d853aeaea9c566813b77bc5fdd18..2811fd5d49ff1f61e0995604a6e13e5c6f8c715e 100644 (file)
--- a/helm/matita/matitaTypes.ml
+++ b/helm/matita/matitaTypes.ml
@@ -38,28 +38,10 @@ 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
@@ -95,23 +77,9 @@ class type disambiguator =
           (DisambiguateTypes.environment * Cic.metasenv * Cic.term)
   end
 
-class type proofStatus =
+class type proof =
   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
-
-      (** @raise MatitaTypes.No_proof *)
-    method status: ProofEngineTypes.status (* proof, goal *)
-    method setStatus: ProofEngineTypes.status -> unit
-
-      (** {3 actions} *)
+    inherit [unit] StatefulProofEngine.status
 
     (** return a pair of "xml" (as defined in Xml module) representing the *
      * current proof type and body, respectively *)
@@ -119,13 +87,6 @@ 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 *)
@@ -141,6 +102,49 @@ 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
+
+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 :
+     UriManager.uri -> Cic.obj ->
+      Cic.annobj * (Cic.id, Cic2acic.anntypes) Hashtbl.t *
+       (Cic.id, string) Hashtbl.t
+
+  end
+
 (** {2 shorthands} *)
 
 type namer = ProofEngineTypes.mk_fresh_name_type