GrafiteDisambiguate.disambiguate_tactic
lexicon_status_ref
(GrafiteTypes.get_proof_context grafite_status goal)
- (GrafiteTypes.get_proof_metasenv grafite_status)
+ (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 = GrafiteTypes.get_baseuri grafite_status in
let lexicon_status,metasenv,cmd =
- GrafiteDisambiguate.disambiguate_command
- ~baseuri:(
- try
- Some (GrafiteTypes.get_string_option grafite_status "baseuri")
- with
- GrafiteTypes.Option_error _ -> None)
+ GrafiteDisambiguate.disambiguate_command ~baseuri
!lexicon_status_ref (GrafiteTypes.get_proof_metasenv grafite_status) cmd
in
lexicon_status_ref := lexicon_status;
in
GrafiteTypes.set_metasenv metasenv grafite_status,macro
-let eval_ast ?do_heavy_checks ?clean_baseuri lexicon_status
+let eval_ast ?do_heavy_checks lexicon_status
grafite_status (text,prefix_len,ast)
=
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 =
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 ?clean_baseuri grafite_status (text,prefix_len,ast) in
+ ~disambiguate_tactic:(wrap (disambiguate_tactic text prefix_len lexicon_status_ref))
+ ~disambiguate_command:(wrap (disambiguate_command 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
+ in
let new_lexicon_status =
- LexiconSync.add_aliases_for_objs !lexicon_status_ref new_objs in
+ LexiconSync.add_aliases_for_objs new_lexicon_status new_objs in
let new_aliases =
LexiconSync.alias_diff ~from:lexicon_status new_lexicon_status in
let _,intermediate_states =
- let baseuri = GrafiteTypes.get_string_option new_grafite_status "baseuri" in
List.fold_left
- (fun (lexicon_status,acc) (k,((v,_) as value)) ->
+ (fun (lexicon_status,acc) (k,value) ->
+ let v = LexiconAst.description_of_alias value in
let b =
try
- UriManager.buri_of_uri (UriManager.uri_of_string v) = baseuri
+ (* this hack really sucks! *)
+ UriManager.buri_of_uri (UriManager.uri_of_string v) =
+ baseuri
with
- UriManager.IllFormedUri _ -> false (* v is a description, not a URI *)
+ 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 *)
in
if b then
lexicon_status,acc
else
+
let new_lexicon_status =
LexiconEngine.set_proof_aliases lexicon_status [k,value]
in
((new_grafite_status,new_lexicon_status),None)::intermediate_states
exception TryingToAdd of string
+exception EnrichedWithStatus of exn * LexiconEngine.status * GrafiteTypes.status
let out = ref ignore
let set_callback f = out := f
-let eval_from_stream ~first_statement_only ~include_paths ?(prompt=false)
- ?do_heavy_checks ?clean_baseuri ?(enforce_no_new_aliases=true)
+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
=
+ let matita_debug = Helm_registry.get_bool "matita.debug" in
let rec loop lexicon_status grafite_status statuses =
let loop =
- if first_statement_only then
- fun _ _ statuses -> statuses
- else
- loop
+ if first_statement_only then fun _ _ statuses -> statuses
+ else loop
in
- if prompt then (print_string "matita> "; flush stdout);
+ let stop,l,g,s =
try
- let lexicon_status,ast =
- GrafiteParser.parse_statement ~include_paths str lexicon_status
- in
- (match ast with
- GrafiteParser.LNone _ ->
- watch_statuses lexicon_status grafite_status ;
- loop lexicon_status grafite_status
- (((grafite_status,lexicon_status),None)::statuses)
- | GrafiteParser.LSome ast ->
- !out ast;
- cb grafite_status ast;
- let new_statuses =
- eval_ast ?do_heavy_checks ?clean_baseuri lexicon_status
- grafite_status ("",0,ast) in
- if enforce_no_new_aliases then
- List.iter
- (fun (_,alias) ->
- match alias with
- None -> ()
- | Some (k,((v,_) as value)) ->
- let newtxt =
- DisambiguatePp.pp_environment
- (DisambiguateTypes.Environment.add k value
- DisambiguateTypes.Environment.empty)
- in
- raise (TryingToAdd newtxt)) new_statuses;
- let grafite_status,lexicon_status =
- match new_statuses with
- [] -> assert false
- | (s,_)::_ -> s
- in
- watch_statuses lexicon_status grafite_status ;
- loop lexicon_status grafite_status (new_statuses @ statuses))
- with
- End_of_file -> statuses
+ let cont =
+ try
+ 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
+ | Some (lexicon_status,ast) ->
+ (match ast with
+ GrafiteParser.LNone _ ->
+ watch_statuses lexicon_status grafite_status ;
+ false, lexicon_status, grafite_status,
+ (((grafite_status,lexicon_status),None)::statuses)
+ | GrafiteParser.LSome ast ->
+ !out ast;
+ cb grafite_status ast;
+ let new_statuses =
+ eval_ast ?do_heavy_checks lexicon_status
+ grafite_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
+ raise (TryingToAdd newtxt)) new_statuses;
+ let grafite_status,lexicon_status =
+ match new_statuses with
+ [] -> assert false
+ | (s,_)::_ -> s
+ in
+ watch_statuses lexicon_status grafite_status ;
+ false, lexicon_status, grafite_status, (new_statuses @ statuses))
+ with exn when not matita_debug ->
+ raise (EnrichedWithStatus (exn, lexicon_status, grafite_status))
+ in
+ if stop then s else loop l g s
in
loop lexicon_status grafite_status []
;;
projects / helm.git / blobdiff