Skip to content
Snippets Groups Projects
Commit a7c4d317 authored by Ike Mulder's avatar Ike Mulder
Browse files

Bot -> Invalid rename, fixpoint move

parent 6aa8667f
Branches
No related tags found
1 merge request!58Update iris and supplements
Pipeline #117736 failed
From iris.bi Require Export bi telescopes lib.fixpoint. From iris.bi Require Export bi telescopes lib.fixpoint_mono.
From iris.proofmode Require Import proofmode environments classes_make. From iris.proofmode Require Import proofmode environments classes_make.
From diaframe Require Import proofmode_base. From diaframe Require Import proofmode_base.
......
...@@ -335,7 +335,7 @@ From stdpp Require Import telescopes. ...@@ -335,7 +335,7 @@ From stdpp Require Import telescopes.
Section other. Section other.
Global Instance excl_inhabited {A : ofe} : Inhabited (exclR A). Global Instance excl_inhabited {A : ofe} : Inhabited (exclR A).
Proof. split. by apply ExclBot. Qed. Proof. split. by apply ExclInvalid. Qed.
Global Arguments option_unit_instance /. Global Arguments option_unit_instance /.
...@@ -998,14 +998,14 @@ Section validity. ...@@ -998,14 +998,14 @@ Section validity.
by iRewrite "Ha". by iRewrite "Ha".
Qed. Qed.
Global Instance sum_inl_inr_invalid_op {A B : cmra} (a : A) (b : B) Σ : Global Instance sum_inl_inr_invalid_op {A B : cmra} (a : A) (b : B) Σ :
IsValidOp (CsumBot) (Cinl (B := B) a) (Cinr (A := A) b) Σ False. IsValidOp (CsumInvalid) (Cinl (B := B) a) (Cinr (A := A) b) Σ False.
Proof. Proof.
split; rewrite /op /= /cmra_op //=; eauto. split; rewrite /op /= /cmra_op //=; eauto.
rewrite uPred_cmra_valid_eq /= /uPred_cmra_valid_def /=. rewrite uPred_cmra_valid_eq /= /uPred_cmra_valid_def /=.
rewrite /validN /= /cmra_validN //=. rewrite /validN /= /cmra_validN //=.
Qed. Qed.
Global Instance sum_inr_inl_invalid_op {A B : cmra} (a : A) (b : B) Σ : Global Instance sum_inr_inl_invalid_op {A B : cmra} (a : A) (b : B) Σ :
IsValidOp (CsumBot) (Cinr (A := B) a) (Cinl (B := A) b) Σ False. IsValidOp (CsumInvalid) (Cinr (A := B) a) (Cinl (B := A) b) Σ False.
Proof. Proof.
split; rewrite /op /= /cmra_op //=; eauto. split; rewrite /op /= /cmra_op //=; eauto.
rewrite uPred_cmra_valid_eq /= /uPred_cmra_valid_def /=. rewrite uPred_cmra_valid_eq /= /uPred_cmra_valid_def /=.
...@@ -1482,7 +1482,7 @@ Section validity. ...@@ -1482,7 +1482,7 @@ Section validity.
Qed. Qed.
Global Instance excl_valid_op {O : ofe} (a1 a2 : excl O) Σ: Global Instance excl_valid_op {O : ofe} (a1 a2 : excl O) Σ:
IsValidOp ExclBot a1 a2 Σ False%I. IsValidOp ExclInvalid a1 a2 Σ False%I.
Proof. split; rewrite excl_validI /=; eauto. Qed. *) Proof. split; rewrite excl_validI /=; eauto. Qed. *)
Lemma excl_subtract {O : ofe} (o1 o2 : O) : (* this one is bad for recursive instances *) Lemma excl_subtract {O : ofe} (o1 o2 : O) : (* this one is bad for recursive instances *)
TCIf (SolveSepSideCondition (¬ (o1 o2))) False TCTrue TCIf (SolveSepSideCondition (¬ (o1 o2))) False TCTrue
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment