Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
stdpp
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
Model registry
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
Iris
stdpp
Commits
7c3203e7
Commit
7c3203e7
authored
5 years ago
by
Ralf Jung
Browse files
Options
Downloads
Patches
Plain Diff
make solve_ndisj more powerful
parent
3bf046f2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!75
make solve_ndisj more powerful
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
tests/solve_ndisj.ref
+0
-3
0 additions, 3 deletions
tests/solve_ndisj.ref
tests/solve_ndisj.v
+1
-8
1 addition, 8 deletions
tests/solve_ndisj.v
theories/namespaces.v
+4
-2
4 additions, 2 deletions
theories/namespaces.v
theories/sets.v
+4
-0
4 additions, 0 deletions
theories/sets.v
with
9 additions
and
13 deletions
tests/solve_ndisj.ref
+
0
−
3
View file @
7c3203e7
The command has indeed failed with message:
Ltac call to "solve_ndisj" failed.
No applicable tactic.
This diff is collapsed.
Click to expand it.
tests/solve_ndisj.v
+
1
−
8
View file @
7c3203e7
From
stdpp
Require
Import
namespaces
strings
.
Set
Ltac
Backtrace
.
Lemma
test1
(
N1
N2
:
namespace
)
:
N1
##
N2
→
↑
N1
⊆@
{
coPset
}
⊤
∖
↑
N2
.
Proof
.
solve_ndisj
.
Qed
.
...
...
@@ -20,9 +18,4 @@ Proof. solve_ndisj. Qed.
Lemma
test5
(
N1
N2
:
namespace
)
:
⊤
∖
↑
N1
∖
↑
N2
⊆@
{
coPset
}
⊤
∖
↑
N1
.
@
"x"
∖
↑
N2
∖
↑
N1
.
@
"y"
.
Proof
.
Fail
solve_ndisj
.
(* FIXME: it should be able to solve this. *)
apply
namespace_subseteq_difference
.
{
apply
ndot_preserve_disjoint_r
.
set_solver
.
}
solve_ndisj
.
Qed
.
Proof
.
solve_ndisj
.
Qed
.
This diff is collapsed.
Click to expand it.
theories/namespaces.v
+
4
−
2
View file @
7c3203e7
...
...
@@ -88,13 +88,15 @@ Hint Resolve namespace_subseteq_difference : ndisj.
Hint
Extern
0
(_
##
_)
=>
apply
ndot_ne_disjoint
;
congruence
:
ndisj
.
Hint
Resolve
ndot_preserve_disjoint_l
ndot_preserve_disjoint_r
:
ndisj
.
Hint
Resolve
nclose_subseteq'
ndisj_difference_l
:
ndisj
.
Hint
Resolve
namespace_subseteq_difference_l
|
100
:
ndisj
.
Hint
Resolve
(
empty_subseteq
(
A
:=
positive
)
(
C
:=
coPset
))
:
ndisj
.
Hint
Resolve
(
union_least
(
A
:=
positive
)
(
C
:=
coPset
))
:
ndisj
.
(* Fall-back rules that lose information (but let other rules above apply). *)
Hint
Resolve
namespace_subseteq_difference_l
|
100
:
ndisj
.
Hint
Resolve
(
disjoint_difference_l
(
A
:=
positive
)
(
C
:=
coPset
))
|
100
:
ndisj
.
Ltac
solve_ndisj
:=
repeat
match
goal
with
|
H
:
_
∪
_
⊆
_
|
-
_
=>
apply
union_subseteq
in
H
as
[??]
end
;
solve
[
eauto
1
0
with
ndisj
]
.
solve
[
eauto
1
2
with
ndisj
]
.
Hint
Extern
1000
=>
solve_ndisj
:
solve_ndisj
.
This diff is collapsed.
Click to expand it.
theories/sets.v
+
4
−
0
View file @
7c3203e7
...
...
@@ -656,6 +656,10 @@ Section set.
(** Disjointness *)
Lemma
disjoint_intersection
X
Y
:
X
##
Y
↔
X
∩
Y
≡
∅.
Proof
.
set_solver
.
Qed
.
Lemma
disjoint_difference_l
X
Y1
Y2
:
Y1
##
X
→
Y1
∖
Y2
##
X
.
Proof
.
set_solver
.
Qed
.
Lemma
disjoint_difference_r
X
Y1
Y2
:
X
##
Y1
→
X
##
Y1
∖
Y2
.
Proof
.
set_solver
.
Qed
.
Section
leibniz
.
Context
`{
!
LeibnizEquiv
C
}
.
...
...
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