diff --git a/iris/algebra/big_op.v b/iris/algebra/big_op.v index 39b6b0bbcf057501804f0eb8a7c2b8a8347ab57c..a56da2ac8c8aee78070c5859a970549cf29407f6 100644 --- a/iris/algebra/big_op.v +++ b/iris/algebra/big_op.v @@ -396,7 +396,7 @@ Section gmap. ([^o map] k↦y ∈ <[i:=x]> m, <[i:=P]> f k) ≡ (P `o` [^o map] k↦y ∈ m, f k). Proof. apply (big_opM_fn_insert (λ _ _, id)). Qed. - Lemma big_opM_filter' f (φ : K * A → Prop) `{∀ kx, Decision (φ kx)} m : + Lemma big_opM_filter' (φ : K * A → Prop) `{∀ kx, Decision (φ kx)} f m : ([^o map] k ↦ x ∈ filter φ m, f k x) ≡ ([^o map] k ↦ x ∈ m, if decide (φ (k, x)) then f k x else monoid_unit). Proof. @@ -536,7 +536,7 @@ Section gset. by induction X using set_ind_L; rewrite /= ?big_opS_insert ?left_id // big_opS_eq. Qed. - Lemma big_opS_filter' f (φ : A → Prop) `{∀ x, Decision (φ x)} X : + Lemma big_opS_filter' (φ : A → Prop) `{∀ x, Decision (φ x)} f X : ([^o set] y ∈ filter φ X, f y) ≡ ([^o set] y ∈ X, if decide (φ y) then f y else monoid_unit). Proof. diff --git a/iris/bi/big_op.v b/iris/bi/big_op.v index 19f48d4014ad3fc6be08253d1933768ab38de3be..680771920e617911b891047d3c2ec15f409f2d88 100644 --- a/iris/bi/big_op.v +++ b/iris/bi/big_op.v @@ -1137,12 +1137,12 @@ Section map. ([∗ map] k↦y ∈ <[i:=x]> m, <[i:=P]> Φ k) ⊣⊢ (P ∗ [∗ map] k↦y ∈ m, Φ k). Proof. apply big_opM_fn_insert'. Qed. - Lemma big_sepM_filter' Φ (φ : K * A → Prop) `{∀ kx, Decision (φ kx)} m : + Lemma big_sepM_filter' (φ : K * A → Prop) `{∀ kx, Decision (φ kx)} Φ m : ([∗ map] k ↦ x ∈ filter φ m, Φ k x) ⊣⊢ ([∗ map] k ↦ x ∈ m, if decide (φ (k, x)) then Φ k x else emp). Proof. apply: big_opM_filter'. Qed. Lemma big_sepM_filter `{BiAffine PROP} - Φ (φ : K * A → Prop) `{∀ kx, Decision (φ kx)} m : + (φ : K * A → Prop) `{∀ kx, Decision (φ kx)} Φ m : ([∗ map] k ↦ x ∈ filter φ m, Φ k x) ⊣⊢ ([∗ map] k ↦ x ∈ m, ⌜φ (k, x)⌠→ Φ k x). Proof. setoid_rewrite <-decide_emp. apply big_sepM_filter'. Qed. @@ -1819,7 +1819,7 @@ Section gset. Lemma big_sepS_singleton Φ x : ([∗ set] y ∈ {[ x ]}, Φ y) ⊣⊢ Φ x. Proof. apply big_opS_singleton. Qed. - Lemma big_sepS_filter' Φ (φ : A → Prop) `{∀ x, Decision (φ x)} X : + Lemma big_sepS_filter' (φ : A → Prop) `{∀ x, Decision (φ x)} Φ X : ([∗ set] y ∈ filter φ X, Φ y) ⊣⊢ ([∗ set] y ∈ X, if decide (φ y) then Φ y else emp). Proof. apply: big_opS_filter'. Qed. @@ -1828,23 +1828,23 @@ Section gset. ([∗ set] y ∈ filter φ X, Φ y) ⊣⊢ ([∗ set] y ∈ X, ⌜φ y⌠→ Φ y). Proof. setoid_rewrite <-decide_emp. apply big_sepS_filter'. Qed. - Lemma big_sepS_filter_acc' (P : A → Prop) `{∀ y, Decision (P y)} Φ X Y : - (∀ y, y ∈ Y → P y → y ∈ X) → + Lemma big_sepS_filter_acc' (φ : A → Prop) `{∀ y, Decision (φ y)} Φ X Y : + (∀ y, y ∈ Y → φ y → y ∈ X) → ([∗ set] y ∈ X, Φ y) -∗ - ([∗ set] y ∈ Y, if decide (P y) then Φ y else emp) ∗ - (([∗ set] y ∈ Y, if decide (P y) then Φ y else emp) -∗ [∗ set] y ∈ X, Φ y). + ([∗ set] y ∈ Y, if decide (φ y) then Φ y else emp) ∗ + (([∗ set] y ∈ Y, if decide (φ y) then Φ y else emp) -∗ [∗ set] y ∈ X, Φ y). Proof. - intros ?. destruct (proj1 (subseteq_disjoint_union_L (filter P Y) X)) + intros ?. destruct (proj1 (subseteq_disjoint_union_L (filter φ Y) X)) as (Z&->&?); first set_solver. rewrite big_sepS_union // big_sepS_filter'. by apply sep_mono_r, wand_intro_l. Qed. Lemma big_sepS_filter_acc `{BiAffine PROP} - (P : A → Prop) `{∀ y, Decision (P y)} Φ X Y : - (∀ y, y ∈ Y → P y → y ∈ X) → + (φ : A → Prop) `{∀ y, Decision (φ y)} Φ X Y : + (∀ y, y ∈ Y → φ y → y ∈ X) → ([∗ set] y ∈ X, Φ y) -∗ - ([∗ set] y ∈ Y, ⌜P y⌠→ Φ y) ∗ - (([∗ set] y ∈ Y, ⌜P y⌠→ Φ y) -∗ [∗ set] y ∈ X, Φ y). + ([∗ set] y ∈ Y, ⌜φ y⌠→ Φ y) ∗ + (([∗ set] y ∈ Y, ⌜φ y⌠→ Φ y) -∗ [∗ set] y ∈ X, Φ y). Proof. intros. setoid_rewrite <-decide_emp. by apply big_sepS_filter_acc'. Qed. Lemma big_sepS_list_to_set Φ (l : list A) :