X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaTypes.ml;h=70f912ae08fd586abe7fad584cdcfb4845010886;hb=06c2b37f3d7d4e14cabeef3b18211e5d12b9b4eb;hp=bfdb99904a05a7ba88c4d5dbef44e9fb49eeb151;hpb=cc465115cdeea9819f43a5ad219b07c4f928c43a;p=helm.git

diff --git a/helm/matita/matitaTypes.ml b/helm/matita/matitaTypes.ml
index bfdb99904..70f912ae0 100644
--- a/helm/matita/matitaTypes.ml
+++ b/helm/matita/matitaTypes.ml
@@ -29,40 +29,24 @@ let not_implemented feature = raise (Not_implemented feature)
   (** exceptions whose content should be presented to the user *)
 exception Failure of string
 let error s = raise (Failure s)
-let warning s = prerr_endline ("MATITA WARNING: " ^ s)
+let warning s = prerr_endline ("MATITA WARNING:\t" ^ s)
+let debug_print s =
+  if BuildTimeConf.debug then prerr_endline ("MATITA DEBUG:\t" ^ s)
 
 exception No_proof  (** no current proof is available *)
 
-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
+let untitled_con_uri = UriManager.uri_of_string "cic:/untitled.con"
+let untitled_def_uri = UriManager.uri_of_string "cic:/untitled.ind"
 
-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 =
@@ -75,12 +59,17 @@ class type disambiguator =
 
       (* TODO Zack: as long as matita doesn't support MDI inteface,
       * disambiguateTerm will return a single term *)
-      (** @param env defaults to self#env *)
+      (** @param env disambiguation environment. If this parameter is given the
+      * disambiguator act statelessly, that is internal disambiguation status
+      * want be changed but only returned. If this parameter is not given the
+      * internal one will be used and updated with the disambiguation status
+      * resulting from the disambiguation *)
     method disambiguateTerm:
       ?context:Cic.context -> ?metasenv:Cic.metasenv ->
       ?env:DisambiguateTypes.environment ->
         char Stream.t ->
           (DisambiguateTypes.environment * Cic.metasenv * Cic.term)
+      (** @param env @see disambiguateTerm above *)
     method disambiguateTermAst:
       ?context:Cic.context -> ?metasenv:Cic.metasenv ->
       ?env:DisambiguateTypes.environment ->
@@ -88,12 +77,87 @@ class type disambiguator =
           (DisambiguateTypes.environment * Cic.metasenv * Cic.term)
   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
+
+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 *)
+    method toXml: Xml.token Stream.t * Xml.token Stream.t
+    method toString: string
+  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 =
+  object
+    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
 
 type choose_uris_callback =
-  selection_mode:Gtk.Tags.selection_mode ->
+  selection_mode:[`MULTIPLE|`SINGLE] ->
   ?title:string -> ?msg:string -> ?nonvars_button:bool ->
   string list ->
     string list