tla-ts 0.0.10-dev.99796fe03 → 0.0.10-dev.a17d6d9fa
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 +3 -2
- package/dist/index.d.ts +3 -2
- 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 +60 -60
- package/dist/prove.js +78 -78
- package/dist/run.cjs +42 -44
- 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 +39 -39
- 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 +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +1 -1
- package/src/check-trace.ts +90 -51
- package/src/check.ts +367 -178
- 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 +16 -10
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +26 -9
- package/src/dependencies.ts +49 -9
- package/src/dfid.ts +22 -10
- package/src/environment.ts +58 -33
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +117 -41
- package/src/exit-codes.ts +4 -2
- package/src/instances.ts +5 -5
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/liveness-checker.ts +81 -33
- package/src/liveness.ts +49 -11
- 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 +112 -145
- 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/arith-rewriter.ts +11 -3
- package/src/prover/smt/solver/array-rewriter.ts +12 -2
- package/src/prover/smt/solver/asserted-formulas.ts +169 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +63 -14
- package/src/prover/smt/solver/auf-solver.ts +23 -12
- package/src/prover/smt/solver/bit-blast-tactic.ts +26 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-simplifier.ts +11 -13
- 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 +32 -18
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
- package/src/prover/smt/solver/context.ts +47 -9
- 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-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +5 -8
- 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 -11
- 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/internalizer.ts +1 -1
- package/src/prover/smt/solver/logic-tactics.ts +9 -2
- package/src/prover/smt/solver/lp/lp-settings.ts +5 -1
- package/src/prover/smt/solver/lp/nla-core.ts +1 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +2 -2
- package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
- package/src/prover/smt/solver/lp/pdd.ts +2 -3
- 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-evaluator.ts +2 -0
- package/src/prover/smt/solver/model-generator.ts +85 -43
- 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 +20 -7
- package/src/prover/smt/solver/opt-nlsat.ts +29 -18
- package/src/prover/smt/solver/opt-pareto.ts +19 -0
- package/src/prover/smt/solver/opt-preprocess.ts +1 -1
- package/src/prover/smt/solver/opt-solver.ts +9 -5
- 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 +75 -18
- package/src/prover/smt/solver/probes.ts +88 -23
- package/src/prover/smt/solver/proto-model.ts +8 -8
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- 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/qsat.ts +16 -6
- 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/rewriter.ts +31 -25
- 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/goal2sat.ts +0 -1
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +39 -5
- 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 +13 -5
- 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 +2 -2
- 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 +39 -5
- package/src/prover/smt/solver/smt-setup.ts +96 -10
- package/src/prover/smt/solver/smtlib-parser.ts +584 -223
- package/src/prover/smt/solver/smtlib-script.ts +509 -154
- package/src/prover/smt/solver/solve-eqs.ts +36 -37
- package/src/prover/smt/solver/solver.ts +18 -3
- package/src/prover/smt/solver/tactic.ts +284 -168
- package/src/prover/smt/solver/theory-bv.ts +13 -3
- package/src/prover/smt/solver/theory-fpa.ts +1 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
- package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
- package/src/prover/smt/solver/theory-lra.ts +1 -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/smt/solver/tseitin-cnf.ts +1 -0
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/index-table.ts +5 -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/resolve.ts +959 -243
- package/src/runtime.ts +7 -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 +166 -101
- package/src/simulate.ts +110 -50
- package/src/spec-description.ts +5 -6
- package/src/standard-modules.ts +15 -6
- package/src/subexpressions.ts +398 -108
- package/src/successors.ts +4 -2
- 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/random.ts +2 -1
- package/src/tlc/replay.ts +3 -2
- package/src/tlc/tlc-operators.ts +10 -8
- package/src/tlc/tlcext-operators.ts +44 -15
- package/src/tlc/trace-spec.ts +9 -22
- package/src/typed-tier.ts +32 -25
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +135 -78
|
@@ -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 { DependentExprState, finishSimplifier } from "./dependent-expr-state";
|
|
39
40
|
|
|
40
|
-
|
|
41
|
+
interface SolveEqsOptions {
|
|
41
42
|
isTheorySolver: boolean;
|
|
42
43
|
isIteSolver: boolean;
|
|
43
44
|
isContextSolve: boolean;
|
|
@@ -107,6 +108,7 @@ export class SolveEqs {
|
|
|
107
108
|
private orPositive = new Set<number>();
|
|
108
109
|
private orNegative = new Set<number>();
|
|
109
110
|
private rewriter: Rewriter;
|
|
111
|
+
private state: DependentExprState;
|
|
110
112
|
|
|
111
113
|
constructor(
|
|
112
114
|
private manager: AstManager,
|
|
@@ -118,6 +120,7 @@ export class SolveEqs {
|
|
|
118
120
|
this.bounds = new BoundManager(manager);
|
|
119
121
|
this.substitution = new ObjMap((expr) => manager.hashes[expr]);
|
|
120
122
|
this.rewriter = new Rewriter(manager, options.rewriter);
|
|
123
|
+
this.state = new DependentExprState(manager, goal);
|
|
121
124
|
}
|
|
122
125
|
|
|
123
126
|
private pin(expr: number) {
|
|
@@ -295,7 +298,7 @@ export class SolveEqs {
|
|
|
295
298
|
)
|
|
296
299
|
)
|
|
297
300
|
continue;
|
|
298
|
-
const others = factors.filter((
|
|
301
|
+
const others = factors.filter((_value, otherIndex) => otherIndex !== factorIndex);
|
|
299
302
|
const term = this.mkSubTerm(x, index, y);
|
|
300
303
|
this.push(
|
|
301
304
|
eqs,
|
|
@@ -328,7 +331,7 @@ export class SolveEqs {
|
|
|
328
331
|
!factors.every((other, otherIndex) => otherIndex === index || this.isNonzeroFactor(other))
|
|
329
332
|
)
|
|
330
333
|
continue;
|
|
331
|
-
const others = factors.filter((
|
|
334
|
+
const others = factors.filter((_value, otherIndex) => otherIndex !== index);
|
|
332
335
|
this.push(
|
|
333
336
|
eqs,
|
|
334
337
|
orig,
|
|
@@ -436,8 +439,7 @@ export class SolveEqs {
|
|
|
436
439
|
const manager = this.manager;
|
|
437
440
|
const visited = new Set<number>();
|
|
438
441
|
const todo = [root];
|
|
439
|
-
|
|
440
|
-
const expr = todo.pop() as number;
|
|
442
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
441
443
|
if (visited.has(expr)) continue;
|
|
442
444
|
visited.add(expr);
|
|
443
445
|
if (isMatch(expr)) return true;
|
|
@@ -516,12 +518,15 @@ export class SolveEqs {
|
|
|
516
518
|
|
|
517
519
|
private getEqs() {
|
|
518
520
|
const eqs: DependentEq[] = [];
|
|
519
|
-
const
|
|
520
|
-
if (!this.goal.isProofsEnabled)
|
|
521
|
-
|
|
521
|
+
const state = this.state;
|
|
522
|
+
if (!this.goal.isProofsEnabled)
|
|
523
|
+
state.forEachIndex((index) => this.getArithEqs(state.get(index), eqs));
|
|
524
|
+
state.forEachIndex((index) => this.getBasicEqs(state.get(index), eqs));
|
|
522
525
|
if (!this.goal.isProofsEnabled) {
|
|
523
|
-
|
|
524
|
-
|
|
526
|
+
state.forEachIndex((index) => this.getBvEqs(state.get(index), eqs));
|
|
527
|
+
state.forEachIndex((index) => this.checkArrayEqs(state.get(index)));
|
|
528
|
+
// ff_extract_eq finds no equations without finite fields, but its pass still counts steps.
|
|
529
|
+
state.forEachIndex(() => {});
|
|
525
530
|
}
|
|
526
531
|
return eqs;
|
|
527
532
|
}
|
|
@@ -553,8 +558,7 @@ export class SolveEqs {
|
|
|
553
558
|
initLevel -= size + 1;
|
|
554
559
|
let currLevel = initLevel;
|
|
555
560
|
todo.push(id);
|
|
556
|
-
|
|
557
|
-
const next = todo.pop() as number;
|
|
561
|
+
for (let next = todo.pop(); next !== undefined; next = todo.pop()) {
|
|
558
562
|
if (this.id2level[next] !== Infinity) continue;
|
|
559
563
|
this.id2level[next] = currLevel++;
|
|
560
564
|
for (const eq of this.next[next]) {
|
|
@@ -562,8 +566,7 @@ export class SolveEqs {
|
|
|
562
566
|
let isSafe = true;
|
|
563
567
|
const visited = new Set<number>();
|
|
564
568
|
const stack = [eq.term];
|
|
565
|
-
|
|
566
|
-
const expr = stack.pop() as number;
|
|
569
|
+
for (let expr = stack.pop(); expr !== undefined; expr = stack.pop()) {
|
|
567
570
|
if (visited.has(expr)) continue;
|
|
568
571
|
visited.add(expr);
|
|
569
572
|
if (manager.kinds[expr] === KIND_APP) manager.pushArgs(expr, stack);
|
|
@@ -595,7 +598,7 @@ export class SolveEqs {
|
|
|
595
598
|
const replacer = new SubstReplacer(manager, this.substitution);
|
|
596
599
|
this.substIds.sort((first, second) => this.id2level[second] - this.id2level[first]);
|
|
597
600
|
for (const id of this.substIds) {
|
|
598
|
-
manager.limit.
|
|
601
|
+
if (!manager.limit.inc()) break;
|
|
599
602
|
const eq = this.next[id][0];
|
|
600
603
|
const definition = replacer.rewrite(eq.term);
|
|
601
604
|
this.pinned.pushOwned(definition);
|
|
@@ -607,19 +610,19 @@ export class SolveEqs {
|
|
|
607
610
|
}
|
|
608
611
|
|
|
609
612
|
private applySubst() {
|
|
610
|
-
if (this.substIds.length === 0) return;
|
|
611
613
|
const manager = this.manager;
|
|
614
|
+
if (!manager.limit.inc() || this.substIds.length === 0) return;
|
|
612
615
|
const replacer = new SubstReplacer(manager, this.substitution);
|
|
613
616
|
const goal = this.goal;
|
|
614
|
-
const
|
|
615
|
-
|
|
616
|
-
const form =
|
|
617
|
+
const state = this.state;
|
|
618
|
+
state.forEachIndex((index) => {
|
|
619
|
+
const form = state.get(index);
|
|
617
620
|
const replaced = replacer.rewrite(form);
|
|
618
621
|
const simplified = this.rewriter.rewrite(replaced);
|
|
619
622
|
manager.decRef(replaced);
|
|
620
623
|
if (simplified !== form) goal.update(index, simplified);
|
|
621
624
|
manager.decRef(simplified);
|
|
622
|
-
}
|
|
625
|
+
});
|
|
623
626
|
replacer.release();
|
|
624
627
|
}
|
|
625
628
|
|
|
@@ -657,18 +660,16 @@ export class SolveEqs {
|
|
|
657
660
|
this.markPositive(form);
|
|
658
661
|
this.bounds.add(form);
|
|
659
662
|
}
|
|
660
|
-
|
|
663
|
+
const limit = this.manager.limit;
|
|
664
|
+
let count = 0;
|
|
665
|
+
do {
|
|
661
666
|
this.runRound(() => this.getEqs());
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
if (this.options.isContextSolve && !goal.isProofsEnabled)
|
|
667
|
+
count++;
|
|
668
|
+
} while (this.substIds.length > 0 && count < 20 && limit.inc());
|
|
669
|
+
if (limit.inc() && this.options.isContextSolve && !goal.isProofsEnabled)
|
|
666
670
|
this.runRound(() => this.collectNestedEqualities());
|
|
667
671
|
this.eqTerms.reset();
|
|
668
|
-
goal.
|
|
669
|
-
goal.elimRedundancies();
|
|
670
|
-
goal.depth++;
|
|
671
|
-
if (this.definitions.length > 0) goal.addDefinitions(this.definitions);
|
|
672
|
+
finishSimplifier(goal, this.definitions);
|
|
672
673
|
}
|
|
673
674
|
|
|
674
675
|
private markPositive(form: number) {
|
|
@@ -737,8 +738,7 @@ export class SolveEqs {
|
|
|
737
738
|
private containsConjunctively(form: number, isNegated: boolean, eq: number, conjuncts: Signed[]) {
|
|
738
739
|
const manager = this.manager;
|
|
739
740
|
const todo: Signed[] = [{ isNegated, expr: form }];
|
|
740
|
-
|
|
741
|
-
const item = todo.pop() as Signed;
|
|
741
|
+
for (let item = todo.pop(); item !== undefined; item = todo.pop()) {
|
|
742
742
|
if (!item.isNegated && item.expr === eq) return true;
|
|
743
743
|
const marks = item.isNegated ? this.andNegative : this.andPositive;
|
|
744
744
|
if (marks.has(item.expr)) continue;
|
|
@@ -758,8 +758,7 @@ export class SolveEqs {
|
|
|
758
758
|
private isDisjunctivelySafe(depth: number, root: number, isNegated: boolean, eq: number) {
|
|
759
759
|
const manager = this.manager;
|
|
760
760
|
const todo: Signed[] = [{ isNegated, expr: root }];
|
|
761
|
-
|
|
762
|
-
const item = todo.pop() as Signed;
|
|
761
|
+
for (let item = todo.pop(); item !== undefined; item = todo.pop()) {
|
|
763
762
|
const marks = item.isNegated ? this.orNegative : this.orPositive;
|
|
764
763
|
if (marks.has(item.expr)) continue;
|
|
765
764
|
marks.add(item.expr);
|
|
@@ -878,8 +877,7 @@ export class SolveEqs {
|
|
|
878
877
|
const seen = new Set<number>();
|
|
879
878
|
for (const index of order) {
|
|
880
879
|
const todo = [forms[index]];
|
|
881
|
-
|
|
882
|
-
const expr = todo.pop() as number;
|
|
880
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
883
881
|
if (seen.has(expr)) continue;
|
|
884
882
|
seen.add(expr);
|
|
885
883
|
occurrence.set(expr, index);
|
|
@@ -893,11 +891,11 @@ export class SolveEqs {
|
|
|
893
891
|
};
|
|
894
892
|
record(
|
|
895
893
|
firstOccurrence,
|
|
896
|
-
forms.map((
|
|
894
|
+
forms.map((_value, index) => index),
|
|
897
895
|
);
|
|
898
896
|
record(
|
|
899
897
|
lastOccurrence,
|
|
900
|
-
forms.map((
|
|
898
|
+
forms.map((_value, index) => forms.length - 1 - index),
|
|
901
899
|
);
|
|
902
900
|
const kept: DependentEq[] = [];
|
|
903
901
|
let lastVar = -1;
|
|
@@ -922,6 +920,7 @@ export class SolveEqs {
|
|
|
922
920
|
}
|
|
923
921
|
|
|
924
922
|
release() {
|
|
923
|
+
this.state.release();
|
|
925
924
|
this.rewriter.release();
|
|
926
925
|
this.pinned.reset();
|
|
927
926
|
this.eqTerms.reset();
|
|
@@ -9,7 +9,7 @@ import type { DecideOptions, Verdict } from "../../verdict";
|
|
|
9
9
|
import { AssertedFormulas } from "./asserted-formulas";
|
|
10
10
|
import { AstManager } from "./ast";
|
|
11
11
|
import { Context, MBQI_MAX_ITERATIONS } from "./context";
|
|
12
|
-
import { L_FALSE, L_TRUE } from "./lbool";
|
|
12
|
+
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
13
13
|
import { applyUfniaTactic } from "./quant-tactics";
|
|
14
14
|
import { ResourceLimit } from "./rlimit";
|
|
15
15
|
import { parseSmtlib } from "./smtlib-parser";
|
|
@@ -20,6 +20,8 @@ export interface KernelParams {
|
|
|
20
20
|
mbqiMaxIterations: number;
|
|
21
21
|
isFindingMacros: boolean;
|
|
22
22
|
relevancyLevel?: 0 | 2;
|
|
23
|
+
isCoreMinimizing?: boolean;
|
|
24
|
+
randomSeed?: number;
|
|
23
25
|
// A kernel without a setup runs as with auto_config false.
|
|
24
26
|
setup?: SmtSetup;
|
|
25
27
|
}
|
|
@@ -30,6 +32,11 @@ const DEFAULT_KERNEL_PARAMS: KernelParams = {
|
|
|
30
32
|
isFindingMacros: false,
|
|
31
33
|
};
|
|
32
34
|
|
|
35
|
+
const assertForms = (context: Context, asserted: AssertedFormulas, forms: number[]) => {
|
|
36
|
+
for (const form of forms) if (!context.checkCanceled()) asserted.assertExpr(form);
|
|
37
|
+
return !context.checkCanceled();
|
|
38
|
+
};
|
|
39
|
+
|
|
33
40
|
interface SmtCheck {
|
|
34
41
|
verdict: Verdict;
|
|
35
42
|
numInstances: number;
|
|
@@ -43,8 +50,12 @@ export const solveGoal = (manager: AstManager, forms: number[], params: KernelPa
|
|
|
43
50
|
isMbqi: params.isMbqi,
|
|
44
51
|
mbqiMaxIterations: params.mbqiMaxIterations,
|
|
45
52
|
relevancyLevel: 2,
|
|
53
|
+
randomSeed: params.randomSeed,
|
|
46
54
|
});
|
|
47
|
-
|
|
55
|
+
if (!assertForms(context, asserted, forms)) {
|
|
56
|
+
manager.limit.release();
|
|
57
|
+
return { result: L_UNDEF, context, reasonUnknown: "canceled" };
|
|
58
|
+
}
|
|
48
59
|
context.setupContext(params.setup, true, asserted);
|
|
49
60
|
context.internalizeAssertions(asserted);
|
|
50
61
|
const theoryAssumptions: number[] = [];
|
|
@@ -81,8 +92,12 @@ export const solveAssuming = (
|
|
|
81
92
|
isMbqi: params.isMbqi,
|
|
82
93
|
mbqiMaxIterations: params.mbqiMaxIterations,
|
|
83
94
|
relevancyLevel: 2,
|
|
95
|
+
randomSeed: params.randomSeed,
|
|
84
96
|
});
|
|
85
|
-
|
|
97
|
+
if (!assertForms(context, asserted, assertions)) {
|
|
98
|
+
manager.limit.release();
|
|
99
|
+
return { result: L_UNDEF, context, reasonUnknown: "canceled" };
|
|
100
|
+
}
|
|
86
101
|
context.setupContext(params.setup, false, asserted);
|
|
87
102
|
context.internalizeAssertions(asserted);
|
|
88
103
|
const result = context.checkResearching(asserted, assumptions);
|