ported to new getter interface

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

diff --git a/helm/matita/matitacLib.ml b/helm/matita/matitacLib.ml
index d00156b8a08c7af834379afaff7a75b14f0eda73..fbc393cfb3bed6472ae6de4874975b3786c632ff 100644 (file)
--- 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 () =
@@ -78,7 +76,9 @@ let fname () =
 
 let pp_ocaml_mode () = 
   MatitaLog.message "";
-  MatitaLog.message " ** Entering Ocaml mode ** ";
+  MatitaLog.message "                      ** Entering Ocaml mode ** ";
+  MatitaLog.message "";
+  MatitaLog.message "Type 'go ();;' to enter an interactive matitac";
   MatitaLog.message ""
   
 let rec go () = 
@@ -96,14 +96,18 @@ let rec go () =
      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 ()
   
 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 "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));
   Sys.catch_break true;
   let fname = fname () in
   try
@@ -127,7 +131,11 @@ 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
@@ -136,12 +144,22 @@ let main ~mode =
      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));
        exit 0
      end
   with 
-  | Sys.Break -> MatitaLog.error "user break!"; exit ~-1
+  | Sys.Break ->
+      MatitaLog.error "user break!";
+      if mode = `COMPILER then
+        exit ~-1
+      else
+        pp_ocaml_mode ()
   | MatitaEngine.Drop ->
       if mode = `COMPILER then 
         exit 1 
@@ -150,6 +168,8 @@ let main ~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
+       exit 1
+     else
+       pp_ocaml_mode ()
+