fixed a finalization issue for connections closed twice

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

diff --git a/helm/matita/matitaTypes.ml b/helm/matita/matitaTypes.ml
index 800ae1c7e2c569bc1cb604c7ae5a32d5df16b9fd..4ac480cf1761b5fed5fbcbcac80d313f995185d0 100644 (file)
--- a/helm/matita/matitaTypes.ml
+++ b/helm/matita/matitaTypes.ml
@@ -57,18 +57,52 @@ type option_value =
 type options = option_value StringMap.t
 let no_options = StringMap.empty
 
+type ast_command = (CicNotationPt.term, GrafiteAst.obj) GrafiteAst.command
+
 type status = {
-  aliases: DisambiguateTypes.environment;   (** disambiguation aliases *)
+  aliases: DisambiguateTypes.environment;
+  moo_content_rev: ast_command list;
   proof_status: proof_status;
   options: options;
   objects: (UriManager.uri * string) list;
-    (** in-scope objects, with their paths *)
+  notation_ids: CicNotation.notation_id list;
 }
 
+let set_metasenv metasenv status =
+  let proof_status =
+    match status.proof_status with
+    | No_proof -> Intermediate metasenv
+    | Incomplete_proof ((uri, _, proof, ty), goal) ->
+        Incomplete_proof ((uri, metasenv, proof, ty), goal)
+    | Intermediate _ -> Intermediate metasenv 
+    | Proof _ -> assert false
+  in
+  { status with proof_status = proof_status }
+
+let add_moo_content cmds status =
+  let content = status.moo_content_rev in
+  let content' =
+    List.fold_right
+      (fun cmd acc ->
+(*         prerr_endline ("adding to moo command: " ^ GrafiteAstPp.pp_command cmd); *)
+        match cmd with
+        | GrafiteAst.Interpretation _
+        | GrafiteAst.Default _ ->
+            if List.mem cmd content then acc
+            else cmd :: acc
+        | GrafiteAst.Alias _ -> (* move Alias as the last inserted one *)
+            cmd :: (List.filter ((<>) cmd) acc)
+        | _ -> cmd :: acc)
+      cmds content
+  in
+(*   prerr_endline ("new moo content: " ^ String.concat " " (List.map
+    GrafiteAstPp.pp_command content')); *)
+  { status with moo_content_rev = content' }
+
 let dump_status status = 
   MatitaLog.message "status.aliases:\n";
   MatitaLog.message
-  (CicTextualParser2.EnvironmentP3.to_string status.aliases ^ "\n");
+  (DisambiguatePp.pp_environment status.aliases ^ "\n");
   MatitaLog.message "status.proof_status:"; 
   MatitaLog.message
     (match status.proof_status with
@@ -126,7 +160,10 @@ let set_option status name value =
         with Failure _ ->
           command_error (sprintf "Not an integer value \"%s\"" value))
   in
-  { status with options = StringMap.add name value status.options }
+  if StringMap.mem name status.options && name = "baseuri" then
+    command_error "Redefinition of 'baseuri' is forbidden."
+  else
+    { status with options = StringMap.add name value status.options }
 
   (* subset of MatitaConsole.console methods needed by MatitaInterpreter *)
 class type console =
@@ -150,8 +187,8 @@ type mathViewer_entry =
   | `Check of string (* term *)
   | `Cic of Cic.term * Cic.metasenv
   | `Dir of string (* "directory" in cic uris namespace *)
-  | `Uri of string (* cic object uri *)
-  | `Whelp of string * string list (* query and results *)
+  | `Uri of UriManager.uri (* cic object uri *)
+  | `Whelp of string * UriManager.uri list (* query and results *)
   ]
 
 let string_of_entry = function
@@ -160,9 +197,17 @@ let string_of_entry = function
   | `About `Us -> "about:us"
   | `Check _ -> "check:"
   | `Cic (_, _) -> "term:"
-  | `Dir uri | `Uri uri -> uri
+  | `Dir uri -> uri
+  | `Uri uri -> UriManager.string_of_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
     (** @param reuse if set reused last opened cic browser otherwise 
@@ -170,6 +215,6 @@ class type mathViewer =
      *)
     method show_entry: ?reuse:bool -> mathViewer_entry -> unit
     method show_uri_list:
-      ?reuse:bool -> entry:mathViewer_entry -> string list -> unit
+      ?reuse:bool -> entry:mathViewer_entry -> UriManager.uri list -> unit
   end