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
Diaframe
Commits
d30d4467
Commit
d30d4467
authored
Aug 24, 2022
by
Ike Mulder
Browse files
Ah, the recursive TryMerge ⊠ instance was missing.
parent
2ca612cf
Pipeline
#71394
passed with stages
in 46 minutes and 34 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
diaframe/steps/introduce_hyp.v
View file @
d30d4467
...
...
@@ -295,21 +295,6 @@ Section coq_tactics.
rewrite
H
Δ
//.
Qed
.
Global
Instance
mergable_persist_from_box
P
p
P2
P3
:
MergePersist
P
p
P2
P3
→
MergePersist
(
□
P
)%
I
p
P2
P3
|
5
.
Proof
.
rewrite
/
MergePersist
=>
<-.
iIntros
"[#$ $]"
.
Qed
.
Global
Instance
mergable_consume_from_box
P
p
P2
P3
:
MergeConsume
P
p
P2
P3
→
MergeConsume
(
□
P
)%
I
p
P2
P3
|
5
.
Proof
.
rewrite
/
MergeConsume
=>
<-.
iIntros
"[#$ $]"
.
Qed
.
Lemma
tac_introduce_hyp_not_mergable
j
Δ
P1
a
P1'
R
:
TCIf
(
TCAnd
(
IntoPersistent
false
P1
P1'
)
(
Affine
P1
))
(
TCEq
a
true
)
(
TCAnd
(
TCEq
a
false
)
(
TCEq
P1'
P1
))
→
...
...
diaframe/steps/solve_instances.v
View file @
d30d4467
...
...
@@ -213,17 +213,34 @@ End drop_modal_instances.
Section
misc
.
Context
{
PROP
:
bi
}.
Implicit
Types
P
Q
:
PROP
.
(* TODO: where to put this? *)
Global
Instance
exclusive_prop_try_merge
(
Q
:
PROP
)
:
Global
Instance
exclusive_prop_try_merge
Q
:
ExclusiveProp
Q
→
TryMerge
Q
.
Proof
.
exact
(
λ
_
,
I
).
Qed
.
Global
Instance
exclusive_prop_merge_false
(
Q
:
PROP
)
p
:
Global
Instance
exclusive_prop_merge_false
Q
p
:
ExclusiveProp
Q
→
MergeConsume
Q
p
Q
False
%
I
.
Proof
.
rewrite
/
ExclusiveProp
/
MergeConsume
bi
.
intuitionistically_if_elim
//.
Qed
.
Global
Instance
mergable_persist_from_box
P
p
P2
P3
:
MergePersist
P
p
P2
P3
→
MergePersist
(
□
P
)%
I
p
P2
P3
|
5
.
Proof
.
rewrite
/
MergePersist
=>
<-.
iIntros
"[#$ $]"
.
Qed
.
Global
Instance
mergable_consume_from_box
P
p
P2
P3
:
MergeConsume
P
p
P2
P3
→
MergeConsume
(
□
P
)%
I
p
P2
P3
|
5
.
Proof
.
rewrite
/
MergeConsume
=>
<-.
iIntros
"[#$ $]"
.
Qed
.
Global
Instance
try_merge_from_box
P
:
TryMerge
P
→
TryMerge
(
□
P
)%
I
:
=
id
.
End
misc
.
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