in
GrafiteTypes.set_metasenv metasenv grafite_status,tac
-let disambiguate_command lexicon_status_ref grafite_status cmd =
+let disambiguate_command estatus lexicon_status_ref grafite_status cmd =
let baseuri = GrafiteTypes.get_baseuri grafite_status in
- let lexicon_status,metasenv,cmd =
+ let estatus,metasenv,cmd =
GrafiteDisambiguate.disambiguate_command ~baseuri
- !lexicon_status_ref (GrafiteTypes.get_proof_metasenv grafite_status) cmd
+ { estatus with NEstatus.lstatus = !lexicon_status_ref }
+ (GrafiteTypes.get_proof_metasenv grafite_status) cmd
in
- lexicon_status_ref := lexicon_status;
+ lexicon_status_ref := estatus.NEstatus.lstatus;
GrafiteTypes.set_metasenv metasenv grafite_status,cmd
let disambiguate_macro lexicon_status_ref grafite_status macro context =
in
GrafiteTypes.set_metasenv metasenv grafite_status,macro
-let eval_ast ?do_heavy_checks lexicon_status
- grafite_status (text,prefix_len,ast)
-=
+let eval_ast ?do_heavy_checks grafite_status (text,prefix_len,ast) =
+ let lexicon_status = GrafiteTypes.get_lexicon grafite_status in
let dump = not (Helm_registry.get_bool "matita.moo") in
let lexicon_status_ref = ref lexicon_status in
let baseuri = GrafiteTypes.get_baseuri grafite_status in
let changed_lexicon = ref false in
let wrap f x = changed_lexicon := true; f x in
- let grafite_status =
- match grafite_status.GrafiteTypes.ng_status with
- | GrafiteTypes.CommandMode _ ->
- { grafite_status with GrafiteTypes.ng_status =
- GrafiteTypes.CommandMode lexicon_status }
- | GrafiteTypes.ProofMode s ->
- { grafite_status with GrafiteTypes.ng_status =
- GrafiteTypes.ProofMode
- { s with NTacStatus.istatus = { s.NTacStatus.istatus with NTacStatus.lstatus = lexicon_status }}}
- in
let new_grafite_status,new_objs =
match ast with
| G.Executable (_, G.Command (_, G.Coercion _)) when dump ->
| ast ->
GrafiteEngine.eval_ast
~disambiguate_tactic:(wrap (disambiguate_tactic text prefix_len lexicon_status_ref))
- ~disambiguate_command:(wrap (disambiguate_command lexicon_status_ref))
+ ~disambiguate_command:(wrap
+ (disambiguate_command
+ (GrafiteTypes.get_estatus grafite_status) lexicon_status_ref))
~disambiguate_macro:(wrap (disambiguate_macro lexicon_status_ref))
?do_heavy_checks grafite_status (text,prefix_len,ast)
in
let new_lexicon_status =
if !changed_lexicon then
!lexicon_status_ref
- else
- match new_grafite_status.GrafiteTypes.ng_status with
- | GrafiteTypes.CommandMode l -> l
- | GrafiteTypes.ProofMode s -> s.NTacStatus.istatus.NTacStatus.lstatus
+ else
+ GrafiteTypes.get_lexicon new_grafite_status
in
let new_lexicon_status =
LexiconSync.add_aliases_for_objs new_lexicon_status new_objs in
let new_lexicon_status =
LexiconEngine.set_proof_aliases lexicon_status [k,value]
in
- new_lexicon_status,
- ((grafite_status,new_lexicon_status),Some (k,value))::acc
+ let grafite_status =
+ GrafiteTypes.set_lexicon new_lexicon_status grafite_status
+ in
+ new_lexicon_status, (grafite_status ,Some (k,value))::acc
) (lexicon_status,[]) new_aliases
in
- ((new_grafite_status,new_lexicon_status),None)::intermediate_states
+ let new_grafite_status =
+ GrafiteTypes.set_lexicon new_lexicon_status new_grafite_status
+ in
+ ((new_grafite_status),None)::intermediate_states
+;;
exception TryingToAdd of string
-exception EnrichedWithStatus of exn * LexiconEngine.status * GrafiteTypes.status
+exception EnrichedWithStatus of exn * GrafiteTypes.status
let eval_from_stream ~first_statement_only ~include_paths
?do_heavy_checks ?(enforce_no_new_aliases=true)
- ?(watch_statuses=fun _ _ -> ()) lexicon_status grafite_status str cb
+ ?(watch_statuses=fun _ -> ()) grafite_status str cb
=
let matita_debug = Helm_registry.get_bool "matita.debug" in
- let rec loop lexicon_status grafite_status statuses =
+ let rec loop grafite_status statuses =
let loop =
- if first_statement_only then fun _ _ statuses -> statuses
+ if first_statement_only then fun _ statuses -> statuses
else loop
in
- let stop,l,g,s =
+ let stop,g,s =
try
let cont =
try
+ let lexicon_status = GrafiteTypes.get_lexicon grafite_status in
Some (GrafiteParser.parse_statement ~include_paths str lexicon_status)
with
End_of_file -> None
in
match cont with
- | None -> true, lexicon_status, grafite_status, statuses
+ | None -> true, grafite_status, statuses
| Some (lexicon_status,ast) ->
+ let grafite_status =
+ GrafiteTypes.set_lexicon lexicon_status grafite_status
+ in
(match ast with
GrafiteParser.LNone _ ->
- watch_statuses lexicon_status grafite_status ;
- false, lexicon_status, grafite_status,
- (((grafite_status,lexicon_status),None)::statuses)
+ watch_statuses grafite_status ;
+ false, grafite_status,
+ (((grafite_status),None)::statuses)
| GrafiteParser.LSome ast ->
cb grafite_status ast;
- let new_statuses =
- eval_ast ?do_heavy_checks lexicon_status
- grafite_status ("",0,ast) in
+ let new_statuses =
+ eval_ast ?do_heavy_checks grafite_status ("",0,ast) in
if enforce_no_new_aliases then
List.iter
(fun (_,alias) ->
| Some (k,value) ->
let newtxt = LexiconAstPp.pp_alias value in
raise (TryingToAdd newtxt)) new_statuses;
- let grafite_status,lexicon_status =
+ let grafite_status =
match new_statuses with
[] -> assert false
| (s,_)::_ -> s
in
- watch_statuses lexicon_status grafite_status ;
- false, lexicon_status, grafite_status, (new_statuses @ statuses))
+ watch_statuses grafite_status ;
+ false, grafite_status, (new_statuses @ statuses))
with exn when not matita_debug ->
- raise (EnrichedWithStatus (exn, lexicon_status, grafite_status))
+ raise (EnrichedWithStatus (exn, grafite_status))
in
- if stop then s else loop l g s
+ if stop then s else loop g s
in
- loop lexicon_status grafite_status []
+ loop grafite_status []
;;
projects / helm.git / blobdiff