tla-ts 0.0.10-dev.09e53c2a6 → 0.0.10-dev.1ebc153bd
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +36 -36
- package/dist/deciders.js +54 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +2 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +43 -43
- package/dist/prove.js +78 -78
- package/dist/run.cjs +33 -35
- package/dist/run.js +44 -46
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +43 -43
- package/dist/transfer.js +38 -38
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +1 -0
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +152 -64
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +1 -2
- package/src/cli/tlc.ts +13 -8
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +9 -5
- package/src/dependencies.ts +49 -9
- package/src/dfid.ts +9 -2
- package/src/environment.ts +57 -33
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +4 -2
- package/src/instances.ts +5 -5
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/liveness-checker.ts +43 -4
- package/src/liveness.ts +1 -1
- package/src/obligations/index.ts +1 -1
- package/src/obligations/normalize.ts +1 -4
- package/src/obligations/printer.ts +5 -5
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +5 -0
- package/src/parser.ts +106 -144
- package/src/prover/isabelle/isar/attrib.ts +4 -4
- package/src/prover/isabelle/isar/rule-cases.ts +8 -6
- package/src/prover/isabelle/provers/clasimp.ts +1 -1
- package/src/prover/isabelle/provers/hypsubst.ts +2 -2
- package/src/prover/isabelle/pure/rewriter.ts +3 -3
- package/src/prover/isabelle/pure/term.ts +3 -3
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/smt/rewrite.ts +2 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/asserted-formulas.ts +66 -1
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +58 -11
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-simplifier.ts +2 -3
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
- package/src/prover/smt/solver/bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/card2bv.ts +3 -5
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +2 -3
- package/src/prover/smt/solver/context.ts +24 -3
- package/src/prover/smt/solver/ctx-simplify.ts +1 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
- package/src/prover/smt/solver/dependent-expr-state.ts +9 -4
- package/src/prover/smt/solver/diff-neq.ts +1 -2
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +4 -7
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/egraph.ts +4 -10
- package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
- package/src/prover/smt/solver/euf/mam.ts +1 -5
- package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
- package/src/prover/smt/solver/euf/th-solver.ts +0 -7
- package/src/prover/smt/solver/expr2polynomial.ts +204 -79
- package/src/prover/smt/solver/factor.ts +36 -14
- package/src/prover/smt/solver/fd-solver.ts +2 -0
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
- package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
- package/src/prover/smt/solver/goal.ts +6 -3
- package/src/prover/smt/solver/goal2nlsat.ts +57 -30
- package/src/prover/smt/solver/hashtable.ts +4 -0
- package/src/prover/smt/solver/logic-tactics.ts +9 -2
- package/src/prover/smt/solver/lp/containers.ts +7 -1
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -3
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -1
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -2
- package/src/prover/smt/solver/lp/nex.ts +2 -1
- package/src/prover/smt/solver/lp/nla-core.ts +1 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +158 -80
- package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -2
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -20
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -39
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/union-find.ts +1 -1
- package/src/prover/smt/solver/mam-compiler.ts +1 -1
- package/src/prover/smt/solver/model-based-opt.ts +1 -1
- package/src/prover/smt/solver/model-generator.ts +3 -1
- package/src/prover/smt/solver/mpf.ts +2 -4
- package/src/prover/smt/solver/mus.ts +2 -3
- package/src/prover/smt/solver/muz/dl-context.ts +10 -4
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
- package/src/prover/smt/solver/muz/dl-rule.ts +2 -2
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
- package/src/prover/smt/solver/muz/horn-tactic.ts +1 -1
- package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
- package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
- package/src/prover/smt/solver/nlqsat.ts +1 -1
- package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
- package/src/prover/smt/solver/nlsat/explain.ts +375 -217
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
- package/src/prover/smt/solver/nlsat/solver.ts +74 -64
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
- package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
- package/src/prover/smt/solver/nnf.ts +6 -2
- package/src/prover/smt/solver/opt-context.ts +9 -3
- package/src/prover/smt/solver/opt-nlsat.ts +29 -18
- package/src/prover/smt/solver/opt-preprocess.ts +1 -1
- package/src/prover/smt/solver/opt-solver.ts +6 -3
- package/src/prover/smt/solver/optsmt.ts +1 -1
- package/src/prover/smt/solver/pb-rewriter.ts +1 -4
- package/src/prover/smt/solver/poly-rewriter.ts +74 -18
- package/src/prover/smt/solver/probes.ts +88 -23
- package/src/prover/smt/solver/proto-model.ts +4 -6
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
- package/src/prover/smt/solver/qe-lite.ts +2 -2
- package/src/prover/smt/solver/qe.ts +3 -2
- package/src/prover/smt/solver/quantifier-manager.ts +14 -9
- package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
- package/src/prover/smt/solver/rlimit.ts +4 -0
- package/src/prover/smt/solver/sat/config.ts +1 -1
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +26 -1
- package/src/prover/smt/solver/sat/model-converter.ts +1 -1
- package/src/prover/smt/solver/sat/pb-solver.ts +1 -1
- package/src/prover/smt/solver/sat/sat-tactic.ts +4 -3
- package/src/prover/smt/solver/sat/simplifier.ts +1 -1
- package/src/prover/smt/solver/sat/solver.ts +25 -47
- package/src/prover/smt/solver/seq-axioms.ts +20 -35
- package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
- package/src/prover/smt/solver/seq-derive.ts +4 -7
- package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
- package/src/prover/smt/solver/seq-monadic.ts +7 -5
- package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
- package/src/prover/smt/solver/seq-re-util.ts +1 -1
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
- package/src/prover/smt/solver/seq-regex-live.ts +2 -2
- package/src/prover/smt/solver/seq-rewriter.ts +31 -29
- package/src/prover/smt/solver/seq-skolem.ts +0 -23
- package/src/prover/smt/solver/seq-view-witness.ts +4 -4
- package/src/prover/smt/solver/smt-kernel.ts +9 -3
- package/src/prover/smt/solver/smt-setup.ts +68 -6
- package/src/prover/smt/solver/smtlib-parser.ts +558 -220
- package/src/prover/smt/solver/smtlib-script.ts +495 -153
- package/src/prover/smt/solver/solve-eqs.ts +13 -21
- package/src/prover/smt/solver/tactic.ts +219 -130
- package/src/prover/smt/solver/theory-bv.ts +2 -2
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -1
- package/src/prover/smt/solver/theory-lra-internalize.ts +1 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +6 -4
- package/src/prover/smt/solver/theory-lra.ts +0 -1
- package/src/prover/smt/solver/theory-pb.ts +24 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
- package/src/prover/smt/solver/theory-seq-state.ts +2 -21
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/equality-rules.ts +24 -0
- package/src/prover/zenon/expr.ts +21 -0
- package/src/prover/zenon/index-table.ts +7 -2
- package/src/prover/zenon/isar-case.ts +1 -1
- package/src/prover/zenon/isar.ts +2 -2
- package/src/prover/zenon/phrase.ts +1 -1
- package/src/prover/zenon/rules.ts +2 -1
- package/src/resolve.ts +624 -187
- package/src/runtime.ts +3 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/lexer.ts +3 -3
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +51 -22
- package/src/spec-description.ts +2 -2
- package/src/subexpressions.ts +265 -94
- package/src/successors.ts +1 -0
- package/src/symmetry.ts +1 -1
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/tlc-operators.ts +3 -1
- package/src/tlc/tlcext-operators.ts +18 -5
- package/src/tlc/trace-spec.ts +5 -5
- package/src/typed-tier.ts +29 -23
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +46 -27
|
@@ -36,8 +36,9 @@ import { getSubterms } from "./recfun-decl-plugin";
|
|
|
36
36
|
import { RefVector } from "./ref-vector";
|
|
37
37
|
import { Rewriter, type RewriterOptions } from "./rewriter";
|
|
38
38
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
39
|
+
import { finishSimplifier } from "./dependent-expr-state";
|
|
39
40
|
|
|
40
|
-
|
|
41
|
+
interface SolveEqsOptions {
|
|
41
42
|
isTheorySolver: boolean;
|
|
42
43
|
isIteSolver: boolean;
|
|
43
44
|
isContextSolve: boolean;
|
|
@@ -295,7 +296,7 @@ export class SolveEqs {
|
|
|
295
296
|
)
|
|
296
297
|
)
|
|
297
298
|
continue;
|
|
298
|
-
const others = factors.filter((
|
|
299
|
+
const others = factors.filter((_value, otherIndex) => otherIndex !== factorIndex);
|
|
299
300
|
const term = this.mkSubTerm(x, index, y);
|
|
300
301
|
this.push(
|
|
301
302
|
eqs,
|
|
@@ -328,7 +329,7 @@ export class SolveEqs {
|
|
|
328
329
|
!factors.every((other, otherIndex) => otherIndex === index || this.isNonzeroFactor(other))
|
|
329
330
|
)
|
|
330
331
|
continue;
|
|
331
|
-
const others = factors.filter((
|
|
332
|
+
const others = factors.filter((_value, otherIndex) => otherIndex !== index);
|
|
332
333
|
this.push(
|
|
333
334
|
eqs,
|
|
334
335
|
orig,
|
|
@@ -436,8 +437,7 @@ export class SolveEqs {
|
|
|
436
437
|
const manager = this.manager;
|
|
437
438
|
const visited = new Set<number>();
|
|
438
439
|
const todo = [root];
|
|
439
|
-
|
|
440
|
-
const expr = todo.pop() as number;
|
|
440
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
441
441
|
if (visited.has(expr)) continue;
|
|
442
442
|
visited.add(expr);
|
|
443
443
|
if (isMatch(expr)) return true;
|
|
@@ -553,8 +553,7 @@ export class SolveEqs {
|
|
|
553
553
|
initLevel -= size + 1;
|
|
554
554
|
let currLevel = initLevel;
|
|
555
555
|
todo.push(id);
|
|
556
|
-
|
|
557
|
-
const next = todo.pop() as number;
|
|
556
|
+
for (let next = todo.pop(); next !== undefined; next = todo.pop()) {
|
|
558
557
|
if (this.id2level[next] !== Infinity) continue;
|
|
559
558
|
this.id2level[next] = currLevel++;
|
|
560
559
|
for (const eq of this.next[next]) {
|
|
@@ -562,8 +561,7 @@ export class SolveEqs {
|
|
|
562
561
|
let isSafe = true;
|
|
563
562
|
const visited = new Set<number>();
|
|
564
563
|
const stack = [eq.term];
|
|
565
|
-
|
|
566
|
-
const expr = stack.pop() as number;
|
|
564
|
+
for (let expr = stack.pop(); expr !== undefined; expr = stack.pop()) {
|
|
567
565
|
if (visited.has(expr)) continue;
|
|
568
566
|
visited.add(expr);
|
|
569
567
|
if (manager.kinds[expr] === KIND_APP) manager.pushArgs(expr, stack);
|
|
@@ -665,10 +663,7 @@ export class SolveEqs {
|
|
|
665
663
|
if (this.options.isContextSolve && !goal.isProofsEnabled)
|
|
666
664
|
this.runRound(() => this.collectNestedEqualities());
|
|
667
665
|
this.eqTerms.reset();
|
|
668
|
-
goal.
|
|
669
|
-
goal.elimRedundancies();
|
|
670
|
-
goal.depth++;
|
|
671
|
-
if (this.definitions.length > 0) goal.addDefinitions(this.definitions);
|
|
666
|
+
finishSimplifier(goal, this.definitions);
|
|
672
667
|
}
|
|
673
668
|
|
|
674
669
|
private markPositive(form: number) {
|
|
@@ -737,8 +732,7 @@ export class SolveEqs {
|
|
|
737
732
|
private containsConjunctively(form: number, isNegated: boolean, eq: number, conjuncts: Signed[]) {
|
|
738
733
|
const manager = this.manager;
|
|
739
734
|
const todo: Signed[] = [{ isNegated, expr: form }];
|
|
740
|
-
|
|
741
|
-
const item = todo.pop() as Signed;
|
|
735
|
+
for (let item = todo.pop(); item !== undefined; item = todo.pop()) {
|
|
742
736
|
if (!item.isNegated && item.expr === eq) return true;
|
|
743
737
|
const marks = item.isNegated ? this.andNegative : this.andPositive;
|
|
744
738
|
if (marks.has(item.expr)) continue;
|
|
@@ -758,8 +752,7 @@ export class SolveEqs {
|
|
|
758
752
|
private isDisjunctivelySafe(depth: number, root: number, isNegated: boolean, eq: number) {
|
|
759
753
|
const manager = this.manager;
|
|
760
754
|
const todo: Signed[] = [{ isNegated, expr: root }];
|
|
761
|
-
|
|
762
|
-
const item = todo.pop() as Signed;
|
|
755
|
+
for (let item = todo.pop(); item !== undefined; item = todo.pop()) {
|
|
763
756
|
const marks = item.isNegated ? this.orNegative : this.orPositive;
|
|
764
757
|
if (marks.has(item.expr)) continue;
|
|
765
758
|
marks.add(item.expr);
|
|
@@ -878,8 +871,7 @@ export class SolveEqs {
|
|
|
878
871
|
const seen = new Set<number>();
|
|
879
872
|
for (const index of order) {
|
|
880
873
|
const todo = [forms[index]];
|
|
881
|
-
|
|
882
|
-
const expr = todo.pop() as number;
|
|
874
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
883
875
|
if (seen.has(expr)) continue;
|
|
884
876
|
seen.add(expr);
|
|
885
877
|
occurrence.set(expr, index);
|
|
@@ -893,11 +885,11 @@ export class SolveEqs {
|
|
|
893
885
|
};
|
|
894
886
|
record(
|
|
895
887
|
firstOccurrence,
|
|
896
|
-
forms.map((
|
|
888
|
+
forms.map((_value, index) => index),
|
|
897
889
|
);
|
|
898
890
|
record(
|
|
899
891
|
lastOccurrence,
|
|
900
|
-
forms.map((
|
|
892
|
+
forms.map((_value, index) => forms.length - 1 - index),
|
|
901
893
|
);
|
|
902
894
|
const kept: DependentEq[] = [];
|
|
903
895
|
let lastVar = -1;
|