Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Iris
Iris
Commits
62436505
Commit
62436505
authored
Jun 01, 2016
by
Jacques-Henri Jourdan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.mpi-sws.org:FP/iris-coq
parents
758d8d65
ea14f64d
Pipeline
#1255
passed with stage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
proofmode/tactics.v
proofmode/tactics.v
+2
-2
tests/joining_existentials.v
tests/joining_existentials.v
+1
-1
No files found.
proofmode/tactics.v
View file @
62436505
...
...
@@ -713,7 +713,7 @@ Tactic Notation "iLöb" "{" ident(x1) ident(x2) ident(x3) ident(x4)
ltac
:
(
iIntros
{
x1
x2
x3
x4
x5
x6
x7
x8
}).
(** * Assert *)
Tactic
Notation
"iAssert"
constr
(
Q
)
"with"
constr
(
Hs
)
"as"
constr
(
pat
)
:
=
Tactic
Notation
"iAssert"
open_
constr
(
Q
)
"with"
constr
(
Hs
)
"as"
constr
(
pat
)
:
=
let
H
:
=
iFresh
in
let
Hs
:
=
spec_pat
.
parse
Hs
in
lazymatch
Hs
with
...
...
@@ -735,7 +735,7 @@ Tactic Notation "iAssert" constr(Q) "with" constr(Hs) "as" constr(pat) :=
|
?pat
=>
fail
"iAssert: invalid pattern"
pat
end
.
Tactic
Notation
"iAssert"
constr
(
Q
)
"as"
constr
(
pat
)
:
=
Tactic
Notation
"iAssert"
open_
constr
(
Q
)
"as"
constr
(
pat
)
:
=
iAssert
Q
with
"[]"
as
pat
.
(** * Rewrite *)
...
...
tests/joining_existentials.v
View file @
62436505
...
...
@@ -53,7 +53,7 @@ Lemma Q_res_join γ : barrier_res γ Ψ1 ★ barrier_res γ Ψ2 ⊢ ▷ barrier_
Proof
.
iIntros
"[Hγ Hγ']"
;
iDestruct
"Hγ"
as
{
x
}
"[#Hγ Hx]"
;
iDestruct
"Hγ'"
as
{
x'
}
"[#Hγ' Hx']"
.
iAssert
(
▷
(
x
≡
x'
)
:
iProp
)%
I
as
"Hxx"
.
iAssert
(
▷
(
x
≡
x'
))%
I
as
"Hxx"
.
{
iCombine
"Hγ"
"Hγ'"
as
"Hγ2"
.
iClear
"Hγ Hγ'"
.
rewrite
own_valid
csum_validI
/=
agree_validI
agree_equivI
later_equivI
/=.
rewrite
-{
2
}[
x
]
cFunctor_id
-{
2
}[
x'
]
cFunctor_id
.
...
...
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