- added support for -debug, which avoid catching top level exceptions (still useless...

[helm.git] / helm / matita / matitacLib.ml

diff --git a/helm/matita/matitacLib.ml b/helm/matita/matitacLib.ml
index 9165d5a8b7e6ec659a142993cc678ab8d8a2376a..f7855ac8cc089e77bb5ae05b093cf50585b39721 100644 (file)
--- a/helm/matita/matitacLib.ml
+++ b/helm/matita/matitacLib.ml
@@ -27,6 +27,11 @@ open Printf
 
 open MatitaTypes
 
+  (** If set to true matitac wont catch top level exception, so that backtrace
+   * could be inspected setting OCAMLRUNPARAM=b.
+   * This flag could be enabled passing -debug *)
+let debug = ref false
+
 (** {2 Initialization} *)
 
 let paths_to_search_in = ref [];;
@@ -34,14 +39,15 @@ let quiet_compilation = ref false;;
 let dont_delete_baseuri = ref false;;
 
 let add_l l = fun s -> l := s :: !l ;;
-let set_b b = fun () -> b := true;;
 
 let arg_spec = [
   "-I", Arg.String (add_l paths_to_search_in), 
     "<path> Adds path to the list of searched paths for the include command";
-  "-q", Arg.Unit (set_b quiet_compilation), "Turn off verbose compilation";
-  "-preserve", Arg.Unit (set_b dont_delete_baseuri),
-     "Turns off automatic baseuri cleaning"
+  "-q", Arg.Set quiet_compilation, "Turn off verbose compilation";
+  "-preserve", Arg.Set dont_delete_baseuri,
+    "Turns off automatic baseuri cleaning";
+  "-debug", Arg.Set debug,
+    "Do not catch top-level exception (useful for backtrace inspection)";
 ]
 let usage =
   sprintf "MatitaC v%s\nUsage: matitac [option ...] file\nOptions:"
@@ -88,7 +94,7 @@ let fname () =
   Arg.parse arg_spec add_script usage;
   match !acc with
   | [x] -> x
-  | _ -> prerr_endline usage; exit 1
+  | _ -> print_endline usage; exit 1
 
 let pp_ocaml_mode () = 
   MatitaLog.message "";
@@ -137,9 +143,10 @@ let go () =
   CicNotation.load_notation BuildTimeConf.core_notation_script;
   Http_getter.init ();
   MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner");
+  MatitaDb.create_owner_environment ();
   CicEnvironment.set_trust (* environment trust *)
     (let trust = Helm_registry.get_bool "matita.environment_trust" in
-     fun _ -> trust)
+     fun _ -> trust);
   status := Some (ref (Lazy.force MatitaEngine.initial_status));
   Sys.catch_break true;
   interactive_loop ()
@@ -148,7 +155,9 @@ let dump_moo_to_file file moo =
  let os = open_out (MatitaMisc.obj_file_of_script file) in
  let output s = output_string os s in
  output "(* GENERATED FILE: DO NOT EDIT! *)\n\n";
- List.iter output (List.rev moo);
+ List.iter
+  (fun cmd -> output (GrafiteAstPp.pp_command cmd ^ "\n"))
+  (List.rev moo);
  close_out os
   
 let main ~mode = 
@@ -159,7 +168,7 @@ let main ~mode =
   MatitaDb.create_owner_environment ();
   CicEnvironment.set_trust (* environment trust *)
     (let trust = Helm_registry.get_bool "matita.environment_trust" in
-     fun _ -> trust)
+     fun _ -> trust);
   status := Some (ref (Lazy.force MatitaEngine.initial_status));
   Sys.catch_break true;
   let origcb = MatitaLog.get_log_callback () in
@@ -235,8 +244,10 @@ let main ~mode =
        clean_exit (Some 1)
      else
        pp_ocaml_mode ()
-  | _ ->
-     if mode = `COMPILER then 
-       clean_exit (Some 3)
-     else 
-       pp_ocaml_mode ()
+  | exn ->
+      if !debug then raise exn;
+      if mode = `COMPILER then 
+        clean_exit (Some 3)
+      else 
+        pp_ocaml_mode ()
+