X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fmatita.ml;h=1bfdf8ce372c49ab9cf93afa6a2ffd1c26ab8577;hb=8b1a49bbee9eea86eb74c040defe701370ca5893;hp=fb7ad27bf6244c2a914dfc418957e760feae75ce;hpb=238b544db1786fbc68354fd62aa6b05983906997;p=helm.git

diff --git a/helm/software/matita/matita.ml b/helm/software/matita/matita.ml
index fb7ad27bf..1bfdf8ce3 100644
--- a/helm/software/matita/matita.ml
+++ b/helm/software/matita/matita.ml
@@ -81,14 +81,21 @@ let _ =
   let sequents_viewer = MatitaMathView.sequentsViewer_instance () in
   sequents_viewer#load_logo;
   cic_math_view#set_href_callback
-    (Some (fun uri -> (MatitaMathView.cicBrowser ())#load
-      (`Uri (UriManager.uri_of_string uri))));
-  let browser_observer _ _ = MatitaMathView.refresh_all_browsers () in
-  let sequents_observer _ grafite_status =
+    (Some (fun uri ->
+      let uri =
+       try
+        `Uri (UriManager.uri_of_string uri)
+       with
+        UriManager.IllFormedUri _ ->
+         `NRef (NReference.reference_of_string uri)
+      in
+      (MatitaMathView.cicBrowser ())#load uri));
+  let browser_observer _ = MatitaMathView.refresh_all_browsers () in
+  let sequents_observer grafite_status =
     sequents_viewer#reset;
-    match grafite_status.proof_status with
+    match grafite_status#proof_status with
     | Incomplete_proof ({ stack = stack } as incomplete_proof) ->
-        sequents_viewer#load_sequents incomplete_proof;
+        sequents_viewer#load_sequents grafite_status incomplete_proof;
         (try
           script#setGoal (Some (Continuationals.Stack.find_goal stack));
           let goal =
@@ -96,23 +103,24 @@ let _ =
               None -> assert false
             | Some n -> n
           in
-           sequents_viewer#goto_sequent goal
+           sequents_viewer#goto_sequent grafite_status goal
         with Failure _ -> script#setGoal None);
     | Proof proof -> sequents_viewer#load_logo_with_qed
     | No_proof ->
-       (match grafite_status.ng_status with
-           ProofMode nstatus ->
-            sequents_viewer#nload_sequents nstatus;
+       (match grafite_status#ng_mode with
+           `ProofMode ->
+            sequents_viewer#nload_sequents grafite_status;
             (try
-              script#setGoal (Some (Continuationals.Stack.find_goal nstatus.NTacStatus.gstatus));
+              script#setGoal
+               (Some (Continuationals.Stack.find_goal grafite_status#stack));
               let goal =
                match script#goal with
                   None -> assert false
                 | Some n -> n
               in
-               sequents_viewer#goto_sequent goal
+               sequents_viewer#goto_sequent grafite_status goal
             with Failure _ -> script#setGoal None);
-         | CommandMode _ -> sequents_viewer#load_logo
+         | `CommandMode -> sequents_viewer#load_logo
        )
     | Intermediate _ -> assert false (* only the engine may be in this state *)
   in
@@ -133,7 +141,7 @@ let _ =
       ignore (GMenu.separator_item ~packing:gui#main#debugMenu_menu#append ())
     in
     addDebugItem "dump aliases" (fun _ ->
-      let status = script#lexicon_status in
+      let status = script#grafite_status in
       LexiconEngine.dump_aliases HLog.debug "" status);
 (* FG: DEBUGGING   
     addDebugItem "dump interpretations" (fun _ ->
@@ -174,7 +182,7 @@ let _ =
       CicNotationParser.print_l2_pattern;
     addDebugItem "dump moo to stderr" (fun _ ->
       let grafite_status = (MatitaScript.current ())#grafite_status in
-      let moo = grafite_status.moo_content_rev in
+      let moo = grafite_status#moo_content_rev in
       List.iter
         (fun cmd ->
           prerr_endline
@@ -195,7 +203,7 @@ let _ =
         HLog.debug
           (CicPp.ppterm 
             (match 
-            (MatitaScript.current ())#grafite_status.GrafiteTypes.proof_status
+            (MatitaScript.current ())#grafite_status#proof_status
             with
             | GrafiteTypes.No_proof -> (Cic.Implicit None)
             | Incomplete_proof i -> 
@@ -206,11 +214,11 @@ let _ =
      addDebugItem "Print current proof (natural language) to stderr" 
        (fun _ -> 
         prerr_endline 
-          (ApplyTransformation.txt_of_cic_object 120 GrafiteAst.Declarative "" 
+          (ApplyTransformation.txt_of_cic_object 120 [] 
             ~map_unicode_to_tex:(Helm_registry.get_bool
               "matita.paste_unicode_as_tex")
             (match 
-            (MatitaScript.current ())#grafite_status.GrafiteTypes.proof_status
+            (MatitaScript.current ())#grafite_status#proof_status
             with
             | GrafiteTypes.No_proof -> assert false
             | Incomplete_proof i -> 
@@ -294,7 +302,7 @@ let _ =
                    "(" ^ string_of_int saturations ^ ")")
                 ul)) ^ ":"
              ^ CoercDb.string_of_carr s ^ " -> " ^ CoercDb.string_of_carr t))
-        (CoercDb.to_list ()));
+        (CoercDb.to_list (CoercDb.dump ())));
     addDebugSeparator ();
     let mview () = (MatitaMathView.sequentsViewer_instance ())#cicMathView in
 (*     addDebugItem "save (sequent) MathML to matita.xml"
@@ -325,7 +333,7 @@ let _ =
         prerr_endline "Still cleaning the library: don't be impatient!"));
    prerr_endline "Matita is cleaning up. Please wait.";
    let baseuri = 
-     GrafiteTypes.get_baseuri (MatitaScript.current ())#grafite_status
+    (MatitaScript.current ())#grafite_status#baseuri
    in
      LibraryClean.clean_baseuris [baseuri]