X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita.ml;h=a326754dc40a39ac65ad30df18e795f4d64eae95;hb=84dbeab0a11aed6afb529b884bd796dec644c949;hp=a70063f5fe19508501f0609ab22d7da6927e4078;hpb=872dbd15c8f6d10c2b9b46ad6f995bf494c23e65;p=helm.git

diff --git a/matita/matita.ml b/matita/matita.ml
index a70063f5f..a326754dc 100644
--- a/matita/matita.ml
+++ b/matita/matita.ml
@@ -32,7 +32,14 @@ open GrafiteTypes
 
 (** {2 Initialization} *)
 
-let _ = MatitaInit.initialize_all ()
+let _ = 
+  MatitaInit.add_cmdline_spec
+    ["-tptppath",Arg.String 
+      (fun s -> Helm_registry.set_string "matita.tptppath" s),
+      "Where to find the Axioms/ and Problems/ directory"];
+  MatitaInit.initialize_all ()
+;;
+
 (* let _ = Saturation.init () (* ALB to link paramodulation *) *)
 
 (** {2 GUI callbacks} *)
@@ -139,8 +146,11 @@ let _ =
       let moo = grafite_status.moo_content_rev in
       List.iter
         (fun cmd ->
-          prerr_endline (GrafiteAstPp.pp_command ~obj_pp:(fun _ -> assert false)
-            cmd))
+          prerr_endline
+           (GrafiteAstPp.pp_command
+             ~term_pp:(fun _ -> assert false)
+             ~obj_pp:(fun _ -> assert false)
+             cmd))
         (List.rev moo));
     addDebugItem "print metasenv goals and stack to stderr"
       (fun _ ->
@@ -157,22 +167,24 @@ let _ =
             (MatitaScript.current ())#grafite_status.GrafiteTypes.proof_status
             with
             | GrafiteTypes.No_proof -> (Cic.Implicit None)
-            | Incomplete_proof i -> let _,_,p,_ = i.GrafiteTypes.proof in p
-            | Proof p -> let _,_,p,_ = p in p
+            | Incomplete_proof i -> let _,_,_subst,p,_, _ = i.GrafiteTypes.proof in p
+            | Proof p -> let _,_,_subst,p,_, _ = p in p
             | Intermediate _ -> assert false)));
      addDebugItem "Print current proof (natural language) to stderr" 
        (fun _ -> 
         prerr_endline 
-          (ObjPp.obj_to_string 120 
+          (ApplyTransformation.txt_of_cic_object 120 GrafiteAst.Declarative "" 
+            ~map_unicode_to_tex:(Helm_registry.get_bool
+              "matita.paste_unicode_as_tex")
             (match 
             (MatitaScript.current ())#grafite_status.GrafiteTypes.proof_status
             with
             | GrafiteTypes.No_proof -> assert false
             | Incomplete_proof i -> 
-                let _,m,p,ty = i.GrafiteTypes.proof in 
-                Cic.CurrentProof ("current (incomplete) proof",m,p,ty,[],[])
-            | Proof (_,m,p,ty) -> 
-                Cic.CurrentProof ("current proof",m,p,ty,[],[])
+                let _,m,_subst,p,ty, attrs = i.GrafiteTypes.proof in 
+                Cic.CurrentProof ("current (incomplete) proof",m,p,ty,[],attrs)
+            | Proof (_,m,_subst,p,ty, attrs) -> 
+                Cic.CurrentProof ("current proof",m,p,ty,[],attrs)
             | Intermediate _ -> assert false)));
 (*     addDebugItem "ask record choice"
       (fun _ ->
@@ -188,30 +200,62 @@ let _ =
          let nb = gui#main#hintNotebook in
          nb#goto_page ((nb#current_page + 1) mod 3)); *)
     addDebugSeparator ();
+(*
+    addDebugItem "meets between L and R" 
+      (fun _ -> 
+        let l = CoercDb.coerc_carr_of_term (CicUtil.term_of_uri
+          (UriManager.uri_of_string "cic:/matita/test/L.ind#xpointer(1/1)" )) 
+        in
+        let r = CoercDb.coerc_carr_of_term (CicUtil.term_of_uri
+          (UriManager.uri_of_string "cic:/matita/test/R.ind#xpointer(1/1)" )) 
+        in
+        let meets = CoercGraph.meets l r in
+        prerr_endline "MEETS:";
+        List.iter (fun carr -> prerr_endline (CicPp.ppterm (CoercDb.term_of_carr
+        carr))) meets
+    );
+    addDebugSeparator ();
+*)
+    addDebugItem "disable high level pretty printer"
+      (fun _ -> CicMetaSubst.use_low_level_ppterm_in_context := true);
+    addDebugItem "enable high level pretty printer"
+      (fun _ -> CicMetaSubst.use_low_level_ppterm_in_context := false);
+(* ZACK moved to the View menu
     addDebugItem "disable all (pretty printing) notations"
       (fun _ -> CicNotation.set_active_notations []);
     addDebugItem "enable all (pretty printing) notations"
       (fun _ ->
         CicNotation.set_active_notations
           (List.map fst (CicNotation.get_all_notations ())));
+*)
     addDebugSeparator ();
     addDebugItem "enable multiple disambiguation passes (default)"
       (fun _ -> GrafiteDisambiguator.only_one_pass := false);
     addDebugItem "enable only one disambiguation pass"
       (fun _ -> GrafiteDisambiguator.only_one_pass := true);
     addDebugSeparator ();
+(* ZACK moved to the View menu
     addDebugItem "enable coercions hiding"
       (fun _ -> Acic2content.hide_coercions := true);
     addDebugItem "disable coercions hiding"
       (fun _ -> Acic2content.hide_coercions := false);
+*)
     addDebugItem "show coercions graph" (fun _ ->
       let c = MatitaMathView.cicBrowser () in
       c#load (`About `Coercions));
+    addDebugItem "show coercions graph (full)" (fun _ ->
+      let c = MatitaMathView.cicBrowser () in
+      c#load (`About `CoercionsFull));
     addDebugItem "dump coercions Db" (fun _ ->
       List.iter
       (fun (s,t,ul) -> 
           HLog.debug
-           ((String.concat "," (List.map UriManager.name_of_uri ul)) ^ ":"
+           ((String.concat ","
+              (List.map
+                (fun u,saturations ->
+                  UriManager.name_of_uri u ^
+                   "(" ^ string_of_int saturations ^ ")")
+                ul)) ^ ":"
              ^ CoercDb.name_of_carr s ^ " -> " ^ CoercDb.name_of_carr t))
         (CoercDb.to_list ()));
     addDebugSeparator ();
@@ -221,6 +265,8 @@ 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);
   end
   (** Debugging }}} *)