in
let curi, metasenv, pbo, pty = proof in
let (metano,context,gty) as conjecture = CicUtil.lookup_meta goal metasenv in
- let ty_eq,_ =
+ let ty_eq,ugraph =
CicTypeChecker.type_of_aux' metasenv context equality
- CicUniv.empty_ugraph
- in
+ CicUniv.empty_ugraph in
+ let (ty_eq,metasenv',arguments,fresh_meta) =
+ ProofEngineHelpers.saturate_term
+ (ProofEngineHelpers.new_meta_of_proof proof) metasenv context ty_eq 0 in
+ let equality =
+ if List.length arguments = 0 then
+ equality
+ else
+ C.Appl (equality :: arguments) in
let eq_ind, ty, t1, t2 =
match ty_eq with
| C.Appl [C.MutInd (uri, 0, []); ty; t1; t2]
in
let eq_ind = C.Const (ind_uri uri,[]) in
if_right_to_left (eq_ind, ty, t2, t1) (eq_ind, ty, t1, t2)
- | _ -> raise (PET.Fail "Rewrite: argument is not a proof of an equality") in
+ | _ -> raise (PET.Fail (lazy "Rewrite: argument is not a proof of an equality")) in
(* 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 _,selected_terms_with_context =
+ let lifted_pattern =
+ Some (fun _ m u -> lifted_t1, m, u),[],CicSubstitution.lift 1 concl_pat
+ in
+ let subst,metasenv',ugraph,_,selected_terms_with_context =
ProofEngineHelpers.select
- ~metasenv ~conjecture:lifted_conjecture ~pattern:lifted_pattern 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 abstr_gty =
ProofEngineReduction.replace_lifting_csc 0
~equality:(==) ~what ~with_what:with_what ~where:lifted_gty in
+ let abstr_gty = CicMetaSubst.apply_subst subst abstr_gty in
+ let t1 = CicMetaSubst.apply_subst subst t1 in
+ let t2 = CicMetaSubst.apply_subst subst t2 in
+ let equality = CicMetaSubst.apply_subst subst equality in
let gty' = CicSubstitution.subst t2 abstr_gty in
- let fresh_meta = ProofEngineHelpers.new_meta_of_proof proof 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 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, metasenv, u = with_what context metasenv u 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
let whats =
match selected_terms_with_context with
- [] -> raise (ProofEngineTypes.Fail "Replace: no term selected")
+ [] -> raise (ProofEngineTypes.Fail (lazy "Replace: no term selected"))
| l ->
List.map
(fun (context_of_t,t) ->
(*CSC: we could implement something stronger by completely changing
the semantics of the tactic *)
raise (ProofEngineTypes.Fail
- "Replace: one of the selected terms is not closed") in
+ (lazy "Replace: one of the selected terms is not closed")) in
let ty_of_t_in_context,u = (* TASSI: FIXME *)
CicTypeChecker.type_of_aux' metasenv context t_in_context
CicUniv.empty_ugraph in
else
raise
(ProofEngineTypes.Fail
- "Replace: one of the selected terms and the term to be replaced with have not convertible types")
+ (lazy "Replace: one of the selected terms and the term to be replaced with have not convertible types"))
) l in
let rec aux n whats status =
match whats with
~term: (C.Const (LibraryObjects.sym_eq_URI uri, [])))
(proof,goal)
- | _ -> raise (ProofEngineTypes.Fail "Symmetry failed")
+ | _ -> raise (ProofEngineTypes.Fail (lazy "Symmetry failed"))
in
ProofEngineTypes.mk_tactic symmetry_tac
;;
[PrimitiveTactics.exact_tac ~term ; T.id_tac ; T.id_tac])
status
- | _ -> raise (ProofEngineTypes.Fail "Transitivity failed")
+ | _ -> raise (ProofEngineTypes.Fail (lazy "Transitivity failed"))
in
ProofEngineTypes.mk_tactic (transitivity_tac ~term)
;;
projects / helm.git / blobdiff