(HExtlib.dummy_floc, CicUtil.term_of_uri uri, false, arity, saturations)
let eval_unification_hint status t n =
- (* XXX no undo *)
- NCicUnifHint.add_user_provided_hint t n;
+ let aux status =
+ let hstatus =
+ NCicUnifHint.add_user_provided_hint (status.NRstatus.uhint_db) t n
+ in
+ { status with NRstatus.uhint_db = hstatus } in
+ let rstatus = aux (GrafiteTypes.get_rstatus status) in
+ let status = GrafiteTypes.set_rstatus rstatus status in
+ let dump = GrafiteTypes.get_dump status in
+ let dump = fun status -> aux (dump status) in
+ let status = GrafiteTypes.set_dump dump status in
status,`Old []
;;
| GrafiteAst.Merge _ -> NTactics.merge_tac
;;
-let eval_ng_non_punct (_text, _prefix_len, punct) =
- match punct with
- | GrafiteAst.Focus (_,l) -> NTactics.focus_tac l
- | GrafiteAst.Unfocus _ -> NTactics.unfocus_tac
- | GrafiteAst.Skip _ -> NTactics.skip_tac
-;;
-
let eval_ng_tac (text, prefix_len, tac) =
match tac with
| GrafiteAst.NApply (_loc, t) -> NTactics.apply_tac (text,prefix_len,t)
| GrafiteAst.NAuto (_loc, (l,a)) ->
NTactics.auto_tac
~params:(List.map (fun x -> "",0,x) l,a)
+ | GrafiteAst.NBranch _ -> NTactics.branch_tac
| GrafiteAst.NCases (_loc, what, where) ->
NTactics.cases_tac
~what:(text,prefix_len,what)
| GrafiteAst.NChange (_loc, pat, ww) ->
NTactics.change_tac
~where:(text,prefix_len,pat) ~with_what:(text,prefix_len,ww)
+ | GrafiteAst.NDot _ -> NTactics.dot_tac
| GrafiteAst.NElim (_loc, what, where) ->
NTactics.elim_tac
~what:(text,prefix_len,what)
~where:(text,prefix_len,where)
+ | GrafiteAst.NFocus (_,l) -> NTactics.focus_tac l
| GrafiteAst.NGeneralize (_loc, where) ->
NTactics.generalize_tac ~where:(text,prefix_len,where)
| GrafiteAst.NId _ -> (fun x -> x)
| GrafiteAst.NLetIn (_loc,where,what,name) ->
NTactics.letin_tac ~where:(text,prefix_len,where)
~what:(text,prefix_len,what) name
+ | GrafiteAst.NMerge _ -> NTactics.merge_tac
+ | GrafiteAst.NPos (_,l) -> NTactics.pos_tac l
| GrafiteAst.NReduce (_loc, reduction, where) ->
NTactics.reduce_tac ~reduction ~where:(text,prefix_len,where)
| GrafiteAst.NRewrite (_loc,dir,what,where) ->
NTactics.rewrite_tac ~dir ~what:(text,prefix_len,what)
~where:(text,prefix_len,where)
+ | GrafiteAst.NSemicolon _ -> fun x -> x
+ | GrafiteAst.NShift _ -> NTactics.shift_tac
+ | GrafiteAst.NSkip _ -> NTactics.skip_tac
+ | GrafiteAst.NUnfocus _ -> NTactics.unfocus_tac
+ | GrafiteAst.NWildcard _ -> NTactics.wildcard_tac
;;
let subst_metasenv_and_fix_names s =
raise (IncludedFileNotCompiled (moopath_rw,baseuri))
in
let status = eval_from_moo.efm_go status moopath in
+ let rstatus = GrafiteTypes.get_rstatus status in
+ let rstatus =
+ NCicLibrary.require ~baseuri:(NUri.uri_of_string baseuri) rstatus in
+ let status = GrafiteTypes.set_rstatus rstatus status in
(* debug
let lt_uri = UriManager.uri_of_string "cic:/matita/nat/orders/lt.con" in
let nat_uri = UriManager.uri_of_string "cic:/matita/nat/nat/nat.ind" in
(match status.GrafiteTypes.ng_status with
| GrafiteTypes.ProofMode
{ NTacStatus.istatus =
- {NTacStatus.pstatus = pstatus; lstatus=lexicon_status} } ->
+ { NTacStatus.pstatus = pstatus; estatus = estatus } } ->
let uri,height,menv,subst,obj_kind = pstatus in
if menv <> [] then
raise
let height = NCicTypeChecker.height_of_obj_kind uri obj_kind in
let obj = uri,height,[],[],obj_kind in
NCicTypeChecker.typecheck_obj obj;
- NCicLibrary.add_obj uri obj;
+ let timestamp = NCicLibrary.add_obj uri obj in
let objs = NCicElim.mk_elims obj in
- let uris =
- uri::
- List.map
- (fun (uri,_,_,_,_) as obj ->
+ let timestamp,uris_rev =
+ List.fold_left
+ (fun (timestamp,uris_rev) (uri,_,_,_,_) as obj ->
NCicTypeChecker.typecheck_obj obj;
- NCicLibrary.add_obj uri obj;
- uri
- ) objs
- in
- {status with
- GrafiteTypes.ng_status =
- GrafiteTypes.CommandMode lexicon_status },`New uris
+ let timestamp = NCicLibrary.add_obj uri obj in
+ timestamp,uri::uris_rev
+ ) (timestamp,[]) objs in
+ let uris = uri::List.rev uris_rev in
+ GrafiteTypes.set_library_db timestamp
+ {status with
+ GrafiteTypes.ng_status =
+ GrafiteTypes.CommandMode estatus },`New uris
| _ -> raise (GrafiteTypes.Command_error "Not in proof mode"))
| GrafiteAst.Relation (loc, id, a, aeq, refl, sym, trans) ->
Setoids.add_relation id a aeq refl sym trans;
NCicEnvironment.add_constraint strict [false,u1] [false,u2];
status, `New [u1;u2]
| GrafiteAst.NObj (loc,obj) ->
- let lexicon_status =
+ let estatus =
match status.GrafiteTypes.ng_status with
| GrafiteTypes.ProofMode _ -> assert false
- | GrafiteTypes.CommandMode ls -> ls in
- let lexicon_status,obj =
- GrafiteDisambiguate.disambiguate_nobj lexicon_status
+ | GrafiteTypes.CommandMode es -> es
+ in
+ let estatus,obj =
+ GrafiteDisambiguate.disambiguate_nobj estatus
~baseuri:(GrafiteTypes.get_baseuri status) (text,prefix_len,obj) in
let uri,height,nmenv,nsubst,nobj = obj in
let ninitial_stack = Continuationals.Stack.of_nmetasenv nmenv in
GrafiteTypes.ProofMode
(subst_metasenv_and_fix_names
{ NTacStatus.gstatus = ninitial_stack;
- istatus = { NTacStatus.pstatus = obj; lstatus = lexicon_status}})
+ istatus = { NTacStatus.pstatus = obj; estatus = estatus}})
}
in
(match nmenv with
| GrafiteAst.Tactic (_, None, punct) ->
eval_tactical status
(punctuation_tactical_of_ast (text,prefix_len,punct)),`Old []
- | GrafiteAst.NTactic (_(*loc*), tac, punct) ->
+ | GrafiteAst.NTactic (_(*loc*), tacl) ->
(match status.GrafiteTypes.ng_status with
| GrafiteTypes.CommandMode _ -> assert false
| GrafiteTypes.ProofMode nstatus ->
- let nstatus = eval_ng_tac (text,prefix_len,tac) nstatus in
- let nstatus = subst_metasenv_and_fix_names nstatus in
- let nstatus = eval_ng_punct (text,prefix_len,punct) nstatus in
+ let nstatus =
+ List.fold_left
+ (fun nstatus tac ->
+ let nstatus = eval_ng_tac (text,prefix_len,tac) nstatus in
+ subst_metasenv_and_fix_names nstatus)
+ nstatus tacl
+ in
NTacStatus.pp_tac_status nstatus;
{ status with GrafiteTypes.ng_status= GrafiteTypes.ProofMode nstatus },
`New [])
in
eval_tactical status
(punctuation_tactical_of_ast (text,prefix_len,punct)),`Old []
- | GrafiteAst.NNonPunctuationTactical (_, non_punct, punct) ->
- (match status.GrafiteTypes.ng_status with
- | GrafiteTypes.CommandMode _ -> assert false
- | GrafiteTypes.ProofMode nstatus ->
- let nstatus = eval_ng_non_punct (text,prefix_len,non_punct) nstatus in
- let nstatus = eval_ng_punct (text,prefix_len,punct) nstatus in
- NTacStatus.pp_tac_status nstatus;
- { status with GrafiteTypes.ng_status= GrafiteTypes.ProofMode nstatus },
- `New [])
| GrafiteAst.Command (_, cmd) ->
eval_command.ec_go ~disambiguate_command opts status (text,prefix_len,cmd)
| GrafiteAst.Macro (loc, macro) ->
projects / helm.git / blobdiff