module DTI = DoubleTypeInference
module HEL = HExtlib
-let rec rewrite_tac ~direction ~(pattern: ProofEngineTypes.lazy_pattern) equality =
- let _rewrite_tac ~direction ~pattern:(wanted,hyps_pat,concl_pat) equality status
- =
+let rec rewrite_tac ~direction ~pattern:(wanted,hyps_pat,concl_pat) equality =
+ let _rewrite_tac status =
assert (wanted = None); (* this should be checked syntactically *)
let proof,goal = status in
- let curi, metasenv, pbo, pty = proof in
+ let curi, metasenv, pbo, pty, attrs = proof in
let (metano,context,gty) = CicUtil.lookup_meta goal metasenv in
+ let gsort,_ =
+ CicTypeChecker.type_of_aux' metasenv context gty CicUniv.oblivion_ugraph in
match hyps_pat with
he::(_::_ as tl) ->
PET.apply_tactic
- (Tacticals.then_
+ (T.then_
(rewrite_tac ~direction
~pattern:(None,[he],None) equality)
(rewrite_tac ~direction ~pattern:(None,tl,concl_pat)
) status
| [_] as hyps_pat when concl_pat <> None ->
PET.apply_tactic
- (Tacticals.then_
+ (T.then_
(rewrite_tac ~direction
~pattern:(None,hyps_pat,None) equality)
(rewrite_tac ~direction ~pattern:(None,[],concl_pat)
let dummy = "dummy" in
Some arg,false,
(fun ~term typ ->
- Tacticals.seq
+ T.seq
~tactics:
- [ProofEngineStructuralRules.rename name dummy;
+ [PESR.rename [name] [dummy];
P.letin_tac
~mk_fresh_name_callback:(fun _ _ _ ~typ -> Cic.Name name) term;
- ProofEngineStructuralRules.clearbody name;
+ PESR.clearbody name;
ReductionTactics.change_tac
~pattern:
(None,[name,Cic.Implicit (Some `Hole)], None)
(ProofEngineTypes.const_lazy_term typ);
- ProofEngineStructuralRules.clear [dummy]
+ PESR.clear [dummy]
]),
Some pat,gty
| _::_ -> assert false
| C.Appl [C.MutInd (uri, 0, []); ty; t1; t2]
when LibraryObjects.is_eq_URI uri ->
let ind_uri =
- if_right_to_left dir2
- LibraryObjects.eq_ind_URI LibraryObjects.eq_ind_r_URI
+ match gsort with
+ C.Sort C.Prop ->
+ if_right_to_left dir2
+ LibraryObjects.eq_ind_URI LibraryObjects.eq_ind_r_URI
+ | C.Sort C.Set ->
+ if_right_to_left dir2
+ LibraryObjects.eq_rec_URI LibraryObjects.eq_rec_r_URI
+ | _ ->
+ if_right_to_left dir2
+ LibraryObjects.eq_rect_URI LibraryObjects.eq_rect_r_URI
in
let eq_ind = C.Const (ind_uri uri,[]) in
if dir2 then
try
let (proof',goals) =
PET.apply_tactic
- (tac ~term:exact_proof newtyp) ((curi,metasenv',pbo,pty),goal)
+ (tac ~term:exact_proof newtyp) ((curi,metasenv',pbo,pty, attrs),goal)
in
let goals =
goals@(ProofEngineHelpers.compare_metasenvs ~oldmetasenv:metasenv
TC.TypeCheckerFailure _ ->
let msg = lazy "rewrite: nothing to rewrite" in
raise (PET.Fail msg)
- in
- ProofEngineTypes.mk_tactic (_rewrite_tac ~direction ~pattern equality)
-
-
-let rewrite_simpl_tac ~direction ~pattern equality =
- let rewrite_simpl_tac ~direction ~pattern equality status =
- ProofEngineTypes.apply_tactic
- (Tacticals.then_
- ~start:(rewrite_tac ~direction ~pattern equality)
+ in
+ PET.mk_tactic _rewrite_tac
+
+let rewrite_tac ~direction ~pattern equality names =
+ let _, hyps_pat, _ = pattern in
+ let froms = List.map fst hyps_pat in
+ let start = rewrite_tac ~direction ~pattern equality in
+ let continuation = PESR.rename ~froms ~tos:names in
+ if names = [] then start else T.then_ ~start ~continuation
+
+let rewrite_simpl_tac ~direction ~pattern equality names =
+ T.then_
+ ~start:(rewrite_tac ~direction ~pattern equality names)
~continuation:
(ReductionTactics.simpl_tac
- ~pattern:(ProofEngineTypes.conclusion_pattern None)))
- status
- in
- ProofEngineTypes.mk_tactic (rewrite_simpl_tac ~direction ~pattern equality)
-;;
+ ~pattern:(ProofEngineTypes.conclusion_pattern None))
+
let replace_tac ~(pattern: ProofEngineTypes.lazy_pattern) ~with_what =
let replace_tac ~(pattern: ProofEngineTypes.lazy_pattern) ~with_what status =
let _wanted, hyps_pat, concl_pat = pattern in
let (proof, goal) = status in
- let uri,metasenv,pbo,pty = proof in
+ let uri,metasenv,pbo,pty, attrs = proof in
let (_,context,ty) as conjecture = CicUtil.lookup_meta goal metasenv in
assert (hyps_pat = []); (*CSC: not implemented yet *)
let eq_URI =
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 status = (uri,metasenv,pbo,pty, attrs),goal in
let ty_of_with_what,u =
CicTypeChecker.type_of_aux'
metasenv context with_what CicUniv.empty_ugraph in
~continuations:[
T.then_
~start:(
- rewrite_tac ~direction:`LeftToRight ~pattern:lazy_pattern (C.Rel 1))
+ rewrite_tac ~direction:`LeftToRight ~pattern:lazy_pattern (C.Rel 1) [])
~continuation:(
T.then_
~start:(
ProofEngineTypes.mk_tactic
(function ((proof,goal) as status) ->
- let _,metasenv,_,_ = proof in
+ let _,metasenv,_,_, _ = proof in
let _,context,_ = CicUtil.lookup_meta goal metasenv in
let hyps =
try
with (Failure "hd") -> assert false
in
ProofEngineTypes.apply_tactic
- (ProofEngineStructuralRules.clear ~hyps) status))
+ (PESR.clear ~hyps) status))
~continuation:(aux_tac (n + 1) tl));
T.id_tac])
status
let symmetry_tac =
let symmetry_tac (proof, goal) =
- let (_,metasenv,_,_) = proof in
+ let (_,metasenv,_,_, _) = proof in
let metano,context,ty = CicUtil.lookup_meta goal metasenv in
match (R.whd context ty) with
(C.Appl [(C.MutInd (uri, 0, [])); _; _; _])
let transitivity_tac ~term =
let transitivity_tac ~term status =
let (proof, goal) = status in
- let (_,metasenv,_,_) = proof in
+ let (_,metasenv,_,_, _) = proof in
let metano,context,ty = CicUtil.lookup_meta goal metasenv in
match (R.whd context ty) with
(C.Appl [(C.MutInd (uri, 0, [])); _; _; _])
let rec lift_rewrite_tac ~context ~direction ~pattern equality =
let lift_rewrite_tac status =
let (proof, goal) = status in
- let (_, metasenv, _, _) = proof in
+ let (_, metasenv, _, _, _) = proof in
let _, new_context, _ = CicUtil.lookup_meta goal metasenv in
let n = List.length new_context - List.length context in
let equality = if n > 0 then S.lift n equality else equality in
- PET.apply_tactic (rewrite_tac ~direction ~pattern equality) status
+ PET.apply_tactic (rewrite_tac ~direction ~pattern equality []) status
in
PET.mk_tactic lift_rewrite_tac
let hole = C.Implicit (Some `Hole) in
let subst_tac status =
let (proof, goal) = status in
- let (_, metasenv, _, _) = proof in
+ let (_, metasenv, _, _, _) = proof in
let _, context, _ = CicUtil.lookup_meta goal metasenv in
let what = match PEH.get_rel context hyp with
| Some t -> t
in
let subst_tac status =
let (proof, goal) = status in
- let (_, metasenv, _, _) = proof in
+ let (_, metasenv, _, _, _) = proof in
let _, context, _ = CicUtil.lookup_meta goal metasenv in
let tactics = HEL.list_rev_map_filter map context in
PET.apply_tactic (T.seq ~tactics) status