Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Iris
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Roux
Iris
Commits
a9140f8e
Commit
a9140f8e
authored
3 years ago
by
Matthieu Sozeau
Committed by
Robbert Krebbers
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix bi_rewrite_relation hint priority
parent
5070f7f5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
coq-iris.opam
+1
-1
1 addition, 1 deletion
coq-iris.opam
iris/algebra/updates.v
+4
-1
4 additions, 1 deletion
iris/algebra/updates.v
iris/bi/interface.v
+5
-1
5 additions, 1 deletion
iris/bi/interface.v
with
10 additions
and
3 deletions
coq-iris.opam
+
1
−
1
View file @
a9140f8e
...
@@ -28,7 +28,7 @@ tags: [
...
@@ -28,7 +28,7 @@ tags: [
depends: [
depends: [
"coq" { (>= "8.13" & < "8.16~") | (= "dev") }
"coq" { (>= "8.13" & < "8.16~") | (= "dev") }
"coq-stdpp" { (= "dev.2022-01-1
3.0.607ee2b1
") | (= "dev") }
"coq-stdpp" { (= "dev.2022-01-1
4.1.ac02dbbd
") | (= "dev") }
]
]
build: ["./make-package" "iris" "-j%{jobs}%"]
build: ["./make-package" "iris" "-j%{jobs}%"]
...
...
This diff is collapsed.
Click to expand it.
iris/algebra/updates.v
+
4
−
1
View file @
a9140f8e
...
@@ -52,8 +52,11 @@ Lemma cmra_update_exclusive `{!Exclusive x} y:
...
@@ -52,8 +52,11 @@ Lemma cmra_update_exclusive `{!Exclusive x} y:
Proof
.
move
=>??[
z
|]=>[
/
exclusiveN_l
[]|_]
.
by
apply
cmra_valid_validN
.
Qed
.
Proof
.
move
=>??[
z
|]=>[
/
exclusiveN_l
[]|_]
.
by
apply
cmra_valid_validN
.
Qed
.
(** Updates form a preorder. *)
(** Updates form a preorder. *)
(** We set this rewrite relation's priority below the stdlib's
([impl], [iff], [eq], ...) and [≡] but above [⊑].
[eq] (at 100) < [≡] (at 150) < [cmra_update] (at 170) < [⊑] (at 200) *)
Global
Instance
cmra_update_rewrite_relation
:
Global
Instance
cmra_update_rewrite_relation
:
RewriteRelation
(
@
cmra_update
A
)
:=
{}
.
RewriteRelation
(
@
cmra_update
A
)
|
170
:=
{}
.
Global
Instance
cmra_update_preorder
:
PreOrder
(
@
cmra_update
A
)
.
Global
Instance
cmra_update_preorder
:
PreOrder
(
@
cmra_update
A
)
.
Proof
.
Proof
.
split
.
split
.
...
...
This diff is collapsed.
Click to expand it.
iris/bi/interface.v
+
5
−
1
View file @
a9140f8e
...
@@ -224,7 +224,11 @@ Global Arguments bi_persistently {PROP} _ : simpl never, rename.
...
@@ -224,7 +224,11 @@ Global Arguments bi_persistently {PROP} _ : simpl never, rename.
Global
Arguments
bi_later
{
PROP
}
_
:
simpl
never
,
rename
.
Global
Arguments
bi_later
{
PROP
}
_
:
simpl
never
,
rename
.
Global
Hint
Extern
0
(
bi_entails
_
_)
=>
reflexivity
:
core
.
Global
Hint
Extern
0
(
bi_entails
_
_)
=>
reflexivity
:
core
.
Global
Instance
bi_rewrite_relation
(
PROP
:
bi
)
:
RewriteRelation
(
@
bi_entails
PROP
)
:=
{}
.
(** We set this rewrite relation's priority below the stdlib's
([impl], [iff], [eq], ...) and [≡] but above [⊑].
[eq] (at 100) < [≡] (at 150) < [bi_entails _] (at 170) < [⊑] (at 200)
*)
Global
Instance
bi_rewrite_relation
(
PROP
:
bi
)
:
RewriteRelation
(
@
bi_entails
PROP
)
|
170
:=
{}
.
Global
Instance
bi_inhabited
{
PROP
:
bi
}
:
Inhabited
PROP
:=
populate
(
bi_pure
True
)
.
Global
Instance
bi_inhabited
{
PROP
:
bi
}
:
Inhabited
PROP
:=
populate
(
bi_pure
True
)
.
Notation
"P ⊢ Q"
:=
(
bi_entails
P
%
I
Q
%
I
)
:
stdpp_scope
.
Notation
"P ⊢ Q"
:=
(
bi_entails
P
%
I
Q
%
I
)
:
stdpp_scope
.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment