X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitacLib.ml;h=fa7e487a9a5dc5e568174d2c882135a7a84f8631;hb=aeb7f0539398561dc84cadf38df14a051dd1ba75;hp=e7d3f18e6c7f9599cc02455454d13fcad72772a2;hpb=639131d311fd0f111e09feca7b567b28d21e873f;p=helm.git

diff --git a/helm/matita/matitacLib.ml b/helm/matita/matitacLib.ml
index e7d3f18e6..fa7e487a9 100644
--- a/helm/matita/matitacLib.ml
+++ b/helm/matita/matitacLib.ml
@@ -29,20 +29,32 @@ open MatitaTypes
 
 (** {2 Initialization} *)
 
+  (** If set to true matitac wont catch top level exception, so that backtrace
+   * could be inspected setting OCAMLRUNPARAM=b.  This flag is enabled passing
+   * -debug *)
+let debug = ref false
 let paths_to_search_in = ref [];;
 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"
-]
+let arg_spec =
+  let std_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.Set quiet_compilation, "Turn off verbose compilation";
+    "-preserve", Arg.Set dont_delete_baseuri,
+      "Turns off automatic baseuri cleaning";
+  ] 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 =
   sprintf "MatitaC v%s\nUsage: matitac [option ...] file\nOptions:"
     BuildTimeConf.version
@@ -115,7 +127,7 @@ let clean_exit n =
        opt_exit n
   
 let rec interactive_loop () = 
- let str = Stream.of_channel stdin in
+  let str = Ulexing.from_utf8_channel stdin in
   try
     run_script str 
       (MatitaEngine.eval_from_stream_greedy ~include_paths:!paths_to_search_in)
@@ -145,22 +157,8 @@ let go () =
   Sys.catch_break true;
   interactive_loop ()
 
-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);
- close_out os
-  
 let main ~mode = 
-  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 ();
-  CicEnvironment.set_trust (* environment trust *)
-    (let trust = Helm_registry.get_bool "matita.environment_trust" in
-     fun _ -> trust);
+  MatitaInit.initialize_all ();
   status := Some (ref (Lazy.force MatitaEngine.initial_status));
   Sys.catch_break true;
   let origcb = MatitaLog.get_log_callback () in
@@ -179,7 +177,7 @@ let main ~mode =
     else
       MatitaLog.message (sprintf "execution of %s started:" fname);
     let is =
-      Stream.of_channel
+      Ulexing.from_utf8_channel
         (match fname with
         | "stdin" -> stdin
         | fname -> open_in fname)
@@ -191,13 +189,13 @@ let main ~mode =
     let elapsed = Unix.time () -. time in
     let tm = Unix.gmtime elapsed in
     let sec = 
-      if tm.Unix.tm_sec > 0 then  (string_of_int tm.Unix.tm_sec ^ "''") else "" 
+      if tm.Unix.tm_sec > 0 then (string_of_int tm.Unix.tm_sec ^ "''") else "" 
     in
     let min = 
-      if tm.Unix.tm_min > 0 then  (string_of_int tm.Unix.tm_min ^ "' ") else "" 
+      if tm.Unix.tm_min > 0 then (string_of_int tm.Unix.tm_min ^ "' ") else "" 
     in
     let hou = 
-      if tm.Unix.tm_hour > 0 then (string_of_int tm.Unix.tm_hour ^ "h ") else "" 
+      if tm.Unix.tm_hour > 0 then (string_of_int tm.Unix.tm_hour ^ "h ") else ""
     in
     let proof_status,moo_content_rev = 
       match !status with
@@ -212,7 +210,8 @@ let main ~mode =
      end
     else
      begin
-       dump_moo_to_file fname moo_content_rev;
+       let moo_fname = MatitaMisc.obj_file_of_script fname in
+       MatitaMoo.save_moo moo_fname moo_content_rev;
        MatitaLog.message 
          (sprintf "execution of %s completed in %s." fname (hou^min^sec));
        exit 0
@@ -236,8 +235,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 ()
+