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
Rice Wine
Iris
Commits
327ba441
Commit
327ba441
authored
Jan 21, 2018
by
Robbert Krebbers
Browse files
Fix priorities of IntoLaterN instances.
This should fix iris-examples.
parent
688de435
Changes
1
Hide whitespace changes
Inline
Side-by-side
theories/proofmode/class_instances.v
View file @
327ba441
...
@@ -168,19 +168,19 @@ Proof. by rewrite /FromAlways. Qed.
...
@@ -168,19 +168,19 @@ Proof. by rewrite /FromAlways. Qed.
(* IntoLater *)
(* IntoLater *)
Global
Instance
into_laterN_later
n
P
Q
:
Global
Instance
into_laterN_later
n
P
Q
:
IntoLaterN
n
P
Q
→
IntoLaterN'
(
S
n
)
(
▷
P
)
Q
.
IntoLaterN
n
P
Q
→
IntoLaterN'
(
S
n
)
(
▷
P
)
Q
|
0
.
Proof
.
by
rewrite
/
IntoLaterN'
/
IntoLaterN
=>->.
Qed
.
Proof
.
by
rewrite
/
IntoLaterN'
/
IntoLaterN
=>->.
Qed
.
Global
Instance
into_laterN_later_further
n
P
Q
:
Global
Instance
into_laterN_later_further
n
P
Q
:
IntoLaterN'
n
P
Q
→
IntoLaterN'
n
(
▷
P
)
(
▷
Q
).
IntoLaterN'
n
P
Q
→
IntoLaterN'
n
(
▷
P
)
(
▷
Q
)
|
1000
.
Proof
.
rewrite
/
IntoLaterN'
/
IntoLaterN
=>->.
by
rewrite
-
laterN_later
.
Qed
.
Proof
.
rewrite
/
IntoLaterN'
/
IntoLaterN
=>->.
by
rewrite
-
laterN_later
.
Qed
.
Global
Instance
into_laterN_laterN
n
P
:
IntoLaterN'
n
(
▷
^
n
P
)
P
.
Global
Instance
into_laterN_laterN
n
P
:
IntoLaterN'
n
(
▷
^
n
P
)
P
|
0
.
Proof
.
done
.
Qed
.
Proof
.
done
.
Qed
.
Global
Instance
into_laterN_laterN_plus
n
m
P
Q
:
Global
Instance
into_laterN_laterN_plus
n
m
P
Q
:
IntoLaterN
m
P
Q
→
IntoLaterN'
(
n
+
m
)
(
▷
^
n
P
)
Q
.
IntoLaterN
m
P
Q
→
IntoLaterN'
(
n
+
m
)
(
▷
^
n
P
)
Q
|
1
.
Proof
.
rewrite
/
IntoLaterN'
/
IntoLaterN
=>->.
by
rewrite
laterN_plus
.
Qed
.
Proof
.
rewrite
/
IntoLaterN'
/
IntoLaterN
=>->.
by
rewrite
laterN_plus
.
Qed
.
Global
Instance
into_laterN_laterN_further
n
m
P
Q
:
Global
Instance
into_laterN_laterN_further
n
m
P
Q
:
IntoLaterN'
m
P
Q
→
IntoLaterN'
m
(
▷
^
n
P
)
(
▷
^
n
Q
).
IntoLaterN'
m
P
Q
→
IntoLaterN'
m
(
▷
^
n
P
)
(
▷
^
n
Q
)
|
1000
.
Proof
.
Proof
.
rewrite
/
IntoLaterN'
/
IntoLaterN
=>->.
by
rewrite
-!
laterN_plus
Nat
.
add_comm
.
rewrite
/
IntoLaterN'
/
IntoLaterN
=>->.
by
rewrite
-!
laterN_plus
Nat
.
add_comm
.
Qed
.
Qed
.
...
...
Write
Preview
Supports
Markdown
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