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
b052b2a2
Commit
b052b2a2
authored
Mar 05, 2016
by
Ralf Jung
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use the new tactics to simplify ress_split
parent
961b94c1
Pipeline
#259
passed with stage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
15 deletions
+15
-15
algebra/upred_tactics.v
algebra/upred_tactics.v
+7
-5
barrier/proof.v
barrier/proof.v
+8
-10
No files found.
algebra/upred_tactics.v
View file @
b052b2a2
...
...
@@ -155,7 +155,7 @@ Tactic Notation "to_front" open_constr(Ps) :=
|
?P
::
?Ps
=>
rewrite
?(
assoc
(
★
)%
I
)
;
match
goal
with
|
|-
(
?Q
★
_
)%
I
⊑
_
=>
(*
test
if it is already at front. *)
|
|-
(
?Q
★
_
)%
I
⊑
_
=>
(*
check
if it is already at front. *)
unify
P
Q
with
typeclass_instances
|
|-
_
=>
find_pat
P
ltac
:
(
fun
P
=>
rewrite
{
1
}[(
_
★
P
)%
I
]
comm
)
end
;
...
...
@@ -183,11 +183,12 @@ Tactic Notation "sep_split" "right:" open_constr(Ps) :=
|
[]
=>
apply
sep_intro_True_r
|
?P
::
?Ps
=>
to_front
(
P
::
Ps
)
;
(* Run assoc length (ps) times *)
(* Run assoc length (Ps) times -- that is 1 - length(original Ps),
and it will turn the goal in just the right shape for sep_mono. *)
let
rec
nassoc
Ps
:
=
lazymatch
eval
hnf
in
Ps
with
|
[]
=>
idtac
|
_
::
?Ps
=>
rewrite
assoc
;
nassoc
Ps
|
_
::
?Ps
=>
rewrite
(
assoc
(
★
)%
I
)
;
nassoc
Ps
end
in
rewrite
[
X
in
_
⊑
X
]
lock
-?(
assoc
(
★
)%
I
)
;
nassoc
Ps
;
rewrite
[
X
in
X
⊑
_
]
comm
-[
X
in
_
⊑
X
]
lock
;
...
...
@@ -202,11 +203,12 @@ Tactic Notation "sep_split" "left:" open_constr(Ps) :=
|
[]
=>
apply
sep_intro_True_l
|
?P
::
?Ps
=>
to_front
(
P
::
Ps
)
;
(* Run assoc length (ps) times *)
(* Run assoc length (Ps) times -- that is 1 - length(original Ps),
and it will turn the goal in just the right shape for sep_mono. *)
let
rec
nassoc
Ps
:
=
lazymatch
eval
hnf
in
Ps
with
|
[]
=>
idtac
|
_
::
?Ps
=>
rewrite
assoc
;
nassoc
Ps
|
_
::
?Ps
=>
rewrite
(
assoc
(
★
)%
I
)
;
nassoc
Ps
end
in
rewrite
[
X
in
_
⊑
X
]
lock
-?(
assoc
(
★
)%
I
)
;
nassoc
Ps
;
rewrite
-[
X
in
_
⊑
X
]
lock
;
...
...
barrier/proof.v
View file @
b052b2a2
...
...
@@ -79,23 +79,21 @@ Proof.
intros
.
rewrite
/
ress
!
sep_exist_l
.
apply
exist_elim
=>
Ψ
.
rewrite
-(
exist_intro
(<[
i1
:
=
R1
]>
(<[
i2
:
=
R2
]>
Ψ
))).
rewrite
[(
Π★
{
set
_
}
(
λ
_
,
saved_prop_own
_
_
))%
I
](
big_sepS_delete
_
I
i
)
//.
rewrite
!
assoc
[(
_
★
(
_
-
★
_
))%
I
]
comm
!
assoc
[(
_
★
▷
_
)%
I
]
comm
.
rewrite
!
assoc
[(
_
★
_
i
_
)%
I
]
comm
!
assoc
[(
_
★
_
i
_
)%
I
]
comm
-!
assoc
.
do
4
(
rewrite
big_sepS_insert
;
last
set_solver
).
rewrite
!
fn_lookup_insert
fn_lookup_insert_ne
//
!
fn_lookup_insert
.
rewrite
3
!
assoc
.
apply
sep_mono
.
-
rewrite
saved_prop_agree
later_equivI
/=.
strip_later
.
apply
wand_intro_l
.
rewrite
[(
_
★
(
_
-
★
Π★
{
set
_
}
_
))%
I
]
comm
!
assoc
wand_elim_r
.
set
savedQ
:
=
_
i
_
.
set
saved
Ψ
:
=
_
i
_
.
sep_split
left
:
[
savedQ
;
saved
Ψ
;
Q
-
★
_;
▷
(
_
-
★
Π★
{
set
I
}
_
)]%
I
.
-
rewrite
!
assoc
saved_prop_agree
later_equivI
/=.
strip_later
.
apply
wand_intro_l
.
to_front
[
P
;
P
-
★
_
]%
I
.
rewrite
wand_elim_r
.
rewrite
(
big_sepS_delete
_
I
i
)
//.
rewrite
[(
_
★
Π★
{
set
_
}
_
)%
I
]
comm
[(
_
★
Π★
{
set
_
}
_
)%
I
]
comm
-!
assoc
.
apply
sep_mono
.
+
apply
big_sepS_mono
;
[
done
|]
=>
j
.
rewrite
elem_of_difference
not_elem_of_singleton
=>
-[??].
by
do
2
(
rewrite
fn_lookup_insert_ne
;
last
naive_solver
).
sep_split
right
:
[
Π★
{
set
_
}
_
]%
I
.
+
rewrite
!
assoc
.
eapply
wand_apply_r'
;
first
done
.
apply
:
(
eq_rewrite
(
Ψ
i
)
Q
(
λ
x
,
x
)%
I
)
;
last
by
eauto
with
I
.
rewrite
eq_sym
.
eauto
with
I
.
+
apply
big_sepS_mono
;
[
done
|]
=>
j
.
rewrite
elem_of_difference
not_elem_of_singleton
=>
-[??].
by
do
2
(
rewrite
fn_lookup_insert_ne
;
last
naive_solver
).
-
rewrite
!
assoc
[(
saved_prop_own
i2
_
★
_
)%
I
]
comm
;
apply
sep_mono_r
.
apply
big_sepS_mono
;
[
done
|]=>
j
.
rewrite
elem_of_difference
not_elem_of_singleton
=>
-[??].
...
...
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