X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaTypes.ml;h=864e9604c3d9d853aeaea9c566813b77bc5fdd18;hb=4cf419a2e770f4971be7b03b1d73e585d973dc1b;hp=acae4c9dfe2d4d5cbd89da094823fb4c15a81d67;hpb=07dde6f87105c18b28fc784b7d596a5d242e1225;p=helm.git

diff --git a/helm/matita/matitaTypes.ml b/helm/matita/matitaTypes.ml
index acae4c9df..864e9604c 100644
--- a/helm/matita/matitaTypes.ml
+++ b/helm/matita/matitaTypes.ml
@@ -29,10 +29,14 @@ 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 *)
-exception No_choice (** no choice was made by the user *)
+
+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 *)
@@ -60,10 +64,7 @@ class type command =
 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 =
@@ -71,16 +72,73 @@ class type disambiguator =
     method parserr: parserr
     method setParserr: parserr -> unit
 
+    method env: DisambiguateTypes.environment
+    method setEnv: DisambiguateTypes.environment -> unit
+
+      (* TODO Zack: as long as matita doesn't support MDI inteface,
+      * disambiguateTerm will return a single term *)
+      (** @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 ->
+      ?context:Cic.context -> ?metasenv:Cic.metasenv ->
       ?env:DisambiguateTypes.environment ->
         char Stream.t ->
-          (DisambiguateTypes.environment * Cic.metasenv * Cic.term) list
+          (DisambiguateTypes.environment * Cic.metasenv * Cic.term)
+      (** @param env @see disambiguateTerm above *)
     method disambiguateTermAst:
-      context:Cic.context -> metasenv:Cic.metasenv ->
+      ?context:Cic.context -> ?metasenv:Cic.metasenv ->
       ?env:DisambiguateTypes.environment ->
         DisambiguateTypes.term ->
-          (DisambiguateTypes.environment * Cic.metasenv * Cic.term) list
+          (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
+
+      (** @raise MatitaTypes.No_proof *)
+    method status: ProofEngineTypes.status (* proof, goal *)
+    method setStatus: ProofEngineTypes.status -> unit
+
+      (** {3 actions} *)
+
+    (** 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
+
+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 =
+  object
+    method evalPhrase: string -> unit
   end
 
 (** {2 shorthands} *)
@@ -88,7 +146,7 @@ class type disambiguator =
 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