X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2FmatitacLib.ml;h=ea8888eb706c3fda00f39823bf129626b8308794;hb=11cefd39e89f8f7aefdf615f0d0eff35865b29c2;hp=1f0aea7154a35eabcc91d07117f00eea26dcecb0;hpb=94c9255e1f3095440f4d49ea1d75443a5a343185;p=helm.git

diff --git a/helm/matita/matitacLib.ml b/helm/matita/matitacLib.ml
index 1f0aea715..ea8888eb7 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 () =
@@ -78,23 +76,36 @@ 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 () = 
+ let str = Stream.of_channel stdin in
   try
-    run_script (Stream.of_channel stdin) 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 ()
   | 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);
-     go ()
+     (* check for EOI *)
+     if Stream.peek str = None then
+      exit 0
+     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 = 
+  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...";
@@ -123,7 +134,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 = 
+      match !status with
+      | Some s -> !s.proof_status
+      | None -> assert false
+    in
     if proof_status <> MatitaTypes.No_proof then
      begin
       MatitaLog.error
@@ -134,6 +149,7 @@ let main ~mode =
      begin
        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 
@@ -147,5 +163,7 @@ let main ~mode =
      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
+       go ()