X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fmatita.ml;h=9e96651fed42156e1e64804ebe703c03c59ae55c;hb=aa0d60227b785da3355b31519ba11cb4fbd2c925;hp=38c161424850decc0e3fddde508bcb78ade0c0f2;hpb=51ce243d63b02d6ad690a5d2e1d79e34d548f86b;p=helm.git

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index 38c161424..9e96651fe 100644
--- a/helm/matita/matita.ml
+++ b/helm/matita/matita.ml
@@ -23,25 +23,17 @@
  * http://helm.cs.unibo.it/
  *)
 
+(* $Id$ *)
+
 open Printf
 
 open MatitaGtkMisc
-open MatitaTypes
-open MatitaMisc
+open GrafiteTypes
 
 (** {2 Initialization} *)
 
-let _ =
-  Helm_registry.load_from BuildTimeConf.matita_conf;
-  CicNotation.load_notation BuildTimeConf.core_notation_script;
-  Http_getter.init ();
-  MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner");
-  MatitaDb.create_owner_environment ();
-  MatitamakeLib.initialize ();
-  CicEnvironment.set_trust (* environment trust *)
-    (let trust = Helm_registry.get_bool "matita.environment_trust" in
-     fun _ -> trust);
-  Paramodulation.Saturation.init ()
+let _ = MatitaInit.initialize_all ()
+let _ = Paramodulation.Saturation.init () (* ALB to link paramodulation *)
 
 (** {2 GUI callbacks} *)
 
@@ -51,7 +43,6 @@ let script =
   let s = 
     MatitaScript.script 
       ~source_view:gui#sourceView
