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
Pierre Roux
Iris
Commits
a113503b
Commit
a113503b
authored
4 years ago
by
Robbert Krebbers
Browse files
Options
Downloads
Patches
Plain Diff
Revert "Merge branch 'fix-idestruct-specialize' into 'master'"
This reverts merge request !591
parent
550fea78
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
iris/base_logic/lib/boxes.v
+1
-1
1 addition, 1 deletion
iris/base_logic/lib/boxes.v
iris/proofmode/ltac_tactics.v
+2
-8
2 additions, 8 deletions
iris/proofmode/ltac_tactics.v
tests/proofmode.v
+0
-26
0 additions, 26 deletions
tests/proofmode.v
with
3 additions
and
35 deletions
iris/base_logic/lib/boxes.v
+
1
−
1
View file @
a113503b
...
@@ -247,7 +247,7 @@ Lemma slice_iff E q f P Q Q' γ b :
...
@@ -247,7 +247,7 @@ Lemma slice_iff E q f P Q Q' γ b :
Proof
.
Proof
.
iIntros
(??)
"#HQQ' #Hs Hb"
.
destruct
b
.
iIntros
(??)
"#HQQ' #Hs Hb"
.
destruct
b
.
-
iMod
(
slice_delete_full
with
"Hs Hb"
)
as
(
P'
)
"(HQ & Heq & Hb)"
;
try
done
.
-
iMod
(
slice_delete_full
with
"Hs Hb"
)
as
(
P'
)
"(HQ & Heq & Hb)"
;
try
done
.
i
PoseProof
(
"HQQ'"
with
"HQ"
)
as
"HQ'"
.
i
Destruct
(
"HQQ'"
with
"HQ"
)
as
"HQ'"
.
iMod
(
slice_insert_full
with
"HQ' Hb"
)
as
(
γ'
?)
"[#Hs' Hb]"
;
try
done
.
iMod
(
slice_insert_full
with
"HQ' Hb"
)
as
(
γ'
?)
"[#Hs' Hb]"
;
try
done
.
iExists
γ'
,
_
.
iIntros
"{$∗ $# $%} !>"
.
do
2
iNext
.
iRewrite
"Heq"
.
iExists
γ'
,
_
.
iIntros
"{$∗ $# $%} !>"
.
do
2
iNext
.
iRewrite
"Heq"
.
iIntros
"!>"
.
by
iSplit
;
iIntros
"[? $]"
;
iApply
"HQQ'"
.
iIntros
"!>"
.
by
iSplit
;
iIntros
"[? $]"
;
iApply
"HQQ'"
.
...
...
This diff is collapsed.
Click to expand it.
iris/proofmode/ltac_tactics.v
+
2
−
8
View file @
a113503b
...
@@ -1992,12 +1992,6 @@ Tactic Notation "iRevertIntros" "(" ident(x1) ident(x2) ident(x3) ident(x4)
...
@@ -1992,12 +1992,6 @@ Tactic Notation "iRevertIntros" "(" ident(x1) ident(x2) ident(x3) ident(x4)
iRevertIntros
(
x1
x2
x3
x4
x5
x6
x7
x8
x9
x10
x11
x12
x13
x14
x15
)
""
with
tac
.
iRevertIntros
(
x1
x2
x3
x4
x5
x6
x7
x8
x9
x10
x11
x12
x13
x14
x15
)
""
with
tac
.
(** * Destruct tactic *)
(** * Destruct tactic *)
(** [CopyDestruct] is an internal class used by the [iDestruct] tactic to
identify universally quantified hypotheses that should be copied and not be
consumed when they are specialized in proofmode terms.
Not intended for user extensibility. *)
Class
CopyDestruct
{
PROP
:
bi
}
(
P
:
PROP
)
.
Class
CopyDestruct
{
PROP
:
bi
}
(
P
:
PROP
)
.
Arguments
CopyDestruct
{_}
_
%
I
.
Arguments
CopyDestruct
{_}
_
%
I
.
Hint
Mode
CopyDestruct
+
!
:
typeclass_instances
.
Hint
Mode
CopyDestruct
+
!
:
typeclass_instances
.
...
@@ -2019,8 +2013,8 @@ Tactic Notation "iDestructCore" open_constr(lem) "as" constr(p) tactic3(tac) :=
...
@@ -2019,8 +2013,8 @@ Tactic Notation "iDestructCore" open_constr(lem) "as" constr(p) tactic3(tac) :=
|
string
=>
constr
:(
Some
(
INamed
lem
))
|
string
=>
constr
:(
Some
(
INamed
lem
))
|
iTrm
=>
|
iTrm
=>
lazymatch
lem
with
lazymatch
lem
with
|
@
I
Trm
ident
_
_
?H
_
_
=>
constr
:(
Some
H
)
|
@
i
Trm
ident
?H
_
_
=>
constr
:(
Some
H
)
|
@
I
Trm
string
_
_
?H
_
_
=>
constr
:(
Some
(
INamed
H
))
|
@
i
Trm
string
?H
_
_
=>
constr
:(
Some
(
INamed
H
))
|
_
=>
constr
:(
@
None
ident
)
|
_
=>
constr
:(
@
None
ident
)
end
end
|
_
=>
constr
:(
@
None
ident
)
|
_
=>
constr
:(
@
None
ident
)
...
...
This diff is collapsed.
Click to expand it.
tests/proofmode.v
+
0
−
26
View file @
a113503b
...
@@ -93,32 +93,6 @@ Lemma test_iDestruct_intuitionistic_2 P Q `{!Persistent P, !Affine P}:
...
@@ -93,32 +93,6 @@ Lemma test_iDestruct_intuitionistic_2 P Q `{!Persistent P, !Affine P}:
Q
∗
(
Q
-∗
P
)
-∗
P
.
Q
∗
(
Q
-∗
P
)
-∗
P
.
Proof
.
iIntros
"[HQ HQP]"
.
iDestruct
(
"HQP"
with
"HQ"
)
as
"#HP"
.
done
.
Qed
.
Proof
.
iIntros
"[HQ HQP]"
.
iDestruct
(
"HQP"
with
"HQ"
)
as
"#HP"
.
done
.
Qed
.
Lemma
test_iDestruct_specialize_wand
P
Q
:
Q
∗
□
(
Q
-∗
P
)
-∗
P
.
Proof
.
iIntros
"[HQ #HQP]"
.
(* iDestruct specializes, consuming the hypothesis *)
iDestruct
(
"HQP"
with
"HQ"
)
as
"HQP"
.
done
.
Qed
.
Lemma
test_iPoseProof_copy_wand
P
Q
:
Q
∗
□
(
Q
-∗
P
)
-∗
P
∗
(
Q
-∗
P
)
.
Proof
.
iIntros
"[HQ #HQP]"
.
(* in contrast with [iDestruct], [iPoseProof] leaves "HQP" alone *)
iPoseProof
(
"HQP"
with
"HQ"
)
as
"HP"
.
iFrame
"HP HQP"
.
Qed
.
Lemma
test_iDestruct_pose_forall
(
Φ
:
nat
→
PROP
)
:
□
(
∀
(
x
:
nat
),
Φ
x
)
-∗
Φ
0
∗
Φ
1
.
Proof
.
iIntros
"#H"
.
(* iDestruct does not consume "H" because it's a [∀] *)
iDestruct
(
"H"
$!
0
)
as
"$"
.
iDestruct
(
"H"
$!
1
)
as
"$"
.
Qed
.
Lemma
test_iDestruct_intuitionistic_affine_bi
`{
!
BiAffine
PROP
}
P
Q
`{
!
Persistent
P
}:
Lemma
test_iDestruct_intuitionistic_affine_bi
`{
!
BiAffine
PROP
}
P
Q
`{
!
Persistent
P
}:
Q
∗
(
Q
-∗
P
)
-∗
P
∗
Q
.
Q
∗
(
Q
-∗
P
)
-∗
P
∗
Q
.
Proof
.
iIntros
"[HQ HQP]"
.
iDestruct
(
"HQP"
with
"HQ"
)
as
"#HP"
.
by
iFrame
.
Qed
.
Proof
.
iIntros
"[HQ HQP]"
.
iDestruct
(
"HQP"
with
"HQ"
)
as
"#HP"
.
by
iFrame
.
Qed
.
...
...
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