Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Tej Chajed
iris
Commits
709da735
Commit
709da735
authored
Feb 20, 2016
by
Ralf Jung
Browse files
tweak wp_tactics behavior for the case of ending up with a value
parent
fcfd43d1
Changes
3
Hide whitespace changes
Inline
Sidebyside
barrier/barrier.v
View file @
709da735
...
...
@@ 298,7 +298,7 @@ Section proof.
{
(* Is this really the best way to strip the later? *)
erewrite
later_sep
.
apply
sep_mono
;
last
apply
later_intro
.
rewrite
>
later_sep
.
apply
sep_mono_l
.
rewrite
>
later_sep
.
done
.
}
wp_if
.
wp_value
.
wp_if
.
eapply
wand_apply_r
;
[
done
..].
eapply
wand_apply_r
;
[
done
..].
apply
:
(
eq_rewrite
Q'
Q
(
λ
x
,
x
)%
I
)
;
last
by
eauto
with
I
.
rewrite
eq_sym
.
eauto
with
I
.
...
...
heap_lang/tests.v
View file @
709da735
...
...
@@ 54,13 +54,13 @@ Section LiftingTests.
revert
n1
;
apply
l
ö
b_all_1
=>
n1
.
rewrite
(
comm
uPred_and
(
■
_
)%
I
)
assoc
;
apply
const_elim_r
=>?.
(* first need to do the rec to get a later *)
wp_rec
>.
wp_rec
>.
(* FIXME: ssr rewrite fails with "Error: _pattern_value_ is used in conclusion." *)
rewrite
>(
later_intro
(
Φ
_
))
;
rewrite
!
later_and
;
apply
later_mono
.
wp_let
.
wp_op
.
wp_let
.
wp_op
=>
?
;
wp_if
.

rewrite
(
forall_elim
(
n1
+
1
))
const_equiv
;
last
omega
.
by
rewrite
left_id
impl_elim_l
.

wp_value
.
assert
(
n1
=
n2

1
)
as
>
by
omega
;
auto
with
I
.

assert
(
n1
=
n2

1
)
as
>
by
omega
;
auto
with
I
.
Qed
.
Lemma
Pred_spec
n
E
Φ
:
▷
Φ
(
LitV
(
n

1
))
⊑

Pred
'
n
@
E
{{
Φ
}}.
...
...
heap_lang/wp_tactics.v
View file @
709da735
...
...
@@ 25,18 +25,14 @@ Ltac wp_finish :=
match
goal
with


_
⊑
▷
_
=>
etransitivity
;
[
apply
later_mono
;
go
;
reflexivity
]


_
⊑
wp
_
_
_
=>
etransitivity
;
[
eapply
wp_value
;
reflexivity
]
;
etransitivity
;
[
eapply
wp_value
_pvs
;
reflexivity
]
;
(* sometimes, we will have to do a final view shift, so only apply
wp_value if we obtain a consecutive wp *)
match
goal
with

_
⊑
wp
_
_
_
=>
simpl

_
=>
fail
end
try
(
eapply
pvs_intro
;
match
goal
with

_
⊑
wp
_
_
_
=>
simpl

_
=>
fail
end
)

_
=>
idtac
end
in
simpl
;
revert_intros
go
.
Tactic
Notation
"wp_value"
:
=
match
goal
with


_
⊑
wp
?E
?e
?Q
=>
etransitivity
;
[
eapply
wp_value
;
reflexivity
]
;
simpl
end
.
Tactic
Notation
"wp_rec"
">"
:
=
match
goal
with


_
⊑
wp
?E
?e
?Q
=>
reshape_expr
e
ltac
:
(
fun
K
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