X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitacLib.ml;h=27147e6d422ec184112bbecf5a0b118a22440e7f;hb=fc414b7e91d15ce6cccd9a4e8b558c2ab71b4b60;hp=d4bd0aafe1eef14358c33ca2bdc854a8a7ec4b8d;hpb=6e7fd1727eafb8280d2a01c05eddf49d19db2aaa;p=helm.git

diff --git a/helm/matita/matitacLib.ml b/helm/matita/matitacLib.ml
index d4bd0aafe..27147e6d4 100644
--- a/helm/matita/matitacLib.ml
+++ b/helm/matita/matitacLib.ml
@@ -82,12 +82,21 @@ let pp_ocaml_mode () =
   MatitaLog.message ""
   
 let clean_exit n =
- match !status with
-    None -> exit n
-  | Some status ->
-     let baseuri = MatitaTypes.get_string_option !status "baseuri" in
-      MatitacleanLib.clean_baseuris ~verbose:false [baseuri];
-      exit n
+ let opt_exit =
+  function
+     None -> ()
+   | Some n -> exit n
+ in
+  match !status with
+     None -> opt_exit n
+   | Some status ->
+      try
+       let baseuri = MatitaTypes.get_string_option !status "baseuri" in
+       MatitacleanLib.clean_baseuris ~verbose:false [baseuri];
+       opt_exit n
+      with MatitaTypes.Option_error("baseuri", "not found") ->
+       (* no baseuri ==> nothing to clean yet *)
+       opt_exit n
   
 let rec interactive_loop () = 
  let str = Stream.of_channel stdin in
@@ -100,7 +109,10 @@ let rec interactive_loop () =
   | CicTextualParser2.Parse_error (floc,err) ->
      (* check for EOI *)
      if Stream.peek str = None then
-      clean_exit 0
+      begin
+       print_newline ();
+       clean_exit (Some 0)
+      end
      else
       let (x, y) = CicAst.loc_of_floc floc in
       MatitaLog.error (sprintf "Parse error at %d-%d: %s" x y err);
@@ -108,17 +120,25 @@ let rec interactive_loop () =
   | exn -> MatitaLog.error (Printexc.to_string exn); interactive_loop ()
 
 let go () =
-  Helm_registry.load_from "matita.conf.xml";
+  Helm_registry.load_from BuildTimeConf.matita_conf;
   Http_getter.init ();
   MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner");
   status := Some (ref (Lazy.force MatitaEngine.initial_status));
   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 "matita.conf.xml";
+  Helm_registry.load_from BuildTimeConf.matita_conf;
   Http_getter.init ();
   MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner");
+  MatitaDb.create_owner_environment ();
   status := Some (ref (Lazy.force MatitaEngine.initial_status));
   Sys.catch_break true;
   let fname = fname () in
@@ -152,15 +172,11 @@ let main ~mode =
      begin
       MatitaLog.error
        "there are still incomplete proofs at the end of the script";
-      clean_exit 2
+      clean_exit (Some 2)
      end
     else
      begin
-       let os = open_out (MatitaMisc.obj_file_of_script fname) in
-       let output s = output_string os s in
-       output "(* GENERATED FILE: DO NOT EDIT! *)\n\n";
-       List.iter output (List.rev moo_content_rev);
-       close_out os;
+       dump_moo_to_file fname moo_content_rev;
        MatitaLog.message 
          (sprintf "execution of %s completed in %s." fname (hou^min^sec));
        exit 0
@@ -169,23 +185,23 @@ let main ~mode =
   | Sys.Break ->
       MatitaLog.error "user break!";
       if mode = `COMPILER then
-        clean_exit ~-1
+        clean_exit (Some ~-1)
       else
         pp_ocaml_mode ()
   | MatitaEngine.Drop ->
       if mode = `COMPILER then 
-        clean_exit 1 
+        clean_exit (Some 1)
       else 
         pp_ocaml_mode ()
   | CicTextualParser2.Parse_error (floc,err) ->
      let (x, y) = CicAst.loc_of_floc floc in
      MatitaLog.error (sprintf "Parse error at %d-%d: %s" x y err);
      if mode = `COMPILER then
-       clean_exit 1
+       clean_exit (Some 1)
      else
        pp_ocaml_mode ()
   | _ ->
      if mode = `COMPILER then 
-       clean_exit 3
+       clean_exit (Some 3)
      else 
        pp_ocaml_mode ()