Skip to content

Commit 62fc738

Browse files
Merge pull request #155 from andres-erbsen/split-nsatz
split nsatz into per-domain pieces
2 parents 92dafd5 + ff7d1db commit 62fc738

File tree

23 files changed

+284
-269
lines changed

23 files changed

+284
-269
lines changed

.nix/rocq-overlays/stdlib-subcomponents/default.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ let
3030
"field" = [ "zarith" ];
3131
"lqa" = [ "field" "qarith-base" ];
3232
"qarith" = [ "lqa" ];
33-
"nsatz" = [ "zarith" "qarith-base" ];
3433
"classical-logic" = [ "arith" ];
3534
"sets" = [ "classical-logic" ];
3635
"vectors" = [ "lists" ];
@@ -41,7 +40,7 @@ let
4140
"primitive-floats" = [ "primitive-int" ];
4241
"primitive-array" = [ "primitive-int" ];
4342
"primitive-string" = [ "primitive-int" "orders-ex" ];
44-
"reals" = [ "nsatz" "qarith" "classical-logic" "vectors" ];
43+
"reals" = [ "qarith" "classical-logic" "vectors" ];
4544
"fmaps-fsets-msets" = [ "orders-ex" "zarith" ];
4645
"extraction" = [ "primitive-string" "primitive-array" "primitive-floats" ];
4746
"funind" = [ "arith-base" ];
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
- in `NsatzTactic.v`
2+
3+
+ Split NsatzTactic into a smaller `NsatzTactic` that only depends on
4+
`setoid_ring`, and per-domain files `ZNsatz`, `QNsatz`, and `RNsatz`
5+
(`#155 <https://github.com/coq/stdlib/pull/155>`_,
6+
by Andres Erbsen).
7+

doc/stdlib/depends.dot

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ digraph stdlib_deps {
1616
reals -> qarith;
1717
reals -> vectors;
1818
reals -> "classical-logic";
19-
reals -> nsatz;
2019
"arith-base" -> structures;
2120
zarith -> lia;
2221
zmod -> zarith;
@@ -55,8 +54,6 @@ digraph stdlib_deps {
5554
lqa -> "qarith-base";
5655
"qarith-base" -> ring;
5756
"classical-logic" -> arith;
58-
nsatz -> zarith;
59-
nsatz -> "qarith-base";
6057
extraction -> "primitive-string";
6158
extraction -> "primitive-floats";
6259
extraction -> "primitive-array";

doc/stdlib/index-list.html.template

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ through the <tt>From Stdlib Require Import</tt> command.</p>
295295
theories/ZArith/Zdiv_facts.v
296296
theories/ZArith/Zbitwise.v
297297
theories/ZArith/ZModOffset.v
298+
theories/ZArith/ZNsatz.v
298299
theories/Numbers/DecimalFacts.v
299300
theories/Numbers/DecimalNat.v
300301
theories/Numbers/DecimalPos.v
@@ -528,6 +529,7 @@ through the <tt>From Stdlib Require Import</tt> command.</p>
528529
theories/QArith/Qabs.v
529530
(theories/QArith/QArith.v)
530531
theories/QArith/Qcabs.v
532+
theories/QArith/QNsatz.v
531533
theories/Numbers/DecimalQ.v
532534
theories/Numbers/HexadecimalQ.v
533535
</dd>
@@ -609,6 +611,7 @@ through the <tt>From Stdlib Require Import</tt> command.</p>
609611
theories/Reals/SeqSeries.v
610612
theories/Reals/Sqrt_reg.v
611613
theories/Reals/Rlogic.v
614+
theories/Reals/RNsatz.v
612615
theories/Reals/Rregisternames.v
613616
(theories/Reals/Reals.v)
614617
theories/Reals/Runcountable.v

test-suite/output/NsatzGuessOnce.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Debug: 1: looking for Integral_domain with backtracking
2+
Debug: 1.1: exact Zdi on Integral_domain, 0 subgoal(s)

test-suite/output/NsatzGuessOnce.v

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
From Stdlib Require Import Integral_domain ZArith ZNsatz.
2+
Set Typeclasses Debug.
3+
Lemma test (x y : Z) : x = y -> y = x.
4+
Proof. nsatz. Qed.

0 commit comments

Comments
 (0)