exception AttemptToInsertAnAlias of LexiconEngine.status
-let out = ref ignore
-let set_callback f = out := f
-
-
let slash_n_RE = Pcre.regexp "\\n" ;;
let pp_ast_statement grafite_status stm =
let module G = GrafiteAst in
let module L = LexiconAst in
let module H = HExtlib in
- Helm_registry.set_bool "matita.moo" false;
let floc = H.dummy_floc in
let nl_ast = G.Comment (floc, G.Note (floc, "")) in
let pp_statement stm =
let nl () = output_string och (pp_statement nl_ast) in
MatitaMisc.out_preamble och;
let grafite_parser_cb status = function
- | G.Executable (_, G.Macro (_, G.Inline _)) -> ()
- | stm ->
+ | G.Executable (_, G.Macro (_, G.Inline (_, uri, params))) ->
+ let str =
+ ApplyTransformation.txt_of_inline_macro params uri
+ ~map_unicode_to_tex:
+ (Helm_registry.get_bool "matita.paste_unicode_as_tex")
+ in
+ output_string och str
+ | stm ->
output_string och (pp_statement stm); nl (); nl ()
in
let lexicon_parser_cb status cmd =
output_string och (pp_lexicon cmd); nl (); nl ()
in
-(*
- let matita_engine_cb = function
- | G.Executable (_, G.Macro (_, G.Inline _))
- | G.Executable (_, G.Command (_, G.Include _)) -> ()
- | ast ->
-*)
- let matitac_lib_cb = output_string och in
begin fun () ->
+ Helm_registry.set_bool "matita.moo" false;
GrafiteParser.set_grafite_callback grafite_parser_cb;
- GrafiteParser.set_lexicon_callback lexicon_parser_cb;
-(*
- MatitaEngine.set_callback matita_engine_cb;
-*)
- set_callback matitac_lib_cb
+ GrafiteParser.set_lexicon_callback lexicon_parser_cb
end,
begin fun x ->
close_out och;
GrafiteParser.set_grafite_callback (fun _ _ -> ());
GrafiteParser.set_lexicon_callback (fun _ _ -> ());
- set_callback ignore; x
+ Helm_registry.set_bool "matita.moo" true;
+ x
end
;;
CicNotation2.load_notation ~include_paths:[]
BuildTimeConf.core_notation_script
in
- atstart ();
+ atstart (); (* FG: do not invoke before loading the core notation script *)
let grafite_status = GrafiteSync.init lexicon_status baseuri in
let big_bang = Unix.gettimeofday () in
let { Unix.tms_utime = big_bang_u ; Unix.tms_stime = big_bang_s} =
if not (Helm_registry.get_bool "matita.verbose") then (fun _ _ -> ())
else pp_ast_statement
in
- let grafite_status, lexicon_status =
- let rec aux_for_dump x =
+ let lexicon_status, grafite_status =
+ let rec aux_for_dump x lexicon_status grafite_status =
try
match
MatitaEngine.eval_from_stream ~first_statement_only:false ~include_paths
lexicon_status grafite_status buf x
with
- | [] -> grafite_status, lexicon_status
- | ((grafite,lexicon),None)::_ -> grafite, lexicon
+ | [] -> lexicon_status, grafite_status
+ | ((grafite,lexicon),None)::_ -> lexicon, grafite
| ((_,l),Some _)::_ -> raise (AttemptToInsertAnAlias l)
-
- with MatitaEngine.EnrichedWithLexiconStatus
- (GrafiteEngine.Macro (floc, f), lex_status) as exn ->
- match f (get_macro_context (Some grafite_status)) with
- | _, GrafiteAst.Inline (_, style, suri, prefix, flavour) ->
- let str =
+ with MatitaEngine.EnrichedWithStatus
+ (GrafiteEngine.Macro (floc, f), lexicon, grafite) as exn ->
+ match f (get_macro_context (Some grafite)) with
+ | _, GrafiteAst.Inline (_, _suri, _params) ->
+(*
+ let str =
ApplyTransformation.txt_of_inline_macro style prefix suri
?flavour
~map_unicode_to_tex:(Helm_registry.get_bool
"matita.paste_unicode_as_tex")
in
!out str;
- aux_for_dump x
+*)
+ aux_for_dump x lexicon grafite
|_-> raise exn
in
- aux_for_dump print_cb
+ aux_for_dump print_cb lexicon_status grafite_status
in
let elapsed = Unix.time () -. time in
let proof_status,moo_content_rev,lexicon_content_rev =
*)
clean_exit baseuri false)
else
- (if not (Helm_registry.get_bool "matita.moo" &&
- Filename.check_suffix fname ".mma") then begin
+ (if Helm_registry.get_bool "matita.moo" then begin
(* FG: we do not generate .moo when dumping .mma files *)
GrafiteMarshal.save_moo moo_fname moo_content_rev;
LexiconMarshal.save_lexicon lexicon_fname lexicon_content_rev;
~present:lexicon_status ~past:initial_lexicon_status;
*)
clean_exit baseuri false
- | MatitaEngine.EnrichedWithLexiconStatus (exn, lex_stat) as exn' ->
+ | MatitaEngine.EnrichedWithStatus (exn, _lexicon, _grafite) as exn' ->
(match exn with
| Sys.Break -> HLog.error "user break!"
| HExtlib.Localized (floc,CicNotationParser.Parse_error err) ->
| exn when matita_debug -> raise exn'
| exn -> HLog.error (snd (MatitaExcPp.to_string exn))
);
-(* LexiconSync.time_travel ~present:lex_stat ~past:initial_lexicon_status;
+(* LexiconSync.time_travel ~present:lexicon ~past:initial_lexicon_status;
* *)
pp_times fname false big_bang big_bang_u big_bang_s;
clean_exit baseuri false
let root_and_target_of opts mafile =
try
let include_paths = get_include_paths opts in
- let root,baseuri,_,_ =
+ let root,baseuri,_,relpath =
Librarian.baseuri_of_script ~include_paths mafile
in
let obj_writeable, obj_read_only =
LibraryMisc.obj_file_of_baseuri
~must_exist:false ~baseuri ~writable:false
in
- Some root, obj_writeable, obj_read_only
- with Librarian.NoRootFor x -> None, "", ""
+ Some root, relpath, obj_writeable, obj_read_only
+ with Librarian.NoRootFor x -> None, "", "", ""
;;
let mtime_of_source_object s =
projects / helm.git / blobdiff