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;;
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:"
else
fun status stm ->
(* dump_status status; *)
- let stm = TacticAstPp.pp_statement stm in
+ let stm = GrafiteAstPp.pp_statement stm in
let stm = Pcre.replace ~rex:slash_n_RE stm in
let stm =
if String.length stm > 50 then
eval_function status is cb
with
| MatitaEngine.Drop
- | CicTextualParser2.Parse_error _ as exn -> raise exn
+ | End_of_file
+ | CicNotationParser.Parse_error _ as exn -> raise exn
| exn ->
MatitaLog.error (MatitaExcPp.to_string exn);
raise exn
| MatitaEngine.Drop -> pp_ocaml_mode ()
| 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
- 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);
- interactive_loop ()
+ | End_of_file ->
+ print_newline ();
+ clean_exit (Some 0)
+ | CicNotationParser.Parse_error (floc,err) ->
+ 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 () =
let main ~mode =
Helm_registry.load_from BuildTimeConf.matita_conf;
+ CicNotation.load_notation BuildTimeConf.core_notation_script;
Http_getter.init ();
MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner");
MatitaDb.create_owner_environment ();
| 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 =
clean_exit (Some 1)
else
pp_ocaml_mode ()
- | CicTextualParser2.Parse_error (floc,err) ->
- let (x, y) = CicAst.loc_of_floc floc in
+ | CicNotationParser.Parse_error (floc,err) ->
+ let (x, y) = CicNotationPt.loc_of_floc floc in
MatitaLog.error (sprintf "Parse error at %d-%d: %s" x y err);
if mode = `COMPILER then
clean_exit (Some 1)