X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fmatita.ml;h=1bfdf8ce372c49ab9cf93afa6a2ffd1c26ab8577;hb=db235934efa41a0f38e79747f6db4f468367410b;hp=4437f169c22a011d13ec7779bbcd9e67c5376db1;hpb=9a9c5b863f68367119450ae7b806d454ba1265e3;p=helm.git

diff --git a/helm/software/matita/matita.ml b/helm/software/matita/matita.ml
index 4437f169c..1bfdf8ce3 100644
--- a/helm/software/matita/matita.ml
+++ b/helm/software/matita/matita.ml
@@ -67,6 +67,8 @@ let script =
             ~parent:gui#main#toplevel ())
       ()
   in
+  Predefined_virtuals.load_predefined_virtuals ();
+  Predefined_virtuals.load_predefined_classes ();
   gui#sourceView#source_buffer#begin_not_undoable_action ();
   s#reset (); 
   s#template (); 
@@ -79,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 =
@@ -94,10 +103,25 @@ 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 -> sequents_viewer#load_logo
+    | No_proof ->
+       (match grafite_status#ng_mode with
+           `ProofMode ->
+            sequents_viewer#nload_sequents grafite_status;
+            (try
+              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 grafite_status goal
+            with Failure _ -> script#setGoal None);
+         | `CommandMode -> sequents_viewer#load_logo
+       )
     | Intermediate _ -> assert false (* only the engine may be in this state *)
   in
   script#addObserver sequents_observer;
@@ -117,11 +141,19 @@ let _ =
       ignore (GMenu.separator_item ~packing:gui#main#debugMenu_menu#append ())
     in
     addDebugItem "dump aliases" (fun _ ->
+      let status = script#grafite_status in
+      LexiconEngine.dump_aliases HLog.debug "" status);
+(* FG: DEBUGGING   
+    addDebugItem "dump interpretations" (fun _ ->
       let status = script#lexicon_status in
+      let filter = 
+       List.filter (function LexiconAst.Interpretation _ -> true | _ -> false)
+      in
       HLog.debug (String.concat "\n"
-       (DisambiguateTypes.Environment.fold
-         (fun _ x l -> (LexiconAstPp.pp_alias x)::l)
-         status.LexiconEngine.aliases [])));
+       (List.fold_right
+         (fun x l -> (LexiconAstPp.pp_command x)::l)
+         (filter status.LexiconEngine.lexicon_content_rev) [])));
+*)
     addDebugItem "dump environment to \"env.dump\"" (fun _ ->
       let oc = open_out "env.dump" in
       CicEnvironment.dump_to_channel oc;
@@ -150,12 +182,12 @@ 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
            (GrafiteAstPp.pp_command
-             ~term_pp:(fun _ -> assert false)
+             ~term_pp:(fun t -> CicPp.ppterm t)
              ~obj_pp:(fun _ -> assert false)
              cmd))
         (List.rev moo));
@@ -171,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 -> 
@@ -182,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 -> 
@@ -270,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"
@@ -278,8 +310,9 @@ let _ =
         ~doc:(HExtlib.unopt (mview ())#get_document) ~name:"matita.xml" ())); *)
     addDebugItem "load (sequent) MathML from matita.xml"
       (fun _ -> (mview ())#load_uri ~filename:"matita.xml");
-    addDebugItem "autoWin"
-    (fun _ -> MatitaAutoGui.auto_dialog Auto.get_auto_status);
+    addDebugSeparator ();
+    addDebugItem "Expand virtuals"
+    (fun _ -> (MatitaScript.current ())#expandAllVirtuals);
   end
   (** Debugging }}} *)
 
@@ -300,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]