let debug = false ;;
let debug_print = if debug then prerr_endline else ignore ;;
-let disambiguate_tactic text prefix_len lexicon_status_ref grafite_status goal tac =
- let metasenv,tac =
- GrafiteDisambiguate.disambiguate_tactic
- lexicon_status_ref
- (GrafiteTypes.get_proof_context grafite_status goal)
- (GrafiteTypes.get_proof_metasenv grafite_status) (Some goal)
- tac
- in
- GrafiteTypes.set_metasenv metasenv grafite_status,tac
-
-let disambiguate_command lexicon_status_ref grafite_status cmd =
- let baseuri = grafite_status#baseuri in
- let lexicon_status,metasenv,cmd =
- GrafiteDisambiguate.disambiguate_command ~baseuri
- !lexicon_status_ref (GrafiteTypes.get_proof_metasenv grafite_status) cmd
- in
- lexicon_status_ref := lexicon_status;
- GrafiteTypes.set_metasenv metasenv grafite_status,cmd
-
-let disambiguate_macro lexicon_status_ref grafite_status macro context =
- let metasenv,macro =
- GrafiteDisambiguate.disambiguate_macro
- lexicon_status_ref
- (GrafiteTypes.get_proof_metasenv grafite_status)
- context macro
- in
- GrafiteTypes.set_metasenv metasenv grafite_status,macro
-
let eval_macro_screenshot (status : GrafiteTypes.status) name =
+ assert false (* MATITA 1.0
let _,_,metasenv,subst,_ = status#obj in
let sequent = List.hd metasenv in
let mathml =
Filename.quote (name^".png")));
HLog.debug ("generated " ^ name ^ ".png");
status, `New []
+ *)
;;
-let eval_ast ?do_heavy_checks status (text,prefix_len,ast) =
- let dump = not (Helm_registry.get_bool "matita.moo") in
- let lexicon_status_ref = ref (status :> LexiconEngine.status) in
+let eval_ast ~include_paths ?do_heavy_checks status (text,prefix_len,ast) =
+ let lexicon_status_ref = ref (status :> LexiconTypes.status) in
let baseuri = status#baseuri in
let new_status,new_objs =
- match ast with
- | G.Executable (_, G.Command (_, G.Coercion _)) when dump ->
-(* FG: some commands can not be executed when mmas are parsed *************)
-(* To be removed when mmas will be executed *)
- status, `Old []
- | ast ->
- GrafiteEngine.eval_ast
- ~disambiguate_tactic:(disambiguate_tactic text prefix_len lexicon_status_ref)
- ~disambiguate_command:(disambiguate_command lexicon_status_ref)
- ~disambiguate_macro:(disambiguate_macro lexicon_status_ref)
- ?do_heavy_checks status (text,prefix_len,ast)
+ GrafiteEngine.eval_ast ~include_paths ?do_heavy_checks status
+ (text,prefix_len,ast)
in
let new_status =
if !lexicon_status_ref#lstatus != status#lstatus then
let _,intermediate_states =
List.fold_left
(fun (status,acc) (k,value) ->
- let v = LexiconAst.description_of_alias value in
+ let v = GrafiteAst.description_of_alias value in
let b =
try
- (* this hack really sucks! *)
- UriManager.buri_of_uri (UriManager.uri_of_string v) = baseuri
+ let NReference.Ref (uri,_) = NReference.reference_of_string v in
+ NUri.baseuri_of_uri uri = baseuri
with
- UriManager.IllFormedUri _ ->
- try
- (* this too! *)
- let NReference.Ref (uri,_) = NReference.reference_of_string v in
- let ouri = NCic2OCic.ouri_of_nuri uri in
- UriManager.buri_of_uri ouri = baseuri
- with
- NReference.IllFormedReference _ ->
- false (* v is a description, not a URI *)
+ NReference.IllFormedReference _ ->
+ false (* v is a description, not a URI *)
in
if b then
status,acc
else
let new_status =
- LexiconEngine.set_proof_aliases status [k,value]
+ LexiconEngine.set_proof_aliases status
+ GrafiteAst.WithPreferences [k,value]
in
new_status, (new_status ,Some (k,value))::acc
) (status,[]) new_aliases
let stop,g,s =
try
let cont =
- try Some (GrafiteParser.parse_statement ~include_paths str status)
+ try Some (GrafiteParser.parse_statement status str)
with End_of_file -> None in
match cont with
| None -> true, status, statuses
- | Some (status,ast) ->
+ | Some ast ->
(match ast with
GrafiteParser.LNone _ ->
watch_statuses status ;
false, status, ((status,None)::statuses)
| GrafiteParser.LSome ast ->
cb status ast;
- let new_statuses = eval_ast ?do_heavy_checks status ("",0,ast) in
+ let new_statuses =
+ eval_ast ~include_paths ?do_heavy_checks status ("",0,ast) in
if enforce_no_new_aliases then
List.iter
(fun (_,alias) ->
match alias with
None -> ()
| Some (k,value) ->
- let newtxt = LexiconAstPp.pp_alias value in
+ let newtxt = GrafiteAstPp.pp_alias value in
raise (TryingToAdd newtxt)) new_statuses;
let status =
match new_statuses with