X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fmatita.ml;h=cf7939fa7c7ce10300751c9db2a17e3e0dc42492;hb=aca103d3c3d740efcc0bcc2932922cff77facb49;hp=078ba00db77d87346e0a9eb0b0ccdc88001d204c;hpb=de9a83f286eee12117fb478ea2db18f7faebac9a;p=helm.git

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index 078ba00db..cf7939fa7 100644
--- a/helm/matita/matita.ml
+++ b/helm/matita/matita.ml
@@ -59,15 +59,27 @@ let _ =
     (MatitaGui.interactive_interp_choice ())
 
 let script =
-  MatitaScript.script ~buffer:gui#main#scriptTextView#buffer
-    ~init:(Lazy.force MatitaEngine.initial_status) ()
+  MatitaScript.script 
+    ~buffer:gui#main#scriptTextView#buffer
+    ~init:(Lazy.force MatitaEngine.initial_status) 
+    ~mathviewer:(MatitaMathView.mathViewer ())
+    ~urichooser:(fun uris ->
+      try
+        MatitaGui.interactive_uri_choice ~selection_mode:`SINGLE
+        ~title:"Matita: URI chooser" 
+        ~msg:"Select the URI" ~hide_uri_entry:true
+        ~hide_try:true ~ok_label:"_Apply" 
+        ~copy_cb:(fun s -> gui#main#scriptTextView#buffer#insert ("\n"^s^"\n"))
+        () ~id:"boh?" uris
+      with MatitaTypes.Cancel -> [])
+    ()
 
   (* math viewers *)
 let _ =
   let sequent_viewer = MatitaMathView.sequentViewer_instance () in
   let sequents_viewer = MatitaMathView.sequentsViewer_instance () in
   sequent_viewer#set_href_callback
-    (Some (fun uri -> (MatitaMathView.cicBrowser ())#loadUri uri));
+    (Some (fun uri -> (MatitaMathView.cicBrowser ())#load (`Uri uri)));
   let browser_observer _ = MatitaMathView.refresh_all_browsers () in
   let sequents_observer status =
     sequents_viewer#reset;
@@ -75,7 +87,12 @@ let _ =
     | Incomplete_proof ((proof, goal) as status) ->
         sequents_viewer#load_sequents status;
         sequents_viewer#goto_sequent goal
-    | _ -> ()
+    | Proof proof -> 
+        prerr_endline "sequents_viewer#load_logo_with_qed (no proof)"; ()
+    | No_proof -> 
+        prerr_endline "sequents_viewer#load_logo (no proof)"; ()
+    | Intermediate _ -> 
+        assert false (* only the engine may be in this state *)
   in
   script#addObserver sequents_observer;
   script#addObserver browser_observer
@@ -94,6 +111,15 @@ let _ =
       let oc = open_out "env.dump" in
       CicEnvironment.dump_to_channel oc;
       close_out oc);
+    addDebugItem "load environment from \"env.dump\"" (fun _ ->
+      let ic = open_in "env.dump" in
+      CicEnvironment.restore_from_channel ic;
+      close_in ic);
+    addDebugItem "dump universes" (fun _ ->
+      List.iter (fun (u,_,g) -> 
+        prerr_endline (UriManager.string_of_uri u); 
+        CicUniv.print_ugraph g) (CicEnvironment.list_obj ())
+      );
     addDebugItem "print selected terms" (fun () ->
       let i = ref 0 in
       List.iter
@@ -132,13 +158,13 @@ let _ =
        print_endline "\nThanks for using Matita!\n");
   Sys.catch_break true;
   (try
-     script#loadFrom Sys.argv.(1);
+     gui#loadScript Sys.argv.(1);
    with Invalid_argument _ -> ());
   if Filename.basename Sys.argv.(0) = "cicbrowser" then begin (* cicbrowser *)
     Helm_registry.set "matita.mode" "cicbrowser";
     let browser = MatitaMathView.cicBrowser () in
     try
-      browser#loadUri Sys.argv.(1)
+      browser#load (`Uri Sys.argv.(1))
     with Invalid_argument _ -> ()
   end else begin  (* matita *)
     Helm_registry.set "matita.mode" "matita";