X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2FmatitacLib.ml;h=27147e6d422ec184112bbecf5a0b118a22440e7f;hb=f263e4ec717d5ec2e7f9c057855f8223f81baae8;hp=7653427377324b1fe39f45d28347e33f8474adcd;hpb=5a136ee51c0e52ea2ee14420b1f15bc0106eb388;p=helm.git

diff --git a/helm/matita/matitacLib.ml b/helm/matita/matitacLib.ml
index 765342737..27147e6d4 100644
--- a/helm/matita/matitacLib.ml
+++ b/helm/matita/matitacLib.ml
@@ -36,16 +36,14 @@ let usage =
   sprintf "MatitaC v%s\nUsage: matitac [option ...] file\nOptions:"
     BuildTimeConf.version
 
-let _ =
-  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 ()
-
-let status = ref (Lazy.force MatitaEngine.initial_status) ;;
+let status = ref None
 
 let run_script is eval_function  =
+  let status = 
+    match !status with
+    | None -> assert false
+    | Some s -> s
+  in
   let slash_n_RE = Pcre.regexp "\\n" in
   let cb status stm = 
     (* dump_status status; *)
@@ -65,7 +63,7 @@ let run_script is eval_function  =
   | MatitaEngine.Drop  
   | CicTextualParser2.Parse_error _ as exn -> raise exn
   | exn -> 
-      MatitaLog.error (Printexc.to_string exn);
+      MatitaLog.error (MatitaExcPp.to_string exn);
       raise exn
 
 let fname () =
@@ -80,32 +78,68 @@ let pp_ocaml_mode () =
   MatitaLog.message "";
   MatitaLog.message "                      ** Entering Ocaml mode ** ";
   MatitaLog.message "";
-  MatitaLog.message "Type 'MatitacLib.go ();;' to enter an interactive matitac";
+  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 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);
-  | 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 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 = 
-  at_exit
-    (fun () ->
-       Http_getter_logger.log "Sync map tree to disk...";
-       Http_getter.sync_dump_file ();
-       print_endline "\nThanks for using Matita!\n");
+  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
   try
@@ -129,29 +163,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 = !status.proof_status in
+    let proof_status,moo_content_rev = 
+      match !status with
+      | 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));
        exit 0
      end
   with 
-  | Sys.Break -> MatitaLog.error "user break!"; exit ~-1
+  | Sys.Break ->
+      MatitaLog.error "user break!";
+      if mode = `COMPILER then
+        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 ();
-     exit 1
-  
+     if mode = `COMPILER then
+       clean_exit (Some 1)
+     else
+       pp_ocaml_mode ()
+  | _ ->
+     if mode = `COMPILER then 
+       clean_exit (Some 3)
+     else 
+       pp_ocaml_mode ()