let ty_eq,ugraph =
CicTypeChecker.type_of_aux' metasenv context equality
CicUniv.empty_ugraph in
- let (ty_eq,metasenv,arguments,fresh_meta) =
+ let (ty_eq,metasenv',arguments,fresh_meta) =
ProofEngineHelpers.saturate_term
(ProofEngineHelpers.new_meta_of_proof proof) metasenv context ty_eq in
let equality =
(* now we always do as if direction was `LeftToRight *)
let fresh_name =
FreshNamesGenerator.mk_fresh_name
- ~subst:[] metasenv context C.Anonymous ~typ:ty in
+ ~subst:[] metasenv' context C.Anonymous ~typ:ty in
let lifted_t1 = CicSubstitution.lift 1 t1 in
let lifted_gty = CicSubstitution.lift 1 gty in
let lifted_conjecture =
metano,(Some (fresh_name,Cic.Decl ty))::context,lifted_gty in
let lifted_pattern = Some lifted_t1,[],CicSubstitution.lift 1 concl_pat in
- let subst,metasenv,ugraph,_,selected_terms_with_context =
+ let subst,metasenv',ugraph,_,selected_terms_with_context =
ProofEngineHelpers.select
- ~metasenv ~ugraph ~conjecture:lifted_conjecture ~pattern:lifted_pattern in
- let metasenv = CicMetaSubst.apply_subst_metasenv subst metasenv in
+ ~metasenv:metasenv' ~ugraph ~conjecture:lifted_conjecture
+ ~pattern:lifted_pattern in
+ let metasenv' = CicMetaSubst.apply_subst_metasenv subst metasenv' in
let what,with_what =
(* Note: Rel 1 does not live in the context context_of_t *)
(* The replace_lifting_csc_0 function will take care of lifting it *)
let equality = CicMetaSubst.apply_subst subst equality in
let gty' = CicSubstitution.subst t2 abstr_gty in
let irl = CicMkImplicit.identity_relocation_list_for_metavariable context in
- let metasenv' = (fresh_meta,context,gty')::metasenv in
+ let metasenv' = (fresh_meta,context,gty')::metasenv' in
let pred = C.Lambda (fresh_name, ty, abstr_gty) in
let exact_proof =
C.Appl [eq_ind ; ty ; t2 ; pred ; C.Meta (fresh_meta,irl) ; t1 ;equality]
(PT.exact_tac ~term:exact_proof) ((curi,metasenv',pbo,pty),goal)
in
assert (List.length goals = 0) ;
- (proof',[fresh_meta])
+ let goals =
+ ProofEngineHelpers.compare_metasenvs ~oldmetasenv:metasenv
+ ~newmetasenv:metasenv'
+ in
+ (proof',goals)
in
ProofEngineTypes.mk_tactic (rewrite_tac ~direction ~pattern equality)
;;
let replace_tac ~pattern ~with_what =
-(*
let replace_tac ~pattern:(wanted,hyps_pat,concl_pat) ~with_what status =
let (proof, goal) = status in
let module C = Cic in
let module U = UriManager in
let module P = PrimitiveTactics in
let module T = Tacticals in
- let _,metasenv,_,_ = proof in
+ let uri,metasenv,pbo,pty = proof in
let (_,context,ty) as conjecture = CicUtil.lookup_meta goal metasenv in
assert (hyps_pat = []); (*CSC: not implemented yet *)
let context_len = List.length context in
- let _,selected_terms_with_context =
- ProofEngineHelpers.select ~metasenv ~conjecture ~pattern in
+ let subst,metasenv,u,_,selected_terms_with_context =
+ ProofEngineHelpers.select ~metasenv ~ugraph:CicUniv.empty_ugraph
+ ~conjecture ~pattern in
+ let metasenv = CicMetaSubst.apply_subst_metasenv subst metasenv in
+ let with_what = CicMetaSubst.apply_subst subst with_what in
+ let pbo = CicMetaSubst.apply_subst subst pbo in
+ let pty = CicMetaSubst.apply_subst subst pty in
+ let status = (uri,metasenv,pbo,pty),goal in
let ty_of_with_what,u =
CicTypeChecker.type_of_aux'
metasenv context with_what CicUniv.empty_ugraph in
aux 0 whats status
in
ProofEngineTypes.mk_tactic (replace_tac ~pattern ~with_what)
-*) assert false
;;