From ec826fd739b9ef8bed8ccd1dab902f14fcd5d875 Mon Sep 17 00:00:00 2001 From: Ralf Jung <jung@mpi-sws.org> Date: Fri, 13 May 2022 21:21:36 +0200 Subject: [PATCH] fix for Iris lemma rename --- theories/logic/proofmode/spec_tactics.v | 20 ++++++++++---------- theories/logic/proofmode/tactics.v | 22 +++++++++++----------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/theories/logic/proofmode/spec_tactics.v b/theories/logic/proofmode/spec_tactics.v index 87daee7..0e7b615 100644 --- a/theories/logic/proofmode/spec_tactics.v +++ b/theories/logic/proofmode/spec_tactics.v @@ -17,7 +17,7 @@ Lemma tac_tp_bind_gen `{relocG Σ} k Δ Δ' i p e e' Q : (envs_entails Δ' Q) → (envs_entails Δ Q). Proof. - rewrite envs_entails_eq. intros; subst. simpl. + rewrite envs_entails_unseal. intros; subst. simpl. rewrite envs_simple_replace_sound // /=. destruct p; rewrite /= ?right_id; by rewrite bi.wand_elim_r. Qed. @@ -84,7 +84,7 @@ Lemma tac_tp_pure `{relocG Σ} e K' e1 k e2 Δ1 E1 i1 e' ϕ ψ Q n : end → envs_entails Δ1 Q. Proof. - rewrite envs_entails_eq. intros -> Hpure ?? HΔ1 Hψ Hϕ -> ?. + rewrite envs_entails_unseal. intros -> Hpure ?? HΔ1 Hψ Hϕ -> ?. destruct (envs_simple_replace _ _ _ _) as [Δ2|] eqn:HΔ2; try done. rewrite (envs_simple_replace_sound Δ1 Δ2 i1) //; simpl. rewrite right_id. @@ -163,7 +163,7 @@ Lemma tac_tp_store `{relocG Σ} k Δ1 Δ2 E1 i1 i2 K' e (l : loc) e' e2 v' v Q : envs_entails Δ1 Q. Proof. rewrite /IntoVal. - rewrite envs_entails_eq. intros ??? -> <- -> ? HQ. + rewrite envs_entails_unseal. intros ??? -> <- -> ? HQ. rewrite envs_lookup_delete_sound //; simpl. destruct (envs_simple_replace _ _ _ _) as [Δ3|] eqn:HΔ3; last done. rewrite envs_simple_replace_sound //; simpl. @@ -208,7 +208,7 @@ Lemma tac_tp_xchg `{relocG Σ} k Δ1 Δ2 E1 i1 i2 K' e (l : loc) e' e2 v' v Q : envs_entails Δ1 Q. Proof. rewrite /IntoVal. - rewrite envs_entails_eq. intros ??? -> <- ? -> HQ. + rewrite envs_entails_unseal. intros ??? -> <- ? -> HQ. rewrite envs_lookup_delete_sound //; simpl. destruct (envs_simple_replace _ _ _ _) as [Δ3|] eqn:HΔ3; last done. rewrite envs_simple_replace_sound //; simpl. @@ -257,7 +257,7 @@ Lemma tac_tp_load `{relocG Σ} k Δ1 Δ2 E1 i1 i2 K' e e2 (l : loc) v Q q : end → envs_entails Δ1 Q. Proof. - rewrite envs_entails_eq. intros ??? -> ? -> HQ. + rewrite envs_entails_unseal. intros ??? -> ? -> HQ. rewrite envs_lookup_delete_sound //; simpl. destruct (envs_simple_replace _ _ _ _) as [Δ3|] eqn:HΔ3; last done. rewrite (envs_simple_replace_sound Δ2 Δ3 i2) //; simpl. @@ -304,7 +304,7 @@ Lemma tac_tp_cmpxchg_fail `{relocG Σ} k Δ1 Δ2 E1 i1 i2 K' e enew (l : loc) e1 end → envs_entails Δ1 Q. Proof. - rewrite envs_entails_eq. intros ??? -> Hv1 Hv2 ??? -> HQ. + rewrite envs_entails_unseal. intros ??? -> Hv1 Hv2 ??? -> HQ. rewrite envs_lookup_delete_sound //; simpl. destruct (envs_simple_replace _ _ _ _) as [Δ3|] eqn:HΔ3; last done. rewrite (envs_simple_replace_sound Δ2 Δ3 i2) //; simpl. @@ -355,7 +355,7 @@ Lemma tac_tp_cmpxchg_suc `{relocG Σ} k Δ1 Δ2 E1 i1 i2 K' e enew (l : loc) e1 end → envs_entails Δ1 Q. Proof. - rewrite envs_entails_eq. intros ??? -> Hv1 Hv2 ??? -> HQ. + rewrite envs_entails_unseal. intros ??? -> Hv1 Hv2 ??? -> HQ. rewrite envs_lookup_delete_sound //; simpl. destruct (envs_simple_replace _ _ _ _) as [Δ3|] eqn:HΔ3; last done. rewrite (envs_simple_replace_sound Δ2 Δ3 i2) //; simpl. @@ -401,7 +401,7 @@ Lemma tac_tp_faa `{relocG Σ} k Δ1 Δ2 E1 i1 i2 K' e enew (l : loc) e2 (z1 z2 end → envs_entails Δ1 Q. Proof. - rewrite envs_entails_eq. intros ??? -> ?? -> HQ. + rewrite envs_entails_unseal. intros ??? -> ?? -> HQ. rewrite envs_lookup_delete_sound //; simpl. destruct (envs_simple_replace _ _ _ _) as [Δ3|] eqn:HΔ3; last done. rewrite (envs_simple_replace_sound Δ2 Δ3 i2) //; simpl. @@ -443,7 +443,7 @@ Lemma tac_tp_fork `{relocG Σ} k Δ1 E1 i1 K' e enew e' Q : end → envs_entails Δ1 Q. Proof. - rewrite envs_entails_eq. intros ???->-> HQ. + rewrite envs_entails_unseal. intros ???->-> HQ. destruct (envs_simple_replace _ _ _ _) as [Δ2|] eqn:HΔ2; last done. rewrite (envs_simple_replace_sound Δ1 Δ2 i1) //; simpl. rewrite right_id. @@ -502,7 +502,7 @@ Lemma tac_tp_alloc `{relocG Σ} k Δ1 E1 i1 K' e e' v Q : (envs_entails Δ2 ((l ↦ₛ v) -∗ Q)%I)) → envs_entails Δ1 Q. Proof. - rewrite envs_entails_eq. intros ??? Hfill <- HQ. + rewrite envs_entails_unseal. intros ??? Hfill <- HQ. rewrite (envs_lookup_sound' Δ1 false i1); last by eassumption. rewrite /refines_right. rewrite Hfill -fill_app /=. diff --git a/theories/logic/proofmode/tactics.v b/theories/logic/proofmode/tactics.v index ec60169..e61fe68 100644 --- a/theories/logic/proofmode/tactics.v +++ b/theories/logic/proofmode/tactics.v @@ -134,7 +134,7 @@ Lemma tac_rel_pure_l `{!relocG Σ} K e1 ℶ ℶ' E e e2 eres ϕ n m t A : envs_entails ℶ' (REL eres << t @ E : A) → envs_entails ℶ (REL e << t @ E : A). Proof. - rewrite envs_entails_eq. + rewrite envs_entails_unseal. intros Hfill Hpure Hϕ Hm ?? Hp. subst. destruct Hm as [[-> ->] | ->]; rewrite into_laterN_env_sound /= Hp. - rewrite -refines_pure_l //. @@ -207,7 +207,7 @@ Lemma tac_rel_load_l_simp `{!relocG Σ} K ℶ1 ℶ2 i1 p (l : loc) q v e t eres envs_entails ℶ2 (refines ⊤ eres t A) → envs_entails ℶ1 (refines ⊤ e t A). Proof. - rewrite envs_entails_eq. iIntros (-> ?? -> Hℶ2) "Henvs". + rewrite envs_entails_unseal. iIntros (-> ?? -> Hℶ2) "Henvs". iDestruct (into_laterN_env_sound with "Henvs") as "Henvs". iDestruct (envs_lookup_split with "Henvs") as "[Hl Henvs]"; first done. rewrite Hℶ2. iApply (refines_load_l K ⊤ l q). iModIntro. iExists v. @@ -224,7 +224,7 @@ Lemma tac_rel_load_r `{!relocG Σ} K ℶ1 E i1 p (l : loc) q e t tres A v : envs_entails ℶ1 (refines E e tres A) → envs_entails ℶ1 (refines E e t A). Proof. - rewrite envs_entails_eq. iIntros (-> ?? -> Hg) "Henvs". + rewrite envs_entails_unseal. iIntros (-> ?? -> Hg) "Henvs". iDestruct (envs_lookup_split with "Henvs") as "[Hl Henvs]"; first done. rewrite Hg. destruct p; simpl. - iDestruct "Hl" as "#Hl". iApply (refines_load_r with "Hl"); first done. @@ -280,7 +280,7 @@ Lemma tac_rel_store_l_simpl `{!relocG Σ} K ℶ1 ℶ2 ℶ3 i1 (l : loc) v e' v' envs_entails ℶ3 (refines ⊤ eres t A) → envs_entails ℶ1 (refines ⊤ e t A). Proof. - rewrite envs_entails_eq. intros ?????? Hg. + rewrite envs_entails_unseal. intros ?????? Hg. subst e eres. rewrite into_laterN_env_sound envs_simple_replace_sound //; simpl. rewrite bi.later_sep. @@ -301,7 +301,7 @@ Lemma tac_rel_store_r `{!relocG Σ} K ℶ1 ℶ2 i1 E (l : loc) v e' v' e t eres envs_entails ℶ2 (refines E t eres A) → envs_entails ℶ1 (refines E t e A). Proof. - rewrite envs_entails_eq. intros ?????? Hg. + rewrite envs_entails_unseal. intros ?????? Hg. subst e eres. rewrite envs_simple_replace_sound //; simpl. rewrite right_id. @@ -359,7 +359,7 @@ Lemma tac_rel_xchg_l_simpl `{!relocG Σ} K ℶ1 ℶ2 ℶ3 i1 (l : loc) v e' v' e envs_entails ℶ3 (refines ⊤ eres t A) → envs_entails ℶ1 (refines ⊤ e t A). Proof. - rewrite envs_entails_eq. intros ?????? Hg. + rewrite envs_entails_unseal. intros ?????? Hg. subst e eres. rewrite into_laterN_env_sound envs_simple_replace_sound //; simpl. rewrite bi.later_sep. @@ -380,7 +380,7 @@ Lemma tac_rel_xchg_r `{!relocG Σ} K ℶ1 ℶ2 i1 E (l : loc) v e' v' e t eres A envs_entails ℶ2 (refines E t eres A) → envs_entails ℶ1 (refines E t e A). Proof. - rewrite envs_entails_eq. intros ?????? Hg. + rewrite envs_entails_unseal. intros ?????? Hg. subst e eres. rewrite envs_simple_replace_sound //; simpl. rewrite right_id. @@ -439,7 +439,7 @@ Lemma tac_rel_alloc_l_simpl `{!relocG Σ} K ℶ1 ℶ2 e t e' v' A : (l ↦ v' -∗ refines ⊤ (fill K (of_val #l)) t A))) → envs_entails ℶ1 (refines ⊤ e t A). Proof. - rewrite envs_entails_eq. intros ???; subst. + rewrite envs_entails_unseal. intros ???; subst. rewrite into_laterN_env_sound /=. rewrite -(refines_alloc_l _ ⊤); eauto. rewrite -fupd_intro. @@ -507,7 +507,7 @@ Lemma tac_rel_cmpxchg_fail_r `{!relocG Σ} K ℶ1 i1 E (l : loc) e1 e2 v1 v2 v e envs_entails ℶ1 (refines E t eres A) → envs_entails ℶ1 (refines E t e A). Proof. - rewrite envs_entails_eq. intros ???????? Hg. + rewrite envs_entails_unseal. intros ???????? Hg. subst e eres. rewrite envs_lookup_split // /= Hg; simpl. apply bi.wand_elim_l'. @@ -527,7 +527,7 @@ Lemma tac_rel_cmpxchg_suc_r `{!relocG Σ} K ℶ1 ℶ2 i1 E (l : loc) e1 e2 v1 v2 envs_entails ℶ2 (refines E t eres A) → envs_entails ℶ1 (refines E t e A). Proof. - rewrite envs_entails_eq. intros ????????? Hg. + rewrite envs_entails_unseal. intros ????????? Hg. subst e eres. rewrite envs_simple_replace_sound //; simpl. rewrite right_id Hg. @@ -588,7 +588,7 @@ Lemma tac_rel_newproph_l_simpl `{!relocG Σ} K ℶ1 ℶ2 e t A : (proph p vs -∗ refines ⊤ (fill K (of_val #p)) t A))) → envs_entails ℶ1 (refines ⊤ e t A). Proof. - rewrite envs_entails_eq. intros ???; subst. + rewrite envs_entails_unseal. intros ???; subst. rewrite into_laterN_env_sound /=. rewrite -(refines_newproph_l _ ⊤); eauto. rewrite -fupd_intro. -- GitLab