Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Marianna Rapoport
iriscoq
Commits
96184edb
Commit
96184edb
authored
Jun 17, 2016
by
Robbert Krebbers
Browse files
Better statement of posivitity of option.
parent
46ca1ffc
Changes
2
Hide whitespace changes
Inline
Sidebyside
algebra/cmra.v
View file @
96184edb
...
...
@@ 1033,14 +1033,11 @@ Section option.
(** Misc *)
Global
Instance
Some_cmra_monotone
:
CMRAMonotone
Some
.
Proof
.
split
;
[
apply
_

done

intros
x
y
[
z
>]
;
by
exists
(
Some
z
)].
Qed
.
Lemma
op_None
mx
my
:
mx
⋅
my
=
None
↔
mx
=
None
∧
my
=
None
.
Proof
.
destruct
mx
,
my
;
naive_solver
.
Qed
.
Lemma
op_is_Some
mx
my
:
is_Some
(
mx
⋅
my
)
↔
is_Some
mx
∨
is_Some
my
.
Proof
.
destruct
mx
,
my
;
rewrite
/
op
/
option_op
/=
!
not_eq_None_Some
;
naive_solver
.
Qed
.
Lemma
option_op_positive_dist_l
n
mx
my
:
mx
⋅
my
≡
{
n
}
≡
None
→
mx
≡
{
n
}
≡
None
.
Proof
.
by
destruct
mx
,
my
;
inversion_clear
1
.
Qed
.
Lemma
option_op_positive_dist_r
n
mx
my
:
mx
⋅
my
≡
{
n
}
≡
None
→
my
≡
{
n
}
≡
None
.
Proof
.
by
destruct
mx
,
my
;
inversion_clear
1
.
Qed
.
Proof
.
rewrite
!
not_eq_None_Some
op_None
.
destruct
mx
,
my
;
naive_solver
.
Qed
.
Global
Instance
Some_persistent
(
x
:
A
)
:
Persistent
x
→
Persistent
(
Some
x
).
Proof
.
by
constructor
.
Qed
.
...
...
algebra/gmap.v
View file @
96184edb
...
...
@@ 147,11 +147,11 @@ Proof.
+
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
))].
pose
proof
(
Hm12'
i
)
as
Hm12''
;
rewrite
Hx
in
Hm12''
.
by
symmetry
;
apply
option_op_positive_dist_l
with
(
m2
!!
i
)
.
move
:
(
Hm12'
i
).
rewrite
Hx
!
timeless_iff
.
rewrite
!(
symmetry_iff
_
None
)
!
equiv_None
op_None
;
tauto
.
+
destruct
(
m
!!
i
)
as
[
x
]
eqn
:
Hx
;
simpl
;
[
apply
(
proj2_sig
(
f
i
))].
pose
proof
(
Hm12'
i
)
as
Hm12''
;
rewrite
Hx
in
Hm12''
.
by
symmetry
;
apply
option_op_positive_dist_r
with
(
m1
!!
i
)
.
move
:
(
Hm12'
i
).
rewrite
Hx
!
timeless_iff
.
rewrite
!(
symmetry_iff
_
None
)
!
equiv_None
op_None
;
tauto
.
Qed
.
Canonical
Structure
gmapR
:
=
CMRAT
(
gmap
K
A
)
gmap_cofe_mixin
gmap_cmra_mixin
.
...
...
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