Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Iris
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gaëtan Gilbert
Iris
Commits
ce9313df
Commit
ce9313df
authored
6 years ago
by
Ralf Jung
Browse files
Options
Downloads
Patches
Plain Diff
make updates and magic wand linebreaks consistent with coq built-in notation
parent
3660c994
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
tests/proofmode.ref
+47
-4
47 additions, 4 deletions
tests/proofmode.ref
tests/proofmode.v
+23
-2
23 additions, 2 deletions
tests/proofmode.v
theories/bi/notation.v
+8
-6
8 additions, 6 deletions
theories/bi/notation.v
with
78 additions
and
12 deletions
tests/proofmode.ref
+
47
−
4
View file @
ce9313df
...
...
@@ -75,6 +75,48 @@
--------------------------------------∗
True
1 subgoal
PROP : sbi
BiFUpd0 : BiFUpd PROP
PPPPPPPPPPPPPPPPP, QQQQQQQQQQQQQQQQQQ : PROP
============================
--------------------------------------∗
PPPPPPPPPPPPPPPPP
→ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ
1 subgoal
PROP : sbi
BiFUpd0 : BiFUpd PROP
PPPPPPPPPPPPPPPPP, QQQQQQQQQQQQQQQQQQ : PROP
============================
--------------------------------------∗
PPPPPPPPPPPPPPPPP
→ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ
→ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ
1 subgoal
PROP : sbi
BiFUpd0 : BiFUpd PROP
PPPPPPPPPPPPPPPPP, QQQQQQQQQQQQQQQQQQ : PROP
============================
--------------------------------------∗
PPPPPPPPPPPPPPPPP
-∗ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ
1 subgoal
PROP : sbi
BiFUpd0 : BiFUpd PROP
PPPPPPPPPPPPPPPPP, QQQQQQQQQQQQQQQQQQ : PROP
============================
--------------------------------------∗
PPPPPPPPPPPPPPPPP
-∗ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ
-∗ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ
1 subgoal
PROP : sbi
...
...
@@ -83,8 +125,8 @@
PPPPPPPPPPPPPPPPP, QQQQQQQQQQQQQQQQQQ : PROP
============================
--------------------------------------∗
PPPPPPPPPPPPPPPPP
={E}=∗
QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ
PPPPPPPPPPPPPPPPP
={E}=∗
QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ
1 subgoal
...
...
@@ -94,6 +136,7 @@
PPPPPPPPPPPPPPPPP, QQQQQQQQQQQQQQQQQQ : PROP
============================
--------------------------------------∗
PPPPPPPPPPPPPPPPP ={E1,E2}=∗
QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ
PPPPPPPPPPPPPPPPP
={E1,E2}=∗ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ
={E1,E2}=∗ QQQQQQQQQQQQQQQQQQ ∗ QQQQQQQQQQQQQQQQQQ
This diff is collapsed.
Click to expand it.
tests/proofmode.v
+
23
−
2
View file @
ce9313df
...
...
@@ -518,13 +518,34 @@ Proof.
iIntros
"?"
.
Show
.
Abort
.
Lemma
long_impl
(
PPPPPPPPPPPPPPPPP
QQQQQQQQQQQQQQQQQQ
:
PROP
)
:
(
PPPPPPPPPPPPPPPPP
→
(
QQQQQQQQQQQQQQQQQQ
∗
QQQQQQQQQQQQQQQQQQ
∗
QQQQQQQQQQQQQQQQQQ
))
%
I
.
Proof
.
iStartProof
.
Show
.
Abort
.
Lemma
long_impl_nested
(
PPPPPPPPPPPPPPPPP
QQQQQQQQQQQQQQQQQQ
:
PROP
)
:
(
PPPPPPPPPPPPPPPPP
→
(
QQQQQQQQQQQQQQQQQQ
∗
QQQQQQQQQQQQQQQQQQ
∗
QQQQQQQQQQQQQQQQQQ
)
→
(
QQQQQQQQQQQQQQQQQQ
∗
QQQQQQQQQQQQQQQQQQ
∗
QQQQQQQQQQQQQQQQQQ
))
%
I
.
Proof
.
iStartProof
.
Show
.
Abort
.
Lemma
long_wand
(
PPPPPPPPPPPPPPPPP
QQQQQQQQQQQQQQQQQQ
:
PROP
)
:
(
PPPPPPPPPPPPPPPPP
-∗
(
QQQQQQQQQQQQQQQQQQ
∗
QQQQQQQQQQQQQQQQQQ
∗
QQQQQQQQQQQQQQQQQQ
))
%
I
.
Proof
.
iStartProof
.
Show
.
Abort
.
Lemma
long_wand_nested
(
PPPPPPPPPPPPPPPPP
QQQQQQQQQQQQQQQQQQ
:
PROP
)
:
(
PPPPPPPPPPPPPPPPP
-∗
(
QQQQQQQQQQQQQQQQQQ
∗
QQQQQQQQQQQQQQQQQQ
∗
QQQQQQQQQQQQQQQQQQ
)
-∗
(
QQQQQQQQQQQQQQQQQQ
∗
QQQQQQQQQQQQQQQQQQ
∗
QQQQQQQQQQQQQQQQQQ
))
%
I
.
Proof
.
iStartProof
.
Show
.
Abort
.
Lemma
long_fupd
E
(
PPPPPPPPPPPPPPPPP
QQQQQQQQQQQQQQQQQQ
:
PROP
)
:
PPPPPPPPPPPPPPPPP
=
{
E
}
=∗
QQQQQQQQQQQQQQQQQQ
∗
QQQQQQQQQQQQQQQQQQ
∗
QQQQQQQQQQQQQQQQQQ
.
Proof
.
iStartProof
.
Show
.
Abort
.
Lemma
long_fupd_maskchanging
E1
E2
(
PPPPPPPPPPPPPPPPP
QQQQQQQQQQQQQQQQQQ
:
PROP
)
:
PPPPPPPPPPPPPPPPP
=
{
E1
,
E2
}
=∗
QQQQQQQQQQQQQQQQQQ
∗
QQQQQQQQQQQQQQQQQQ
∗
QQQQQQQQQQQQQQQQQQ
.
Lemma
long_fupd_nested
E1
E2
(
PPPPPPPPPPPPPPPPP
QQQQQQQQQQQQQQQQQQ
:
PROP
)
:
PPPPPPPPPPPPPPPPP
=
{
E1
,
E2
}
=∗
QQQQQQQQQQQQQQQQQQ
∗
QQQQQQQQQQQQQQQQQQ
∗
QQQQQQQQQQQQQQQQQQ
=
{
E1
,
E2
}
=∗
QQQQQQQQQQQQQQQQQQ
∗
QQQQQQQQQQQQQQQQQQ
.
Proof
.
iStartProof
.
Show
.
Abort
.
...
...
This diff is collapsed.
Click to expand it.
theories/bi/notation.v
+
8
−
6
View file @
ce9313df
...
...
@@ -12,7 +12,9 @@ Reserved Notation "('⊣⊢@{' PROP } )" (at level 95).
Reserved
Notation
"'emp'"
.
Reserved
Notation
"'⌜' φ '⌝'"
(
at
level
1
,
φ
at
level
200
,
format
"⌜ φ ⌝"
)
.
Reserved
Notation
"P ∗ Q"
(
at
level
80
,
right
associativity
)
.
Reserved
Notation
"P -∗ Q"
(
at
level
99
,
Q
at
level
200
,
right
associativity
)
.
Reserved
Notation
"P -∗ Q"
(
at
level
99
,
Q
at
level
200
,
right
associativity
,
format
"'[' P '/' -∗ Q ']'"
)
.
Reserved
Notation
"⎡ P ⎤"
.
...
...
@@ -51,34 +53,34 @@ Reserved Notation "'<subj>' P" (at level 20, right associativity).
(** Update modalities *)
Reserved
Notation
"|==> Q"
(
at
level
99
,
Q
at
level
200
,
format
"|==> Q"
)
.
Reserved
Notation
"P ==∗ Q"
(
at
level
99
,
Q
at
level
200
,
format
"'[
' P ==∗
'/'
Q ']'"
)
.
(
at
level
99
,
Q
at
level
200
,
format
"'[' P
'/'
==∗ Q ']'"
)
.
Reserved
Notation
"|={ E1 , E2 }=> Q"
(
at
level
99
,
E1
,
E2
at
level
50
,
Q
at
level
200
,
format
"|={ E1 , E2 }=> Q"
)
.
Reserved
Notation
"P ={ E1 , E2 }=∗ Q"
(
at
level
99
,
E1
,
E2
at
level
50
,
Q
at
level
200
,
format
"'[
' P ={ E1 , E2 }=∗
'/'
Q ']'"
)
.
format
"'[' P
'/'
={ E1 , E2 }=∗ Q ']'"
)
.
Reserved
Notation
"|={ E }=> Q"
(
at
level
99
,
E
at
level
50
,
Q
at
level
200
,
format
"|={ E }=> Q"
)
.
Reserved
Notation
"P ={ E }=∗ Q"
(
at
level
99
,
E
at
level
50
,
Q
at
level
200
,
format
"'[
' P ={ E }=∗
'/'
Q ']'"
)
.
format
"'[' P
'/'
={ E }=∗ Q ']'"
)
.
Reserved
Notation
"|={ E1 , E2 }▷=> Q"
(
at
level
99
,
E1
,
E2
at
level
50
,
Q
at
level
200
,
format
"|={ E1 , E2 }▷=> Q"
)
.
Reserved
Notation
"P ={ E1 , E2 }▷=∗ Q"
(
at
level
99
,
E1
,
E2
at
level
50
,
Q
at
level
200
,
format
"'[
' P ={ E1 , E2 }▷=∗
'/'
Q ']'"
)
.
format
"'[' P
'/'
={ E1 , E2 }▷=∗ Q ']'"
)
.
Reserved
Notation
"|={ E }▷=> Q"
(
at
level
99
,
E
at
level
50
,
Q
at
level
200
,
format
"|={ E }▷=> Q"
)
.
Reserved
Notation
"P ={ E }▷=∗ Q"
(
at
level
99
,
E
at
level
50
,
Q
at
level
200
,
format
"'[
' P ={ E }▷=∗
'/'
Q ']'"
)
.
format
"'[' P
'/'
={ E }▷=∗ Q ']'"
)
.
(** Big Ops *)
Reserved
Notation
"'[∗' 'list]' k ↦ x ∈ l , P"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment