* new interface matitaTypes.mli

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

diff --git a/helm/matita/matitacLib.ml b/helm/matita/matitacLib.ml
index ea8888eb706c3fda00f39823bf129626b8308794..ec722490ab07863238622c7e1f0d2cda14ddbaa9 100644 (file)
--- a/helm/matita/matitacLib.ml
+++ b/helm/matita/matitacLib.ml
@@ -98,19 +98,24 @@ let rec go () =
       MatitaLog.error (sprintf "Parse error at %d-%d: %s" x y err);
       go ()
   | exn -> MatitaLog.error (Printexc.to_string exn); go ()
+
+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 main ~mode = 
   Helm_registry.load_from "matita.conf.xml";
   Http_getter.init ();
   MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner");
+(*
   MatitaDb.clean_owner_environment ();
   MatitaDb.create_owner_environment ();
+*)
   status := Some (ref (Lazy.force MatitaEngine.initial_status));
-  at_exit
-    (fun () ->
-       Http_getter_logger.log "Sync map tree to disk...";
-       Http_getter.sync_dump_file ();
-       print_endline "\nThanks for using Matita!\n");
   Sys.catch_break true;
   let fname = fname () in
   try
@@ -134,36 +139,49 @@ let main ~mode =
     let hou = 
       if tm.Unix.tm_hour > 0 then (string_of_int tm.Unix.tm_hour ^ "h ") else "" 
     in
-    let proof_status = 
+    let proof_status,moo_content_rev = 
       match !status with
-      | Some s -> !s.proof_status
+      | Some s -> !s.proof_status, !s.moo_content_rev
       | None -> assert false
     in
     if proof_status <> MatitaTypes.No_proof then
      begin
       MatitaLog.error
        "there are still incomplete proofs at the end of the script";
-      exit 2
+      clean_exit 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;
        MatitaLog.message 
          (sprintf "execution of %s completed in %s." fname (hou^min^sec));
-         close_out (open_out (MatitaMisc.obj_file_of_script fname));
        exit 0
      end
   with 
-  | Sys.Break -> MatitaLog.error "user break!"; exit ~-1
+  | Sys.Break ->
+      MatitaLog.error "user break!";
+      if mode = `COMPILER then
+        clean_exit ~-1
+      else
+        pp_ocaml_mode ()
   | MatitaEngine.Drop ->
       if mode = `COMPILER then 
-        exit 1 
+        clean_exit 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);
-     Http_getter.sync_dump_file ();
      if mode = `COMPILER then
-       exit 1
+       clean_exit 1
      else
-       go ()
+       pp_ocaml_mode ()
+  | _ ->
+     if mode = `COMPILER then 
+       clean_exit 3
+     else 
+       pp_ocaml_mode ()