X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaTypes.ml;h=d7dc383b7757fc5d4da9c6a5b9d34abe99bb95f1;hb=fd372e069bbcaa96dc5b2eef04f341b28850d726;hp=454c17a7f521afc53be9b9fc9460d75ba3a4b564;hpb=3b5b254f2faa600a14a837e95f94f953dc9959c7;p=helm.git

diff --git a/helm/matita/matitaTypes.ml b/helm/matita/matitaTypes.ml
index 454c17a7f..d7dc383b7 100644
--- a/helm/matita/matitaTypes.ml
+++ b/helm/matita/matitaTypes.ml
@@ -61,7 +61,6 @@ type status = {
   aliases: DisambiguateTypes.environment;   (** disambiguation aliases *)
   proof_status: proof_status;
   options: options;
-  coercions: CoercGraph.coercions;
   objects: (UriManager.uri * string) list;
     (** in-scope objects, with their paths *)
 }
@@ -86,11 +85,6 @@ let dump_status status =
     in
     MatitaLog.message (k ^ "::=" ^ v)) status.options;
   MatitaLog.message "status.coercions\n";
-  List.iter 
-    (fun (u1,u2,u3) -> MatitaLog.message
-     ((UriManager.string_of_uri u1) ^
-     (UriManager.string_of_uri u2) ^
-     (UriManager.string_of_uri u3))) status.coercions; 
   MatitaLog.message "status.objects:\n";
   List.iter 
     (fun (u,_) -> 
@@ -145,14 +139,44 @@ class type console =
     method show : ?msg:string -> unit -> unit
   end
 
-type term_source =
-  [ `Ast of DisambiguateTypes.term
+type abouts =
+  [ `Blank
+  | `Current_proof
+  | `Us
+  ]
+  
+type mathViewer_entry =
+  [ `About of abouts  (* current proof *)
+  | `Check of string (* term *)
   | `Cic of Cic.term * Cic.metasenv
-  | `String of string
+  | `Dir of string (* "directory" in cic uris namespace *)
+  | `Uri of string (* cic object uri *)
+  | `Whelp of string * string list (* query and results *)
   ]
 
+let string_of_entry = function
+  | `About `Blank -> "about:blank"
+  | `About `Current_proof -> "about:proof"
+  | `About `Us -> "about:us"
+  | `Check _ -> "check:"
+  | `Cic (_, _) -> "term:"
+  | `Dir uri | `Uri uri -> uri
+  | `Whelp (query, _) -> query
+
+let entry_of_string = function
+  | "about:blank" -> `About `Blank
+  | "about:proof" -> `About `Current_proof
+  | "about:us"    -> `About `Us
+  | _ ->  (* only about entries supported ATM *)
+      raise (Invalid_argument "entry_of_string")
+
 class type mathViewer =
   object
-    method show_term: term_source -> unit
+    (** @param reuse if set reused last opened cic browser otherwise 
+     *  opens a new one. default is false
+     *)
+    method show_entry: ?reuse:bool -> mathViewer_entry -> unit
+    method show_uri_list:
+      ?reuse:bool -> entry:mathViewer_entry -> string list -> unit
   end