X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fmatita.ml;h=b9e09f24d8dbc88bcbbaa4ca05c4ca30dc71e4c7;hb=82d56e6d22560ffb111c63cfdf0e200c8fa6fd3d;hp=c3fdb2459c89e7fe580a74c07664e5c0d5270120;hpb=b2f2e47efe1e01df81cb7659c30eeb76f1f830da;p=helm.git

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index c3fdb2459..b9e09f24d 100644
--- a/helm/matita/matita.ml
+++ b/helm/matita/matita.ml
@@ -77,9 +77,12 @@ let _ =
   let sequents_observer 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
+    | 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 *)
@@ -122,6 +125,8 @@ let _ =
     addDebugItem "getter: getalluris" (fun _ ->
       List.iter prerr_endline (Http_getter.getalluris ()));
     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
@@ -131,14 +136,24 @@ let _ =
         (fun (s,t,u) -> 
           MatitaLog.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
+      let status = (MatitaScript.current ())#status in
+      let moo, metadata = status.moo_content_rev in
       List.iter (fun cmd -> prerr_endline
-        (GrafiteAstPp.pp_command cmd)) (List.rev status.moo_content_rev));
+        (GrafiteAstPp.pp_command cmd)) (List.rev moo);
+      List.iter (fun m -> prerr_endline
+        (GrafiteAstPp.pp_metadata m)) metadata);
+    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
+          (MatitaMisc.get_stack (MatitaScript.current ())#status)));
     addDebugItem "rotate light bulbs"
       (fun _ ->
          let nb = gui#main#hintNotebook in
@@ -148,27 +163,6 @@ let _ =
 
   (** {2 Command line parsing} *)
 
-let debug = ref false
-let args = ref []
-let add_arg arg = args := arg :: !args
-
-let arg_spec =
-  let std_arg_spec = [] in
-  let debug_arg_spec =
-    if BuildTimeConf.debug then
-      [ "-debug", Arg.Set debug,
-        "Do not catch top-level exception (useful for backtrace inspection)"; ]
-    else []
-  in
-  std_arg_spec @ debug_arg_spec
-
-let usage () =
-  let heading = sprintf "Matita v%s\nUsage: " BuildTimeConf.version in
-  if Helm_registry.get "matita.mode" = "cicbrowser" then
-    heading ^ "cicbrowser [ URL | Whelp query ]\nOptions:"
-  else
-    heading ^  "matita [ FILE ]"
-
 let set_matita_mode () =
   let matita_mode =
     if Filename.basename Sys.argv.(0) = "cicbrowser"
@@ -181,16 +175,15 @@ let set_matita_mode () =
 
 let _ =
   set_matita_mode ();
-  Arg.parse arg_spec add_arg (usage ());
-  Helm_registry.set_bool "matita.catch_top_level_exn" (not !debug);
   at_exit (fun () -> print_endline "\nThanks for using Matita!\n");
   Sys.catch_break true;
+  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 = match !args with [] -> "cic:/" | _ -> String.concat " " !args in
+    let uri = match args with [] -> "cic:/" | _ -> String.concat " " args in
     browser#loadInput uri
   else begin  (* matita *)
-    (try gui#loadScript (List.hd !args) with Failure _ -> ());
+    (try gui#loadScript (List.hd args) with Failure _ -> ());
     gui#main#mainWin#show ();
   end;
   try