Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
Iris
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
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
Rice Wine
Iris
Commits
e2c493dd
Commit
e2c493dd
authored
8 years ago
by
Ralf Jung
Browse files
Options
Downloads
Patches
Plain Diff
avoid clash of notations between disjunction and parallel composition
parent
e7ecf91e
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
heap_lang/lib/par.v
+2
-2
2 additions, 2 deletions
heap_lang/lib/par.v
tests/barrier_client.v
+2
-2
2 additions, 2 deletions
tests/barrier_client.v
tests/joining_existentials.v
+1
-1
1 addition, 1 deletion
tests/joining_existentials.v
with
5 additions
and
5 deletions
heap_lang/lib/par.v
+
2
−
2
View file @
e2c493dd
...
@@ -10,7 +10,7 @@ Definition par : val :=
...
@@ -10,7 +10,7 @@ Definition par : val :=
let
:
"v2"
:=
Snd
"fs"
#
()
in
let
:
"v2"
:=
Snd
"fs"
#
()
in
let
:
"v1"
:=
join
"handle"
in
let
:
"v1"
:=
join
"handle"
in
(
"v1"
,
"v2"
)
.
(
"v1"
,
"v2"
)
.
Notation
"e1 || e2"
:=
(
par
(
Pair
(
λ
:
<>
,
e1
)
(
λ
:
<>
,
e2
)))
%
E
:
expr_scope
.
Notation
"e1 ||
|
e2"
:=
(
par
(
Pair
(
λ
:
<>
,
e1
)
(
λ
:
<>
,
e2
)))
%
E
:
expr_scope
.
Global
Opaque
par
.
Global
Opaque
par
.
Section
proof
.
Section
proof
.
...
@@ -39,7 +39,7 @@ Lemma wp_par (Ψ1 Ψ2 : val → iProp Σ)
...
@@ -39,7 +39,7 @@ Lemma wp_par (Ψ1 Ψ2 : val → iProp Σ)
(
e1
e2
:
expr
)
`{
!
Closed
[]
e1
,
Closed
[]
e2
}
(
Φ
:
val
→
iProp
Σ
)
:
(
e1
e2
:
expr
)
`{
!
Closed
[]
e1
,
Closed
[]
e2
}
(
Φ
:
val
→
iProp
Σ
)
:
(
heap_ctx
∗
WP
e1
{{
Ψ1
}}
∗
WP
e2
{{
Ψ2
}}
∗
(
heap_ctx
∗
WP
e1
{{
Ψ1
}}
∗
WP
e2
{{
Ψ2
}}
∗
∀
v1
v2
,
Ψ1
v1
∗
Ψ2
v2
-∗
▷
Φ
(
v1
,
v2
)
%
V
)
∀
v1
v2
,
Ψ1
v1
∗
Ψ2
v2
-∗
▷
Φ
(
v1
,
v2
)
%
V
)
⊢
WP
e1
||
e2
{{
Φ
}}
.
⊢
WP
e1
||
|
e2
{{
Φ
}}
.
Proof
.
Proof
.
iIntros
"(#Hh&H1&H2&H)"
.
iApply
(
par_spec
Ψ1
Ψ2
with
"[- $Hh $H]"
);
try
wp_done
.
iIntros
"(#Hh&H1&H2&H)"
.
iApply
(
par_spec
Ψ1
Ψ2
with
"[- $Hh $H]"
);
try
wp_done
.
iSplitL
"H1"
;
by
wp_let
.
iSplitL
"H1"
;
by
wp_let
.
...
...
This diff is collapsed.
Click to expand it.
tests/barrier_client.v
+
2
−
2
View file @
e2c493dd
...
@@ -9,8 +9,8 @@ Definition worker (n : Z) : val :=
...
@@ -9,8 +9,8 @@ Definition worker (n : Z) : val :=
Definition
client
:
expr
:=
Definition
client
:
expr
:=
let
:
"y"
:=
ref
#
0
in
let
:
"y"
:=
ref
#
0
in
let
:
"b"
:=
newbarrier
#
()
in
let
:
"b"
:=
newbarrier
#
()
in
(
"y"
<-
(
λ
:
"z"
,
"z"
+
#
42
)
;;
signal
"b"
)
||
(
"y"
<-
(
λ
:
"z"
,
"z"
+
#
42
)
;;
signal
"b"
)
||
|
(
worker
12
"b"
"y"
||
worker
17
"b"
"y"
)
.
(
worker
12
"b"
"y"
||
|
worker
17
"b"
"y"
)
.
Global
Opaque
worker
client
.
Global
Opaque
worker
client
.
Section
client
.
Section
client
.
...
...
This diff is collapsed.
Click to expand it.
tests/joining_existentials.v
+
1
−
1
View file @
e2c493dd
...
@@ -20,7 +20,7 @@ Proof. apply subG_inG. Qed.
...
@@ -20,7 +20,7 @@ Proof. apply subG_inG. Qed.
Definition
client
eM
eW1
eW2
:
expr
:=
Definition
client
eM
eW1
eW2
:
expr
:=
let
:
"b"
:=
newbarrier
#
()
in
let
:
"b"
:=
newbarrier
#
()
in
(
eM
;;
signal
"b"
)
||
((
wait
"b"
;;
eW1
)
||
(
wait
"b"
;;
eW2
))
.
(
eM
;;
signal
"b"
)
||
|
((
wait
"b"
;;
eW1
)
||
|
(
wait
"b"
;;
eW2
))
.
Global
Opaque
client
.
Global
Opaque
client
.
Section
proof
.
Section
proof
.
...
...
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