Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Iris
Iris
Commits
e2c493dd
Commit
e2c493dd
authored
Nov 09, 2016
by
Ralf Jung
Browse files
avoid clash of notations between disjunction and parallel composition
parent
e7ecf91e
Pipeline
#2980
passed with stage
in 9 minutes and 49 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
heap_lang/lib/par.v
View file @
e2c493dd
...
...
@@ -10,7 +10,7 @@ Definition par : val :=
let
:
"v2"
:
=
Snd
"fs"
#()
in
let
:
"v1"
:
=
join
"handle"
in
(
"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
.
Section
proof
.
...
...
@@ -39,7 +39,7 @@ Lemma wp_par (Ψ1 Ψ2 : val → iProp Σ)
(
e1
e2
:
expr
)
`
{!
Closed
[]
e1
,
Closed
[]
e2
}
(
Φ
:
val
→
iProp
Σ
)
:
(
heap_ctx
∗
WP
e1
{{
Ψ
1
}}
∗
WP
e2
{{
Ψ
2
}}
∗
∀
v1
v2
,
Ψ
1
v1
∗
Ψ
2
v2
-
∗
▷
Φ
(
v1
,
v2
)%
V
)
⊢
WP
e1
||
e2
{{
Φ
}}.
⊢
WP
e1
||
|
e2
{{
Φ
}}.
Proof
.
iIntros
"(#Hh&H1&H2&H)"
.
iApply
(
par_spec
Ψ
1
Ψ
2
with
"[- $Hh $H]"
)
;
try
wp_done
.
iSplitL
"H1"
;
by
wp_let
.
...
...
tests/barrier_client.v
View file @
e2c493dd
...
...
@@ -9,8 +9,8 @@ Definition worker (n : Z) : val :=
Definition
client
:
expr
:
=
let
:
"y"
:
=
ref
#
0
in
let
:
"b"
:
=
newbarrier
#()
in
(
"y"
<-
(
λ
:
"z"
,
"z"
+
#
42
)
;;
signal
"b"
)
||
(
worker
12
"b"
"y"
||
worker
17
"b"
"y"
).
(
"y"
<-
(
λ
:
"z"
,
"z"
+
#
42
)
;;
signal
"b"
)
||
|
(
worker
12
"b"
"y"
||
|
worker
17
"b"
"y"
).
Global
Opaque
worker
client
.
Section
client
.
...
...
tests/joining_existentials.v
View file @
e2c493dd
...
...
@@ -20,7 +20,7 @@ Proof. apply subG_inG. Qed.
Definition
client
eM
eW1
eW2
:
expr
:
=
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
.
Section
proof
.
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment