X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2FmatitacLib.ml;h=d9eba68e233d8a3d7c3b2b223967d33efc524f18;hb=b84c60ff48a21a62a08e636f32cf0df46dfbe45a;hp=b7afff475d89143cc6dcb259ea63043811c09e20;hpb=6ec0a251ac681afb3a305323097d72ab80d7da6b;p=helm.git

diff --git a/helm/matita/matitacLib.ml b/helm/matita/matitacLib.ml
index b7afff475..d9eba68e2 100644
--- a/helm/matita/matitacLib.ml
+++ b/helm/matita/matitacLib.ml
@@ -38,7 +38,7 @@ let usage =
 
 let status = ref None
 
-let run_script output is eval_function  =
+let run_script is eval_function  =
   let status = 
     match !status with
     | None -> assert false
@@ -58,7 +58,7 @@ let run_script output is eval_function  =
     MatitaLog.debug ("Executing: ``" ^ stm ^ "''")
   in
   try
-    eval_function output status is cb
+    eval_function status is cb
   with
   | MatitaEngine.Drop  
   | CicTextualParser2.Parse_error _ as exn -> raise exn
@@ -81,38 +81,64 @@ let pp_ocaml_mode () =
   MatitaLog.message "Type 'go ();;' to enter an interactive matitac";
   MatitaLog.message ""
   
-let rec go () = 
+let clean_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
   try
-    run_script ignore str MatitaEngine.eval_from_stream_greedy
+    run_script str MatitaEngine.eval_from_stream_greedy
   with 
   | MatitaEngine.Drop -> pp_ocaml_mode ()
-  | Sys.Break -> MatitaLog.error "user break!"; go ()
-  | MatitaTypes.Command_error _ -> go ()
+  | Sys.Break -> MatitaLog.error "user break!"; interactive_loop ()
+  | MatitaTypes.Command_error _ -> interactive_loop ()
   | CicTextualParser2.Parse_error (floc,err) ->
      (* check for EOI *)
      if Stream.peek str = None then
-      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);
-      go ()
-  | exn -> MatitaLog.error (Printexc.to_string exn); go ()
+      interactive_loop ()
+  | exn -> MatitaLog.error (Printexc.to_string exn); interactive_loop ()
+
+let go () =
+  Helm_registry.load_from "matita.conf.xml";
+  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";
   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
@@ -124,10 +150,7 @@ let main ~mode =
         | "stdin" -> stdin
         | fname -> open_in fname)
     in
-    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";
-    run_script output is MatitaEngine.eval_from_stream;
+    run_script is MatitaEngine.eval_from_stream;
     let elapsed = Unix.time () -. time in
     let tm = Unix.gmtime elapsed in
     let sec = 
@@ -139,41 +162,45 @@ 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 (Some 2)
      end
     else
      begin
+       dump_moo_to_file fname moo_content_rev;
        MatitaLog.message 
          (sprintf "execution of %s completed in %s." fname (hou^min^sec));
-       close_out os;
        exit 0
      end
   with 
   | Sys.Break ->
       MatitaLog.error "user break!";
       if mode = `COMPILER then
-        exit ~-1
+        clean_exit (Some ~-1)
       else
         pp_ocaml_mode ()
   | MatitaEngine.Drop ->
       if mode = `COMPILER then 
-        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);
-     Http_getter.sync_dump_file ();
      if mode = `COMPILER then
-       exit 1
+       clean_exit (Some 1)
      else
        pp_ocaml_mode ()
+  | _ ->
+     if mode = `COMPILER then 
+       clean_exit (Some 3)
+     else 
+       pp_ocaml_mode ()