Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Iris
Iris
Commits
46fafcf5
Commit
46fafcf5
authored
Feb 10, 2016
by
Robbert Krebbers
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Notation for literals.
parent
e475fff1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
12 deletions
+13
-12
heap_lang/sugar.v
heap_lang/sugar.v
+1
-0
heap_lang/tests.v
heap_lang/tests.v
+12
-12
No files found.
heap_lang/sugar.v
View file @
46fafcf5
...
@@ -24,6 +24,7 @@ Module notations.
...
@@ -24,6 +24,7 @@ Module notations.
(** Syntax inspired by Coq/Ocaml. Constructions with higher precedence come
(** Syntax inspired by Coq/Ocaml. Constructions with higher precedence come
first. *)
first. *)
(* What about Arguments for hoare triples?. *)
(* What about Arguments for hoare triples?. *)
Notation
"' l"
:
=
(
Lit
l
)
(
at
level
8
,
format
"' l"
)
:
lang_scope
.
Notation
"! e"
:
=
(
Load
e
%
L
)
(
at
level
10
,
format
"! e"
)
:
lang_scope
.
Notation
"! e"
:
=
(
Load
e
%
L
)
(
at
level
10
,
format
"! e"
)
:
lang_scope
.
Notation
"'ref' e"
:
=
(
Alloc
e
%
L
)
(
at
level
30
)
:
lang_scope
.
Notation
"'ref' e"
:
=
(
Alloc
e
%
L
)
(
at
level
30
)
:
lang_scope
.
Notation
"e1 + e2"
:
=
(
BinOp
PlusOp
e1
%
L
e2
%
L
)
Notation
"e1 + e2"
:
=
(
BinOp
PlusOp
e1
%
L
e2
%
L
)
...
...
heap_lang/tests.v
View file @
46fafcf5
...
@@ -4,20 +4,20 @@ Require Import heap_lang.lifting heap_lang.sugar.
...
@@ -4,20 +4,20 @@ Require Import heap_lang.lifting heap_lang.sugar.
Import
heap_lang
uPred
notations
.
Import
heap_lang
uPred
notations
.
Module
LangTests
.
Module
LangTests
.
Definition
add
:
=
(
Lit
21
+
Lit
21
)%
L
.
Definition
add
:
=
(
'
21
+
'
21
)%
L
.
Goal
∀
σ
,
prim_step
add
σ
(
Lit
42
)
σ
None
.
Goal
∀
σ
,
prim_step
add
σ
(
'
42
)
σ
None
.
Proof
.
intros
;
do_step
done
.
Qed
.
Proof
.
intros
;
do_step
done
.
Qed
.
Definition
rec_app
:
expr
:
=
(
rec
:
"f"
"x"
:
=
"f"
"x"
)
(
Lit
0
)
.
Definition
rec_app
:
expr
:
=
(
(
rec
:
"f"
"x"
:
=
"f"
"x"
)
'
0
)%
L
.
Goal
∀
σ
,
prim_step
rec_app
σ
rec_app
σ
None
.
Goal
∀
σ
,
prim_step
rec_app
σ
rec_app
σ
None
.
Proof
.
Proof
.
intros
.
rewrite
/
rec_app
.
(* FIXME: do_step does not work here *)
intros
.
rewrite
/
rec_app
.
(* FIXME: do_step does not work here *)
by
eapply
(
Ectx_step
_
_
_
_
_
[]),
(
BetaS
_
_
_
_
(
LitV
(
LitNat
0
))).
by
eapply
(
Ectx_step
_
_
_
_
_
[]),
(
BetaS
_
_
_
_
(
LitV
(
LitNat
0
))).
Qed
.
Qed
.
Definition
lam
:
expr
:
=
λ
:
"x"
,
"x"
+
Lit
21
.
Definition
lam
:
expr
:
=
λ
:
"x"
,
"x"
+
'
21
.
Goal
∀
σ
,
prim_step
(
lam
(
Lit
21
)
)
σ
add
σ
None
.
Goal
∀
σ
,
prim_step
(
lam
'
21
)
%
L
σ
add
σ
None
.
Proof
.
Proof
.
intros
.
rewrite
/
lam
.
(* FIXME: do_step does not work here *)
intros
.
rewrite
/
lam
.
(* FIXME: do_step does not work here *)
by
eapply
(
Ectx_step
_
_
_
_
_
[]),
(
BetaS
""
"x"
(
"x"
+
Lit
21
)
_
(
LitV
21
)).
by
eapply
(
Ectx_step
_
_
_
_
_
[]),
(
BetaS
""
"x"
(
"x"
+
'
21
)
_
(
LitV
21
)).
Qed
.
Qed
.
End
LangTests
.
End
LangTests
.
...
@@ -27,7 +27,7 @@ Module LiftingTests.
...
@@ -27,7 +27,7 @@ Module LiftingTests.
Implicit
Types
Q
:
val
→
iProp
heap_lang
Σ
.
Implicit
Types
Q
:
val
→
iProp
heap_lang
Σ
.
Definition
e
:
expr
:
=
Definition
e
:
expr
:
=
let
:
"x"
:
=
ref
(
Lit
1
)
in
"x"
<-
!
"x"
+
Lit
1
;
!
"x"
.
let
:
"x"
:
=
ref
'
1
in
"x"
<-
!
"x"
+
'
1
;
!
"x"
.
Goal
∀
σ
E
,
ownP
(
Σ
:
=
Σ
)
σ
⊑
wp
E
e
(
λ
v
,
v
=
LitV
2
).
Goal
∀
σ
E
,
ownP
(
Σ
:
=
Σ
)
σ
⊑
wp
E
e
(
λ
v
,
v
=
LitV
2
).
Proof
.
Proof
.
move
=>
σ
E
.
rewrite
/
e
.
move
=>
σ
E
.
rewrite
/
e
.
...
@@ -56,13 +56,13 @@ Module LiftingTests.
...
@@ -56,13 +56,13 @@ Module LiftingTests.
Definition
FindPred
(
n2
:
expr
)
:
expr
:
=
Definition
FindPred
(
n2
:
expr
)
:
expr
:
=
rec
:
"pred"
"y"
:
=
rec
:
"pred"
"y"
:
=
let
:
"yp"
:
=
"y"
+
Lit
1
in
let
:
"yp"
:
=
"y"
+
'
1
in
if
"yp"
<
n2
then
"pred"
"yp"
else
"y"
.
if
"yp"
<
n2
then
"pred"
"yp"
else
"y"
.
Definition
Pred
:
expr
:
=
Definition
Pred
:
expr
:
=
λ
:
"x"
,
if
"x"
≤
Lit
0
then
Lit
0
else
FindPred
"x"
(
Lit
0
)
.
λ
:
"x"
,
if
"x"
≤
'
0
then
'
0
else
FindPred
"x"
'
0
.
Lemma
FindPred_spec
n1
n2
E
Q
:
Lemma
FindPred_spec
n1
n2
E
Q
:
(
■
(
n1
<
n2
)
∧
Q
(
LitV
(
pred
n2
)))
⊑
wp
E
(
FindPred
(
Lit
n2
)
(
Lit
n1
)
)
Q
.
(
■
(
n1
<
n2
)
∧
Q
(
LitV
(
pred
n2
)))
⊑
wp
E
(
FindPred
'
n2
'
n1
)
%
L
Q
.
Proof
.
Proof
.
revert
n1
.
apply
l
ö
b_all_1
=>
n1
.
revert
n1
.
apply
l
ö
b_all_1
=>
n1
.
rewrite
(
commutative
uPred_and
(
■
_
)%
I
)
associative
;
apply
const_elim_r
=>?.
rewrite
(
commutative
uPred_and
(
■
_
)%
I
)
associative
;
apply
const_elim_r
=>?.
...
@@ -82,7 +82,7 @@ Module LiftingTests.
...
@@ -82,7 +82,7 @@ Module LiftingTests.
by
rewrite
-!
later_intro
-
wp_value'
//
and_elim_r
.
by
rewrite
-!
later_intro
-
wp_value'
//
and_elim_r
.
Qed
.
Qed
.
Lemma
Pred_spec
n
E
Q
:
▷
Q
(
LitV
(
pred
n
))
⊑
wp
E
(
Pred
(
Lit
n
))
Q
.
Lemma
Pred_spec
n
E
Q
:
▷
Q
(
LitV
(
pred
n
))
⊑
wp
E
(
Pred
'
n
)%
L
Q
.
Proof
.
Proof
.
rewrite
-
wp_lam
//=.
rewrite
-
wp_lam
//=.
rewrite
-(
wp_bindi
(
IfCtx
_
_
)).
rewrite
-(
wp_bindi
(
IfCtx
_
_
)).
...
@@ -96,7 +96,7 @@ Module LiftingTests.
...
@@ -96,7 +96,7 @@ Module LiftingTests.
Qed
.
Qed
.
Goal
∀
E
,
Goal
∀
E
,
True
⊑
wp
(
Σ
:
=
Σ
)
E
(
let
:
"x"
:
=
Pred
(
Lit
42
)
in
Pred
"x"
)
True
⊑
wp
(
Σ
:
=
Σ
)
E
(
let
:
"x"
:
=
Pred
'
42
in
Pred
"x"
)
(
λ
v
,
v
=
LitV
40
).
(
λ
v
,
v
=
LitV
40
).
Proof
.
Proof
.
intros
E
.
intros
E
.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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