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
William Mansky
Iris
Commits
13063825
Commit
13063825
authored
3 years ago
by
Ralf Jung
Browse files
Options
Downloads
Patches
Plain Diff
fix atomic update trailing spaces
parent
42d90c3d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
iris/bi/lib/atomic.v
+8
-8
8 additions, 8 deletions
iris/bi/lib/atomic.v
tests/atomic.ref
+19
-19
19 additions, 19 deletions
tests/atomic.ref
with
27 additions
and
27 deletions
iris/bi/lib/atomic.v
+
8
−
8
View file @
13063825
...
...
@@ -113,7 +113,7 @@ Notation "'AU' '<<' ∀ x1 .. xn , α '>>' @ Eo , Ei '<<' ∃ y1 .. yn , β , 'C
)
..
)
)
(
at
level
20
,
Eo
,
Ei
,
α
,
β
,
Φ
at
level
200
,
x1
binder
,
xn
binder
,
y1
binder
,
yn
binder
,
format
"'[hv ' 'AU' '<<' '[' ∀ x1 .. xn , '/' α ']' '>>' '/' @ '[' Eo , '/' Ei
']' '/' '<<' '[' ∃ y1 .. yn , '/' β , '/' COMM Φ ']' '>>' ']'"
)
:
bi_scope
.
format
"'[hv ' 'AU' '<<' '[' ∀ x1 .. xn , '/' α ']' '>>' '/' @ '[' Eo , '/' Ei ']'
'/' '<<' '[' ∃ y1 .. yn , '/' β , '/' COMM Φ ']' '>>' ']'"
)
:
bi_scope
.
Notation
"'AU' '<<' ∀ x1 .. xn , α '>>' @ Eo , Ei '<<' β , 'COMM' Φ '>>'"
:=
(
atomic_update
(
TA
:=
TeleS
(
λ
x1
,
.
.
(
TeleS
(
λ
xn
,
TeleO
))
.
.
))
...
...
@@ -127,7 +127,7 @@ Notation "'AU' '<<' ∀ x1 .. xn , α '>>' @ Eo , Ei '<<' β , 'COMM' Φ '>>'" :
λ
x1
,
.
.
(
λ
xn
,
tele_app
(
TT
:=
TeleO
)
Φ
%
I
)
.
.
)
)
(
at
level
20
,
Eo
,
Ei
,
α
,
β
,
Φ
at
level
200
,
x1
binder
,
xn
binder
,
format
"'[hv ' 'AU' '<<' '[' ∀ x1 .. xn , '/' α ']' '>>' '/' @ '[' Eo , '/' Ei
']' '/' '<<' '[' β , '/' COMM Φ ']' '>>' ']'"
)
:
bi_scope
.
format
"'[hv ' 'AU' '<<' '[' ∀ x1 .. xn , '/' α ']' '>>' '/' @ '[' Eo , '/' Ei ']'
'/' '<<' '[' β , '/' COMM Φ ']' '>>' ']'"
)
:
bi_scope
.
Notation
"'AU' '<<' α '>>' @ Eo , Ei '<<' ∃ y1 .. yn , β , 'COMM' Φ '>>'"
:=
(
atomic_update
(
TA
:=
TeleO
)
...
...
@@ -142,7 +142,7 @@ Notation "'AU' '<<' α '>>' @ Eo , Ei '<<' ∃ y1 .. yn , β , 'COMM' Φ '>>'" :
(
λ
y1
,
.
.
(
λ
yn
,
Φ
%
I
)
..))
)
(
at
level
20
,
Eo
,
Ei
,
α
,
β
,
Φ
at
level
200
,
y1
binder
,
yn
binder
,
format
"'[hv ' 'AU' '<<' '[' α ']' '>>' '/' @ '[' Eo , '/' Ei
']' '/' '<<' '[' ∃ y1 .. yn , '/' β , '/' COMM Φ ']' '>>' ']'"
)
:
bi_scope
.
format
"'[hv ' 'AU' '<<' '[' α ']' '>>' '/' @ '[' Eo , '/' Ei ']'
'/' '<<' '[' ∃ y1 .. yn , '/' β , '/' COMM Φ ']' '>>' ']'"
)
:
bi_scope
.
Notation
"'AU' '<<' α '>>' @ Eo , Ei '<<' β , 'COMM' Φ '>>'"
:=
(
atomic_update
(
TA
:=
TeleO
)
(
TB
:=
TeleO
)
Eo
Ei
...
...
@@ -151,7 +151,7 @@ Notation "'AU' '<<' α '>>' @ Eo , Ei '<<' β , 'COMM' Φ '>>'" :=
(
tele_app
(
TT
:=
TeleO
)
$
tele_app
(
TT
:=
TeleO
)
Φ
%
I
)
)
(
at
level
20
,
Eo
,
Ei
,
α
,
β
,
Φ
at
level
200
,
format
"'[hv ' 'AU' '<<' '[' α ']' '>>' '/' @ '[' Eo , '/' Ei
']' '/' '<<' '[' β , '/' COMM Φ ']' '>>' ']'"
)
:
bi_scope
.
format
"'[hv ' 'AU' '<<' '[' α ']' '>>' '/' @ '[' Eo , '/' Ei ']'
'/' '<<' '[' β , '/' COMM Φ ']' '>>' ']'"
)
:
bi_scope
.
(** Notation: Atomic accessors *)
Notation
"'AACC' '<<' ∀ x1 .. xn , α , 'ABORT' P '>>' @ Eo , Ei '<<' ∃ y1 .. yn , β , 'COMM' Φ '>>'"
:=
...
...
@@ -173,7 +173,7 @@ Notation "'AACC' '<<' ∀ x1 .. xn , α , 'ABORT' P '>>' @ Eo , Ei '<<' ∃ y1 .
)
..
)
)
(
at
level
20
,
Eo
,
Ei
,
α
,
P
,
β
,
Φ
at
level
200
,
x1
binder
,
xn
binder
,
y1
binder
,
yn
binder
,
format
"'[hv ' 'AACC' '<<' '[' ∀ x1 .. xn , '/' α , '/' ABORT P ']' '>>' '/' @ '[' Eo , '/' Ei
']' '/' '<<' '[' ∃ y1 .. yn , '/' β , '/' COMM Φ ']' '>>' ']'"
)
:
bi_scope
.
format
"'[hv ' 'AACC' '<<' '[' ∀ x1 .. xn , '/' α , '/' ABORT P ']' '>>' '/' @ '[' Eo , '/' Ei ']'
'/' '<<' '[' ∃ y1 .. yn , '/' β , '/' COMM Φ ']' '>>' ']'"
)
:
bi_scope
.
Notation
"'AACC' '<<' ∀ x1 .. xn , α , 'ABORT' P '>>' @ Eo , Ei '<<' β , 'COMM' Φ '>>'"
:=
(
atomic_acc
(
TA
:=
TeleS
(
λ
x1
,
.
.
(
TeleS
(
λ
xn
,
TeleO
))
.
.
))
...
...
@@ -188,7 +188,7 @@ Notation "'AACC' '<<' ∀ x1 .. xn , α , 'ABORT' P '>>' @ Eo , Ei '<<' β , 'CO
λ
x1
,
.
.
(
λ
xn
,
tele_app
(
TT
:=
TeleO
)
Φ
%
I
)
.
.
)
)
(
at
level
20
,
Eo
,
Ei
,
α
,
P
,
β
,
Φ
at
level
200
,
x1
binder
,
xn
binder
,
format
"'[hv ' 'AACC' '<<' '[' ∀ x1 .. xn , '/' α , '/' ABORT P ']' '>>' '/' @ '[' Eo , '/' Ei
']' '/' '<<' '[' β , '/' COMM Φ ']' '>>' ']'"
)
:
bi_scope
.
format
"'[hv ' 'AACC' '<<' '[' ∀ x1 .. xn , '/' α , '/' ABORT P ']' '>>' '/' @ '[' Eo , '/' Ei ']'
'/' '<<' '[' β , '/' COMM Φ ']' '>>' ']'"
)
:
bi_scope
.
Notation
"'AACC' '<<' α , 'ABORT' P '>>' @ Eo , Ei '<<' ∃ y1 .. yn , β , 'COMM' Φ '>>'"
:=
(
atomic_acc
(
TA
:=
TeleO
)
...
...
@@ -204,7 +204,7 @@ Notation "'AACC' '<<' α , 'ABORT' P '>>' @ Eo , Ei '<<' ∃ y1 .. yn , β , 'CO
(
λ
y1
,
.
.
(
λ
yn
,
Φ
%
I
)
..))
)
(
at
level
20
,
Eo
,
Ei
,
α
,
P
,
β
,
Φ
at
level
200
,
y1
binder
,
yn
binder
,
format
"'[hv ' 'AACC' '<<' '[' α , '/' ABORT P ']' '>>' '/' @ '[' Eo , '/' Ei
']' '/' '<<' '[' ∃ y1 .. yn , '/' β , '/' COMM Φ ']' '>>' ']'"
)
:
bi_scope
.
format
"'[hv ' 'AACC' '<<' '[' α , '/' ABORT P ']' '>>' '/' @ '[' Eo , '/' Ei ']'
'/' '<<' '[' ∃ y1 .. yn , '/' β , '/' COMM Φ ']' '>>' ']'"
)
:
bi_scope
.
Notation
"'AACC' '<<' α , 'ABORT' P '>>' @ Eo , Ei '<<' β , 'COMM' Φ '>>'"
:=
(
atomic_acc
(
TA
:=
TeleO
)
...
...
@@ -216,7 +216,7 @@ Notation "'AACC' '<<' α , 'ABORT' P '>>' @ Eo , Ei '<<' β , 'COMM' Φ '>>'" :=
(
tele_app
(
TT
:=
TeleO
)
$
tele_app
(
TT
:=
TeleO
)
Φ
%
I
)
)
(
at
level
20
,
Eo
,
Ei
,
α
,
P
,
β
,
Φ
at
level
200
,
format
"'[hv ' 'AACC' '<<' '[' α , '/' ABORT P ']' '>>' '/' @ '[' Eo , '/' Ei
']' '/' '<<' '[' β , '/' COMM Φ ']' '>>' ']'"
)
:
bi_scope
.
format
"'[hv ' 'AACC' '<<' '[' α , '/' ABORT P ']' '>>' '/' @ '[' Eo , '/' Ei ']'
'/' '<<' '[' β , '/' COMM Φ ']' '>>' ']'"
)
:
bi_scope
.
(** Lemmas about AU *)
Section
lemmas
.
...
...
This diff is collapsed.
Click to expand it.
tests/atomic.ref
+
19
−
19
View file @
13063825
...
...
@@ -10,7 +10,7 @@
"Hl" : l ↦ v
--------------------------------------∗
AACC << ∀ (v0 : val) (q : dfrac), l ↦{q} v0, ABORT l ↦ v >>
@ ⊤ ∖ ∅, ∅
@ ⊤ ∖ ∅, ∅
<< l ↦{q} v0, COMM Q -∗ Q >>
"non_laterable"
: string
...
...
@@ -25,7 +25,7 @@
"HP" : ▷ P
--------------------------------------∗
AACC << ∀ (v : val) (q : dfrac), l ↦{q} v, ABORT ▷ P >>
@ ⊤ ∖ ∅, ∅
@ ⊤ ∖ ∅, ∅
<< l ↦{q} v, COMM True >>
1 goal
...
...
@@ -38,7 +38,7 @@
"HP" : ▷ P
--------------------------------------∗
AACC << ∀ (v : val) (q : dfrac), l ↦{q} v, ABORT ▷ P >>
@ ⊤ ∖ ∅, ∅
@ ⊤ ∖ ∅, ∅
<< l ↦{q} v, COMM True >>
"printing"
: string
...
...
@@ -68,9 +68,9 @@
============================
_ : AACC << ∀ x : val, P x,
ABORT AU << ∀ x : val, P x >>
@ ⊤ ∖ ∅, ∅
@ ⊤ ∖ ∅, ∅
<< ∃ y : val, P y, COMM Φ #() >> >>
@ ⊤ ∖ ∅, ∅
@ ⊤ ∖ ∅, ∅
<< ∃ y : val, P y, COMM Φ #() >>
--------------------------------------∗
WP code {{ v, Φ v }}
...
...
@@ -100,9 +100,9 @@
============================
_ : AACC << ∀ x : val, l ↦ x,
ABORT AU << ∀ x : val, l ↦ x >>
@ ⊤ ∖ ∅, ∅
@ ⊤ ∖ ∅, ∅
<< l ↦ x, COMM Φ #() >> >>
@ ⊤ ∖ ∅, ∅
@ ⊤ ∖ ∅, ∅
<< l ↦ x, COMM Φ #() >>
--------------------------------------∗
WP code {{ v, Φ v }}
...
...
@@ -132,9 +132,9 @@
============================
_ : AACC << l ↦ #(),
ABORT AU << l ↦ #() >>
@ ⊤ ∖ ∅, ∅
@ ⊤ ∖ ∅, ∅
<< ∃ y : val, l ↦ y, COMM Φ #() >> >>
@ ⊤ ∖ ∅, ∅
@ ⊤ ∖ ∅, ∅
<< ∃ y : val, l ↦ y, COMM Φ #() >>
--------------------------------------∗
WP code {{ v, Φ v }}
...
...
@@ -164,7 +164,7 @@
============================
_ : AACC << l ↦ #(),
ABORT AU << l ↦ #() >> @ ⊤ ∖ ∅, ∅ << l ↦ #(), COMM Φ #() >> >>
@ ⊤ ∖ ∅, ∅
@ ⊤ ∖ ∅, ∅
<< l ↦ #(), COMM Φ #() >>
--------------------------------------∗
WP code {{ v, Φ v }}
...
...
@@ -187,7 +187,7 @@
Φ : language.val heap_lang → iProp Σ
============================
"AU" : AU << ∀ x : val, l ↦ x ∗ l ↦ x >>
@ ⊤ ∖ ∅, ∅
@ ⊤ ∖ ∅, ∅
<< ∃ y : val, l ↦ y, COMM Φ #() >>
--------------------------------------∗
WP code {{ v, Φ v }}
...
...
@@ -208,7 +208,7 @@
Φ : language.val heap_lang → iProp Σ
============================
"AU" : AU << ∀ x : val, l ↦ x ∗ l ↦ x ∗ l ↦ x ∗ l ↦ x ∗ l ↦ x ∗ l ↦ x >>
@ ⊤ ∖ ∅, ∅
@ ⊤ ∖ ∅, ∅
<< ∃ y : val, l ↦ y, COMM Φ #() >>
--------------------------------------∗
WP code {{ v, Φ v }}
...
...
@@ -230,7 +230,7 @@
Φ : language.val heap_lang → iProp Σ
============================
_ : AU << ∀ xx : val, l ↦ xx ∗ l ↦ xx ∗ l ↦ xx >>
@ ⊤ ∖ ∅, ∅
@ ⊤ ∖ ∅, ∅
<< ∃ yyyy : val, l ↦ yyyy ∗ l ↦ xx ∗ l ↦ xx ∗ l ↦ xx ∗ l ↦ xx ∗
l ↦ xx, COMM Φ #() >>
--------------------------------------∗
...
...
@@ -252,7 +252,7 @@
Φ : language.val heap_lang → iProp Σ
============================
"AU" : AU << ∀ x : val, l ↦ x ∗ l ↦ x ∗ l ↦ x ∗ l ↦ x >>
@ ⊤ ∖ ∅, ∅
@ ⊤ ∖ ∅, ∅
<< l ↦ x, COMM Φ #() >>
--------------------------------------∗
WP code {{ v, Φ v }}
...
...
@@ -275,7 +275,7 @@
Φ : language.val heap_lang → iProp Σ
============================
"AU" : AU << l ↦ x ∗ l ↦ x ∗ l ↦ x ∗ l ↦ x ∗ l ↦ x ∗ l ↦ x >>
@ ⊤ ∖ ∅, ∅
@ ⊤ ∖ ∅, ∅
<< ∃ y : val, l ↦ y, COMM Φ #() >>
--------------------------------------∗
WP code {{ v, Φ v }}
...
...
@@ -298,7 +298,7 @@
Φ : language.val heap_lang → iProp Σ
============================
"AU" : AU << l ↦ x ∗ l ↦ x ∗ l ↦ x ∗ l ↦ x ∗ l ↦ x ∗ l ↦ x >>
@ ⊤ ∖ ∅, ∅
@ ⊤ ∖ ∅, ∅
<< l ↦ #(), COMM Φ #() >>
--------------------------------------∗
WP code {{ v, Φ v }}
...
...
@@ -321,7 +321,7 @@
Φ : language.val heap_lang → iProp Σ
============================
"AU" : AU << l ↦ xx ∗ l ↦ xx ∗ l ↦ xx ∗ l ↦ xx ∗ l ↦ xx ∗ l ↦ xx ∗ l ↦ xx >>
@ ⊤ ∖ ∅, ∅
@ ⊤ ∖ ∅, ∅
<< l ↦ yyyy, COMM Φ #() >>
--------------------------------------∗
WP code {{ v, Φ v }}
...
...
@@ -345,7 +345,7 @@
Φ : language.val heap_lang → iProp Σ
============================
"AU" : AU << l ↦ xx ∗ l ↦ xx ∗ l ↦ xx >>
@ ⊤ ∖ ∅, ∅
@ ⊤ ∖ ∅, ∅
<< l ↦ yyyy ∗ l ↦ xx ∗ l ↦ xx ∗ l ↦ xx ∗ l ↦ xx ∗ l ↦ xx ∗
l ↦ xx, COMM Φ #() >>
--------------------------------------∗
...
...
@@ -362,7 +362,7 @@
"AU" : ∃ x : val, P x ∗
(P x ={∅,⊤}=∗
AU << ∀ x0 : val, P x0 >>
@ ⊤ ∖ ∅, ∅
@ ⊤ ∖ ∅, ∅
<< ∃ y : val, P y, COMM Φ #() >>)
∧ (∀ x0 : val, P x0 ={∅,⊤}=∗ Φ #())
--------------------------------------∗
...
...
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