Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Iris
Fairis
Commits
1dfbaa66
Commit
1dfbaa66
authored
Aug 13, 2019
by
Robbert Krebbers
Browse files
Bump Iris.
parent
b040f68f
Pipeline
#19816
failed with stage
in 8 minutes and 49 seconds
Changes
2
Pipelines
40
Hide whitespace changes
Inline
Side-by-side
opam
View file @
1dfbaa66
...
...
@@ -6,5 +6,5 @@ install: [make "install"]
remove: ["rm" "-rf" "'%{lib}%/coq/user-contrib/fri"]
depends: [
"coq" { (>= "8.7.2") | (= "dev") }
"coq-iris" { (= "dev.2019-0
6-26.0.ad3e5066
") | (= "dev") }
"coq-iris" { (= "dev.2019-0
8-13.5.c1d6ef7f
") | (= "dev") }
]
theories/algebra/gmap.v
View file @
1dfbaa66
...
...
@@ -141,7 +141,7 @@ Proof.
set
(
f
i
:=
cmra_extend
n
(
m
!!
i
)
(
m1
!!
i
)
(
m2
!!
i
)
(
Hm
i
)
(
Hm12
'
i
)).
set
(
f_proj
i
:=
proj1_sig
(
f
i
)).
exists
(
map_imap
(
λ
i
_
,
(
f_proj
i
)
.1
)
m
,
map_imap
(
λ
i
_
,
(
f_proj
i
)
.2
)
m
);
repeat
split
;
intros
i
;
rewrite
/=
?
lookup_op
!
lookup_imap
.
repeat
split
;
intros
i
;
rewrite
/=
?
lookup_op
!
map_
lookup_imap
.
+
destruct
(
m
!!
i
)
as
[
x
|
]
eqn
:
Hx
;
rewrite
!
Hx
/=
;
[
|
constructor
].
rewrite
-
Hx
;
apply
(
proj2_sig
(
f
i
)).
+
destruct
(
m
!!
i
)
as
[
x
|
]
eqn
:
Hx
;
rewrite
/=
;
[
apply
(
proj2_sig
(
f
i
))
|
].
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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