Commit 6c3e5050 authored by Robbert Krebbers's avatar Robbert Krebbers

Bump Iris (sbi changes).

parent a180a025
Pipeline #29361 failed with stage
in 18 minutes and 8 seconds
...@@ -9,5 +9,5 @@ build: [make "-j%{jobs}%"] ...@@ -9,5 +9,5 @@ build: [make "-j%{jobs}%"]
install: [make "install"] install: [make "install"]
remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/iron" ] remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/iron" ]
depends: [ depends: [
"coq-iris" { (= "dev.2020-05-18.2.fdda97e8") | (= "dev") } "coq-iris" { (= "dev.2020-05-24.1.76bec8b7") | (= "dev") }
] ]
This diff is collapsed.
...@@ -44,7 +44,6 @@ Class ironInvG (Σ : gFunctors) := IronInvG { ...@@ -44,7 +44,6 @@ Class ironInvG (Σ : gFunctors) := IronInvG {
Notation ironProp Σ := (fracPred (iProp Σ)). Notation ironProp Σ := (fracPred (iProp Σ)).
Notation ironPropO Σ := (fracPredO (iPropO Σ)). Notation ironPropO Σ := (fracPredO (iPropO Σ)).
Notation ironPropI Σ := (fracPredI (uPredI (iResUR Σ))). Notation ironPropI Σ := (fracPredI (uPredI (iResUR Σ))).
Notation ironPropSI Σ := (fracPredSI (uPredSI (iResUR Σ))).
Instance perm_as_fractional `{ironInvG Σ} π : AsFractional (perm π) perm π. Instance perm_as_fractional `{ironInvG Σ} π : AsFractional (perm π) perm π.
Proof. split. done. apply _. Qed. Proof. split. done. apply _. Qed.
...@@ -75,7 +74,7 @@ Context `{ironInvG Σ, invG Σ}. ...@@ -75,7 +74,7 @@ Context `{ironInvG Σ, invG Σ}.
Implicit Types P : ironProp Σ. Implicit Types P : ironProp Σ.
(** Fancy updates *) (** Fancy updates *)
Lemma iron_fupd_mixin : BiFUpdMixin (ironPropSI Σ) iron_fupd. Lemma iron_fupd_mixin : BiFUpdMixin (ironPropI Σ) iron_fupd.
Proof. Proof.
split; rewrite iron_fupd_eq. split; rewrite iron_fupd_eq.
- split=>/= π. solve_proper. - split=>/= π. solve_proper.
...@@ -106,7 +105,7 @@ Proof. ...@@ -106,7 +105,7 @@ Proof.
apply bi.pure_elim_l=> ->. rewrite bi.pure_True // left_id. apply bi.pure_elim_l=> ->. rewrite bi.pure_True // left_id.
by rewrite -assoc -fracPred_at_sep_2. by rewrite -assoc -fracPred_at_sep_2.
Qed. Qed.
Global Instance iron_bi_fupd : BiFUpd (ironPropSI Σ) := Global Instance iron_bi_fupd : BiFUpd (ironPropI Σ) :=
{| bi_fupd_mixin := iron_fupd_mixin |}. {| bi_fupd_mixin := iron_fupd_mixin |}.
Lemma fracPred_at_fupd π2 E1 E2 P : Lemma fracPred_at_fupd π2 E1 E2 P :
...@@ -120,7 +119,7 @@ Proof. ...@@ -120,7 +119,7 @@ Proof.
by rewrite fupd_frame_l. by rewrite fupd_frame_l.
Qed. Qed.
Global Instance iron_bi_bupd_fupd : BiBUpdFUpd (ironPropSI Σ). Global Instance iron_bi_bupd_fupd : BiBUpdFUpd (ironPropI Σ).
Proof. Proof.
intros E P. split=>/= π2. rewrite fracPred_at_bupd -fracPred_at_fupd_2 /=. intros E P. split=>/= π2. rewrite fracPred_at_bupd -fracPred_at_fupd_2 /=.
by rewrite bupd_fupd. by rewrite bupd_fupd.
......
...@@ -375,7 +375,6 @@ Global Instance elim_modal_embed_affine_bupd_hyp `{BiAffine PROP, BiBUpd PROP} ...@@ -375,7 +375,6 @@ Global Instance elim_modal_embed_affine_bupd_hyp `{BiAffine PROP, BiBUpd PROP}
ElimModal φ p p' (|==> <affine> PP)%I P' Q Q' ElimModal φ p p' (|==> <affine> PP)%I P' Q Q'
ElimModal φ p p' (<affine> |==> PP) P' Q Q'. ElimModal φ p p' (<affine> |==> PP) P' Q Q'.
Proof. by rewrite /ElimModal embed_bupd -fracPred_affinely_bupd. Qed. Proof. by rewrite /ElimModal embed_bupd -fracPred_affinely_bupd. Qed.
End bi.
(* LEFT OVER from monpred, SEE ABOVE: (* LEFT OVER from monpred, SEE ABOVE:
(* When P and/or Q are evars when doing typeclass search on [IntoWand (* When P and/or Q are evars when doing typeclass search on [IntoWand
...@@ -401,13 +400,6 @@ Hint Extern 2 (IntoWand _ _ (fracPred_at _ _) (fracPred_at ?P _) ?Q) => ...@@ -401,13 +400,6 @@ Hint Extern 2 (IntoWand _ _ (fracPred_at _ _) (fracPred_at ?P _) ?Q) =>
: typeclass_instances. : typeclass_instances.
*) *)
Section sbi.
Context {PROP : sbi}.
Local Notation fracPred := (fracPred PROP).
Implicit Types P Q R : fracPred.
Implicit Types PP QQ RR : PROP.
Implicit Types φ : Prop.
(* LEFT OVER from monpred, SEE ABOVE: (* LEFT OVER from monpred, SEE ABOVE:
Global Instance from_forall_fracPred_at_plainly `{BiPlainly PROP} i P Φ : Global Instance from_forall_fracPred_at_plainly `{BiPlainly PROP} i P Φ :
(∀ π, MakeFracPredAt π P (Φ π)) → (∀ π, MakeFracPredAt π P (Φ π)) →
...@@ -429,8 +421,8 @@ Global Instance is_except_0_fracPred_at π P : ...@@ -429,8 +421,8 @@ Global Instance is_except_0_fracPred_at π P :
Proof. rewrite /IsExcept0=>- [/(_ π)]. by rewrite fracPred_at_except_0. Qed. Proof. rewrite /IsExcept0=>- [/(_ π)]. by rewrite fracPred_at_except_0. Qed.
*) *)
Global Instance make_fracPred_at_internal_eq {A : ofeT} (x y : A) π : Global Instance make_fracPred_at_internal_eq `{!BiInternalEq PROP} {A : ofeT} (x y : A) π :
@MakeFracPredAt PROP π (x y) (x y). MakeFracPredAt π (x y) (x y).
Proof. by rewrite /MakeFracPredAt fracPred_at_internal_eq. Qed. Proof. by rewrite /MakeFracPredAt fracPred_at_internal_eq. Qed.
Global Instance make_fracPred_at_except_0 π P QQ : Global Instance make_fracPred_at_except_0 π P QQ :
MakeFracPredAt π P QQ MakeFracPredAt π ( P) ( QQ). MakeFracPredAt π P QQ MakeFracPredAt π ( P) ( QQ).
...@@ -496,4 +488,4 @@ Proof. ...@@ -496,4 +488,4 @@ Proof.
iIntros (?) "(?&?&HQ')". iApply H; [done|]. iFrame. iIntros "?". by iApply "HQ'". iIntros (?) "(?&?&HQ')". iApply H; [done|]. iFrame. iIntros "?". by iApply "HQ'".
Qed. Qed.
*) *)
End sbi. End bi.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment