packaging cleanup: get rid of ancient debhelpers, use dh_install

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

diff --git a/helm/matita/matitacLib.ml b/helm/matita/matitacLib.ml
index 076be5416a0e5b6f7d63fb14fd8de9e2a8342563..ebf1e455bff5d62f4cd9d28f0e0be43441811603 100644 (file)
--- a/helm/matita/matitacLib.ml
+++ b/helm/matita/matitacLib.ml
@@ -31,6 +31,7 @@ open MatitaTypes
 
 let paths_to_search_in = ref [];;
 let quiet_compilation = ref false;;
+let dont_delete_baseuri = ref false;;
 
 let add_l l = fun s -> l := s :: !l ;;
 let set_b b = fun () -> b := true;;
@@ -38,7 +39,9 @@ let set_b b = fun () -> b := true;;
 let arg_spec = [
   "-I", Arg.String (add_l paths_to_search_in), 
     "<path> Adds path to the list of searched paths for the include command";
-  "-q", Arg.Unit (set_b quiet_compilation), "Turn off verbose compilation"
+  "-q", Arg.Unit (set_b quiet_compilation), "Turn off verbose compilation";
+  "-preserve", Arg.Unit (set_b dont_delete_baseuri),
+     "Turns off automatic baseuri cleaning"
 ]
 let usage =
   sprintf "MatitaC v%s\nUsage: matitac [option ...] file\nOptions:"
@@ -73,6 +76,7 @@ let run_script is eval_function  =
     eval_function status is cb
   with
   | MatitaEngine.Drop  
+  | End_of_file
   | CicNotationParser.Parse_error _ as exn -> raise exn
   | exn -> 
       MatitaLog.error (MatitaExcPp.to_string exn);
@@ -119,17 +123,13 @@ let rec interactive_loop () =
   | MatitaEngine.Drop -> pp_ocaml_mode ()
   | Sys.Break -> MatitaLog.error "user break!"; interactive_loop ()
   | MatitaTypes.Command_error _ -> interactive_loop ()
+  | End_of_file ->
+     print_newline ();
+     clean_exit (Some 0)
   | CicNotationParser.Parse_error (floc,err) ->
-     (* check for EOI *)
-     if Stream.peek str = None then
-      begin
-       print_newline ();
-       clean_exit (Some 0)
-      end
-     else
-      let (x, y) = CicNotationPt.loc_of_floc floc in
-      MatitaLog.error (sprintf "Parse error at %d-%d: %s" x y err);
-      interactive_loop ()
+     let (x, y) = CicNotationPt.loc_of_floc floc in
+     MatitaLog.error (sprintf "Parse error at %d-%d: %s" x y err);
+     interactive_loop ()
   | exn -> MatitaLog.error (Printexc.to_string exn); interactive_loop ()
 
 let go () =
@@ -177,7 +177,9 @@ let main ~mode =
         | fname -> open_in fname)
     in
     run_script is 
-      (MatitaEngine.eval_from_stream ~include_paths:!paths_to_search_in);
+      (MatitaEngine.eval_from_stream 
+        ~include_paths:!paths_to_search_in
+        ~clean_baseuri:(not !dont_delete_baseuri));
     let elapsed = Unix.time () -. time in
     let tm = Unix.gmtime elapsed in
     let sec =