(** {2 Initialization} *)
+ (** If set to true matitac wont catch top level exception, so that backtrace
+ * could be inspected setting OCAMLRUNPARAM=b. This flag is enabled passing
+ * -debug *)
+let debug = ref false
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"
-]
+let arg_spec =
+ let std_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.Set quiet_compilation, "Turn off verbose compilation";
+ "-preserve", Arg.Set dont_delete_baseuri,
+ "Turns off automatic baseuri cleaning";
+ ] in
+ let debug_arg_spec =
+ if BuildTimeConf.debug then
+ [ "-debug", Arg.Set debug,
+ "Do not catch top-level exception (useful for backtrace inspection)"; ]
+ else []
+ in
+ std_arg_spec @ debug_arg_spec
+
let usage =
sprintf "MatitaC v%s\nUsage: matitac [option ...] file\nOptions:"
BuildTimeConf.version
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
Arg.parse arg_spec add_script usage;
match !acc with
| [x] -> x
- | _ -> prerr_endline usage; exit 1
+ | _ -> print_endline usage; exit 1
let pp_ocaml_mode () =
MatitaLog.message "";
opt_exit n
let rec interactive_loop () =
- let str = Stream.of_channel stdin in
+ let str = Ulexing.from_utf8_channel stdin in
try
run_script str
(MatitaEngine.eval_from_stream_greedy ~include_paths:!paths_to_search_in)
| 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 () =
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 ();
+ CicEnvironment.set_trust (* environment trust *)
+ (let trust = Helm_registry.get_bool "matita.environment_trust" in
+ fun _ -> trust);
status := Some (ref (Lazy.force MatitaEngine.initial_status));
Sys.catch_break true;
interactive_loop ()
let os = open_out (MatitaMisc.obj_file_of_script file) in
let output s = output_string os s in
output "(* GENERATED FILE: DO NOT EDIT! *)\n\n";
- List.iter output (List.rev moo);
+ List.iter
+ (fun cmd -> output (GrafiteAstPp.pp_command cmd ^ "\n"))
+ (List.rev moo);
close_out os
let main ~mode =
- Helm_registry.load_from BuildTimeConf.matita_conf;
- Http_getter.init ();
- MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner");
- MatitaDb.create_owner_environment ();
+ MatitaInit.initialize_all ();
status := Some (ref (Lazy.force MatitaEngine.initial_status));
Sys.catch_break true;
let origcb = MatitaLog.get_log_callback () in
else
MatitaLog.message (sprintf "execution of %s started:" fname);
let is =
- Stream.of_channel
+ Ulexing.from_utf8_channel
(match fname with
| "stdin" -> stdin
| 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 =
- if tm.Unix.tm_sec > 0 then (string_of_int tm.Unix.tm_sec ^ "''") else ""
+ if tm.Unix.tm_sec > 0 then (string_of_int tm.Unix.tm_sec ^ "''") else ""
in
let min =
- if tm.Unix.tm_min > 0 then (string_of_int tm.Unix.tm_min ^ "' ") else ""
+ if tm.Unix.tm_min > 0 then (string_of_int tm.Unix.tm_min ^ "' ") else ""
in
let hou =
- if tm.Unix.tm_hour > 0 then (string_of_int tm.Unix.tm_hour ^ "h ") else ""
+ if tm.Unix.tm_hour > 0 then (string_of_int tm.Unix.tm_hour ^ "h ") else ""
in
let proof_status,moo_content_rev =
match !status with
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)
else
pp_ocaml_mode ()
- | _ ->
- if mode = `COMPILER then
- clean_exit (Some 3)
- else
- pp_ocaml_mode ()
+ | exn ->
+ if !debug then raise exn;
+ if mode = `COMPILER then
+ clean_exit (Some 3)
+ else
+ pp_ocaml_mode ()
+
projects / helm.git / blobdiff