-      ~init:(Lazy.force MatitaEngine.initial_status) 
       ~mathviewer:(MatitaMathView.mathViewer ())
       ~urichooser:(fun uris ->
         try
@@ -84,13 +75,16 @@ let _ =
   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 status =
+  let browser_observer _ _ = MatitaMathView.refresh_all_browsers () in
+  let sequents_observer _ grafite_status =
     sequents_viewer#reset;
-    match status.proof_status with
-    | Incomplete_proof ((proof, goal) as status) ->
-        sequents_viewer#load_sequents status;
-        sequents_viewer#goto_sequent goal
+    match grafite_status.proof_status with
+    | Incomplete_proof ({ stack = stack } as incomplete_proof) ->
+        sequents_viewer#load_sequents incomplete_proof;
+        (try
+          script#setGoal (Continuationals.Stack.find_goal stack);
+          sequents_viewer#goto_sequent script#goal
+        with Failure _ -> script#setGoal ~-1);
     | Proof proof -> sequents_viewer#load_logo_with_qed
     | No_proof -> sequents_viewer#load_logo
     | Intermediate _ -> assert false (* only the engine may be in this state *)
@@ -125,55 +119,89 @@ let _ =
       List.iter (fun (u,_,_) -> 
         prerr_endline (UriManager.string_of_uri u)) 
         (CicEnvironment.list_obj ()));
-    addDebugItem "print selections" (fun () ->
+(*     addDebugItem "print selections" (fun () ->
       let cicMathView = MatitaMathView.cicMathView_instance () in
-      List.iter MatitaLog.debug (cicMathView#string_of_selections));
-    addDebugItem "dump getter settings" (fun _ ->
-      prerr_endline (Http_getter_env.env_to_string ()));
-    addDebugItem "getter: getalluris" (fun _ ->
-      List.iter prerr_endline (Http_getter.getalluris ()));
+      List.iter HLog.debug (cicMathView#string_of_selections)); *)
     addDebugItem "dump script status" script#dump;
+    addDebugItem "dump configuration file to ./foo.conf.xml" (fun _ ->
+      Helm_registry.save_to "./foo.conf.xml");
     addDebugItem "dump metasenv"
       (fun _ ->
          if script#onGoingProof () then
-           MatitaLog.debug (CicMetaSubst.ppmetasenv [] script#proofMetasenv));
+           HLog.debug (CicMetaSubst.ppmetasenv [] script#proofMetasenv));
     addDebugItem "dump coercions Db" (fun _ ->
       List.iter
         (fun (s,t,u) -> 
-          MatitaLog.debug
+          HLog.debug
             (UriManager.name_of_uri u ^ ":"
-             ^ UriManager.name_of_uri s ^ " -> " ^ UriManager.name_of_uri t))
+             ^ CoercDb.name_of_carr s ^ " -> " ^ CoercDb.name_of_carr t))
         (CoercDb.to_list ()));
     addDebugItem "print top-level grammar entries"
       CicNotationParser.print_l2_pattern;
     addDebugItem "dump moo to stderr" (fun _ ->
-      let status = (MatitaScript.instance ())#status in
-      List.iter (fun cmd -> prerr_endline
-        (GrafiteAstPp.pp_command cmd)) (List.rev status.moo_content_rev));
+      let grafite_status = (MatitaScript.current ())#grafite_status in
+      let moo = grafite_status.moo_content_rev in
+      List.iter
+        (fun cmd ->
+          prerr_endline (GrafiteAstPp.pp_command ~obj_pp:(fun _ -> assert false)
+            cmd))
+        (List.rev moo));
+    addDebugItem "print metasenv goals and stack to stderr"
+      (fun _ ->
+        prerr_endline ("metasenv goals: " ^ String.concat " "
+          (List.map (fun (g, _, _) -> string_of_int g)
+            (MatitaScript.current ())#proofMetasenv));
+        prerr_endline ("stack: " ^ Continuationals.Stack.pp
+          (GrafiteTypes.get_stack (MatitaScript.current ())#grafite_status)));
+(*     addDebugItem "ask record choice"
+      (fun _ ->
+        HLog.debug (string_of_int
+          (MatitaGtkMisc.ask_record_choice ~gui ~title:"title" ~message:"msg"
+          ~fields:["a"; "b"; "c"]
+          ~records:[
+            ["0"; "0"; "0"]; ["0"; "0"; "1"]; ["0"; "1"; "0"]; ["0"; "1"; "1"];
+            ["1"; "0"; "0"]; ["1"; "0"; "1"]; ["1"; "1"; "0"]; ["1"; "1"; "1"]]
+          ()))); *)
     addDebugItem "rotate light bulbs"
       (fun _ ->
          let nb = gui#main#hintNotebook in
          nb#goto_page ((nb#current_page + 1) mod 3));
+    addDebugItem "print runtime dir"
+      (fun _ ->
+        prerr_endline BuildTimeConf.runtime_base_dir);
+    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 ())));
   end
   (** Debugging }}} *)
 
+  (** {2 Command line parsing} *)
+
+let set_matita_mode () =
+  let matita_mode =
+    if Filename.basename Sys.argv.(0) = "cicbrowser" || 
+       Filename.basename Sys.argv.(0) = "cicbrowser.opt"
+    then "cicbrowser"
+    else "matita"
+  in
+  Helm_registry.set "matita.mode" matita_mode
+
+  (** {2 Main} *)
+
 let _ =
+  set_matita_mode ();
   at_exit (fun () -> print_endline "\nThanks for using Matita!\n");
   Sys.catch_break true;
-  if Filename.basename Sys.argv.(0) = "cicbrowser" then begin (* cicbrowser *)
-    Helm_registry.set "matita.mode" "cicbrowser";
+  let args = Helm_registry.get_list Helm_registry.string "matita.args" in
+  if Helm_registry.get "matita.mode" = "cicbrowser" then  (* cicbrowser *)
     let browser = MatitaMathView.cicBrowser () in
-    let uri =
-      try
-        String.concat " " (List.tl (Array.to_list Sys.argv))
-      with Failure _ -> "cic:/"
-    in
+    let uri = match args with [] -> "cic:/" | _ -> String.concat " " args in
     browser#loadInput uri
-  end else begin  (* matita *)
-    Helm_registry.set "matita.mode" "matita";
-    (try
-       gui#loadScript Sys.argv.(1);
-     with Invalid_argument _ -> ());
+  else begin  (* matita *)
+    (try gui#loadScript (List.hd args) with Failure _ -> ());
     gui#main#mainWin#show ();
   end;
   try