Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
Iris
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Rodolphe Lepigre
Iris
Commits
f50cfd4e
Commit
f50cfd4e
authored
Feb 25, 2016
by
Ralf Jung
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.mpi-sws.org:FP/iris-coq
parents
6beb51d3
714cc8ca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
heap_lang/heap.v
heap_lang/heap.v
+2
-2
prelude/tactics.v
prelude/tactics.v
+2
-1
No files found.
heap_lang/heap.v
View file @
f50cfd4e
...
...
@@ -47,7 +47,7 @@ Section heap.
(** Conversion to heaps and back *)
Global
Instance
of_heap_proper
:
Proper
((
≡
)
==>
(=))
of_heap
.
Proof
.
by
intros
??
;
fold_leibniz
=>->
.
Qed
.
Proof
.
solve_proper
.
Qed
.
Lemma
from_to_heap
σ
:
of_heap
(
to_heap
σ
)
=
σ
.
Proof
.
apply
map_eq
=>
l
.
rewrite
lookup_omap
lookup_fmap
.
by
case
(
σ
!!
l
).
...
...
@@ -96,7 +96,7 @@ Section heap.
(** Propers *)
Global
Instance
heap_inv_proper
:
Proper
((
≡
)
==>
(
≡
))
heap_inv
.
Proof
.
intros
h1
h2
.
by
fold_leibniz
=>
->
.
Qed
.
Proof
.
solve_proper
.
Qed
.
(** General properties of mapsto *)
Lemma
heap_mapsto_disjoint
l
v1
v2
:
(
l
↦
v1
★
l
↦
v2
)%
I
⊑
False
.
...
...
prelude/tactics.v
View file @
f50cfd4e
...
...
@@ -188,6 +188,7 @@ Tactic Notation "simplify_eq" := repeat
|
H
:
?x
=
_
|-
_
=>
subst
x
|
H
:
_
=
?x
|-
_
=>
subst
x
|
H
:
_
=
_
|-
_
=>
discriminate
H
|
H
:
_
≡
_
|-
_
=>
apply
leibniz_equiv
in
H
|
H
:
?f
_
=
?f
_
|-
_
=>
apply
(
inj
f
)
in
H
|
H
:
?f
_
_
=
?f
_
_
|-
_
=>
apply
(
inj2
f
)
in
H
;
destruct
H
(* before [injection] to circumvent bug #2939 in some situations *)
...
...
@@ -237,7 +238,7 @@ Ltac f_equiv :=
|
|-
pointwise_relation
_
_
_
_
=>
intros
?
end
;
(* Normalize away equalities. *)
s
ubst
;
s
implify_eq
;
(* repeatedly apply congruence lemmas and use the equalities in the hypotheses. *)
try
match
goal
with
|
_
=>
first
[
reflexivity
|
assumption
|
symmetry
;
assumption
]
...
...
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