Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
iris-time-proofs
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
MEVEL Glen
iris-time-proofs
Commits
614533e1
Commit
614533e1
authored
Nov 07, 2019
by
Jacques-Henri Jourdan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bump Iris, fix compatibility with Iris/Coq.
parent
ac32c3e2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
4 deletions
+2
-4
opam
opam
+1
-1
theories/Reduction.v
theories/Reduction.v
+1
-1
theories/heap_lang/lang.v
theories/heap_lang/lang.v
+0
-2
No files found.
opam
View file @
614533e1
...
...
@@ -10,6 +10,6 @@ build: [make "-j%{jobs}%"]
install: [make "install"]
remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/iris_time" ]
depends: [
"coq-iris" { (= "dev.2019-
09-20.0.b958d569
") | (= "dev") }
"coq-iris" { (= "dev.2019-
11-07.0.c3e6385b
") | (= "dev") }
"coq-tlc" { (= "20181116") | (= "dev") }
]
theories/Reduction.v
View file @
614533e1
...
...
@@ -677,7 +677,7 @@ Section Safety.
specialize
(
Hsafe
_
_
_
eq_refl
Hsteps
(
elem_of_list_here
_
_
)).
clear
Hsteps
.
destruct
Hsafe
as
[
Hval
|
Hred
].
+
left
.
by
eapply
fill_val
.
+
destruct
(
to_val
e'
)
eqn
:
Hnotval
;
first
by
eauto
.
right
.
+
destruct
(
to_val
e'
)
eqn
:
Hnotval
;
[
by
left
;
eauto
|]
.
right
.
destruct
Hred
as
(
κ
&
_
&
σ
''
&
efs
&
[
K2
e'2
e''2
Efill
_
Hstep
])
;
simpl
in
*.
eapply
step_by_val
in
Efill
as
Efill'
;
try
eassumption
;
destruct
Efill'
as
[
K'
->].
rewrite
fill_app
in
Efill
;
apply
fill_inj
in
Efill
as
->.
...
...
theories/heap_lang/lang.v
View file @
614533e1
...
...
@@ -186,8 +186,6 @@ Proof. destruct e=>//=. by intros [= <-]. Qed.
Global
Instance
of_val_inj
:
Inj
(=)
(=)
of_val
.
Proof
.
intros
??.
congruence
.
Qed
.
Global
Instance
mach_int_eq_dec
:
EqDecision
base_lit
.
Global
Instance
base_lit_eq_dec
:
EqDecision
base_lit
.
Proof
.
solve_decision
.
Defined
.
Global
Instance
un_op_eq_dec
:
EqDecision
un_op
.
...
...
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