let proof,goal = status 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
[] -> assert false
| Some (Cic.Name s,Cic.Decl ty)::_ when name = s ->
Cic.Rel n, S.lift n ty
- | Some (Cic.Name s,Cic.Def _)::_ -> assert false (*CSC: not implemented yet! But does this make any sense?*)
+ | Some (Cic.Name s,Cic.Def _)::_ when name = s -> assert false (*CSC: not implemented yet! But does this make any sense?*)
| _::tl -> find_hyp (n+1) tl
in
let arg,gty = find_hyp 1 context in
| 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
match concl_pat with
| None -> None
| Some term -> Some (S.lift 1 term) in
- Some (fun _ m u -> lifted_t1, m, u),[],lifted_concl_pat
+ Some (fun c m u ->
+ let distance = pred (List.length c - List.length context) in
+ S.lift distance lifted_t1, m, u),[],lifted_concl_pat
in
let subst,metasenv',ugraph,_,selected_terms_with_context =
ProofEngineHelpers.select
ProofEngineTypes.mk_tactic (transitivity_tac ~term)
;;
-(* FG: subst tactic *********************************************************)
-
-(* FG: This should be replaced by T.try_tactic *)
-let try_tactic ~tactic =
- let try_tactic status =
- try PET.apply_tactic tactic status with
- | PET.Fail _ -> PET.apply_tactic T.id_tac status
- in
- PET.mk_tactic try_tactic
-
-let rec lift_rewrite_tac ~context ~direction ~pattern equality =
- let lift_rewrite_tac status =
- let (proof, goal) = status 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
- in
- PET.mk_tactic lift_rewrite_tac
-
-
-let msg0 = lazy "Subst: not found in context"
-let msg1 = lazy "Subst: not a simple equality"
-let msg2 = lazy "Subst: recursive equation"
-
-let subst_tac ~hyp =
- let hole = C.Implicit (Some `Hole) in
- let subst_tac status =
- let (proof, goal) = status 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
- | None -> raise (PET.Fail msg0)
- in
- let ty, _ = TC.type_of_aux' metasenv context what CicUniv.empty_ugraph in
- let direction, i, t = match ty with
- | (C.Appl [(C.MutInd (uri, 0, [])); _; C.Rel i; t])
- when LO.is_eq_URI uri -> `LeftToRight, i, t
- | (C.Appl [(C.MutInd (uri, 0, [])); _; t; C.Rel i])
- when LO.is_eq_URI uri -> `RightToLeft, i, t
- | _ -> raise (PET.Fail msg1)
- in
- let rewrite pattern =
- let tactic = lift_rewrite_tac ~context ~direction ~pattern what in
- try_tactic ~tactic
- in
- let var = match PEH.get_name context i with
- | Some name -> name
- | None -> raise (PET.Fail msg0)
- in
- if DTI.does_not_occur i t then () else raise (PET.Fail msg2);
- let map self = function
- | Some (C.Name s, _) when s <> self ->
- Some (rewrite (None, [(s, hole)], None))
- | _ -> None
- in
- let rew_hips = HEL.list_rev_map_filter (map hyp) context in
- let rew_concl = rewrite (None, [], Some hole) in
- let clear = PESR.clear ~hyps:[hyp; var] in
- let tactics = List.rev_append (rew_concl :: rew_hips) [clear] in
- PET.apply_tactic (T.seq ~tactics) status
- in
- PET.mk_tactic subst_tac
-
-let subst_tac =
- let subst hyp = try_tactic ~tactic:(subst_tac hyp) in
- let map = function
- | Some (C.Name s, _) -> Some (subst s)
- | _ -> None
- in
- let subst_tac status =
- let (proof, goal) = status 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
- in
- PET.mk_tactic subst_tac