now baseuri is needed in each file (and its redefinition is forbidden)

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

diff --git a/helm/matita/matitacLib.ml b/helm/matita/matitacLib.ml
index 1f0aea7154a35eabcc91d07117f00eea26dcecb0..1baa34910c3a1356d5c08b0b3133a9e28a1e7f30 100644 (file)
--- a/helm/matita/matitacLib.ml
+++ b/helm/matita/matitacLib.ml
@@ -65,7 +65,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,20 +78,26 @@ 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);
   | exn -> MatitaLog.error (Printexc.to_string exn); go ()
   
 let main ~mode =