tla-ts 0.0.10-dev.d618a2d79 → 0.0.10-dev.e5c8dc315
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 +53 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +18 -4
- package/dist/index.d.ts +18 -4
- 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 +56 -56
- package/dist/prove.js +78 -78
- package/dist/run.cjs +40 -44
- package/dist/run.js +42 -46
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +97 -92
- package/dist/transfer.js +97 -92
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +31 -3
- package/src/bags.ts +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +13 -11
- package/src/check-trace.ts +146 -93
- package/src/check.ts +518 -281
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +18 -4
- package/src/cli/tlc.ts +18 -12
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +23 -10
- package/src/coverage.ts +255 -18
- package/src/dependencies.ts +68 -15
- package/src/dfid.ts +101 -36
- package/src/environment.ts +155 -66
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +424 -135
- package/src/exit-codes.ts +28 -14
- package/src/instances.ts +152 -25
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +675 -236
- package/src/lexer.ts +12 -2
- package/src/liveness-checker.ts +179 -60
- package/src/liveness.ts +55 -10
- package/src/obligations/index.ts +1 -1
- package/src/obligations/normalize.ts +1 -4
- package/src/obligations/printer.ts +5 -5
- package/src/obligations/source.ts +2 -0
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +5 -0
- package/src/parser.ts +180 -149
- 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/ackermannize-bv-tactic.ts +3 -2
- 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 +171 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +66 -14
- package/src/prover/smt/solver/auf-solver.ts +23 -12
- package/src/prover/smt/solver/bit-blast-tactic.ts +28 -2
- 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/bv1-blast.ts +1 -1
- package/src/prover/smt/solver/card2bv.ts +35 -18
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
- package/src/prover/smt/solver/context.ts +84 -15
- package/src/prover/smt/solver/ctx-simplify.ts +9 -4
- package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
- package/src/prover/smt/solver/dependent-expr-state.ts +28 -16
- package/src/prover/smt/solver/diff-neq.ts +9 -8
- package/src/prover/smt/solver/dt2bv-tactic.ts +66 -28
- 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 +31 -28
- package/src/prover/smt/solver/eq2bv-tactic.ts +15 -6
- 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 +608 -139
- package/src/prover/smt/solver/fix-dl-var.ts +2 -3
- package/src/prover/smt/solver/fm-tactic.ts +9 -7
- 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/fpa2bv-tactic.ts +1 -1
- 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/lia2pb.ts +1 -1
- package/src/prover/smt/solver/logic-tactics.ts +15 -5
- package/src/prover/smt/solver/lp/core-solver.ts +12 -8
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -2
- 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/maxcore.ts +2 -1
- package/src/prover/smt/solver/maxsmt-base.ts +1 -0
- package/src/prover/smt/solver/model-based-opt.ts +1 -1
- package/src/prover/smt/solver/model-checker.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 +22 -44
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
- package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
- package/src/prover/smt/solver/muz/hnf.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 +15 -2
- package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
- 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/muz/spacer-prop-solver.ts +1 -1
- package/src/prover/smt/solver/nlqsat.ts +2 -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/normalize-bounds.ts +2 -2
- package/src/prover/smt/solver/occf.ts +1 -1
- package/src/prover/smt/solver/opt-context.ts +21 -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 +10 -6
- package/src/prover/smt/solver/optsmt.ts +1 -1
- package/src/prover/smt/solver/parallel-tactic.ts +1 -1
- package/src/prover/smt/solver/pb-rewriter.ts +1 -4
- package/src/prover/smt/solver/pb2bv-tactic.ts +9 -3
- 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/purify-arith.ts +51 -49
- 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 +23 -8
- 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/reduce-args.ts +2 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
- package/src/prover/smt/solver/rewriter.ts +31 -25
- package/src/prover/smt/solver/rlimit.ts +7 -3
- package/src/prover/smt/solver/sat/config.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +75 -12
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +149 -47
- package/src/prover/smt/solver/sat/model-converter.ts +1 -1
- package/src/prover/smt/solver/sat/pb-constraint.ts +7 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +26 -7
- package/src/prover/smt/solver/sat/sat-tactic.ts +54 -25
- package/src/prover/smt/solver/sat/sat2goal.ts +75 -50
- package/src/prover/smt/solver/sat/simplifier.ts +1 -1
- package/src/prover/smt/solver/sat/solver.ts +27 -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-consequences.ts +1 -1
- package/src/prover/smt/solver/smt-kernel.ts +48 -7
- package/src/prover/smt/solver/smt-setup.ts +106 -13
- package/src/prover/smt/solver/smtlib-parser.ts +589 -224
- package/src/prover/smt/solver/smtlib-script.ts +718 -213
- package/src/prover/smt/solver/solve-eqs.ts +36 -37
- package/src/prover/smt/solver/solver.ts +18 -4
- package/src/prover/smt/solver/tactic.ts +389 -199
- 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 +12 -3
- package/src/prover/smt/solver/theory-lra-state.ts +1 -1
- 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/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +15 -5
- 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 +1311 -268
- package/src/runtime.ts +21 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +5 -15
- package/src/sany/generator-def-entries.ts +123 -36
- package/src/sany/generator-definitions.ts +5 -3
- package/src/sany/generator-expressions.ts +60 -37
- package/src/sany/generator-proofs.ts +19 -12
- package/src/sany/generator.ts +12 -6
- package/src/sany/lexer.ts +15 -7
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +12 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +321 -135
- package/src/simulate.ts +247 -185
- package/src/spec-description.ts +15 -7
- package/src/standard-definitions.ts +1 -0
- package/src/standard-modules.ts +56 -22
- package/src/subexpressions.ts +666 -147
- package/src/successors.ts +50 -20
- package/src/symmetry.ts +2 -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 +147 -46
- 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/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +52 -31
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +150 -79
|
@@ -92,6 +92,7 @@ export interface RewriterOptions {
|
|
|
92
92
|
readonly localCtxLimit?: number;
|
|
93
93
|
readonly isCoalescingChars?: boolean;
|
|
94
94
|
readonly isSortingStore?: boolean;
|
|
95
|
+
readonly isExpandingSelects?: boolean;
|
|
95
96
|
}
|
|
96
97
|
|
|
97
98
|
export const KERNEL_REWRITER_OPTIONS: RewriterOptions = {
|
|
@@ -141,7 +142,7 @@ export class Rewriter extends RewriterTpl {
|
|
|
141
142
|
return typeof result === "number" ? result : result.expr;
|
|
142
143
|
},
|
|
143
144
|
});
|
|
144
|
-
this.array = new ArrayRewriter(manager, options.isSortingStore);
|
|
145
|
+
this.array = new ArrayRewriter(manager, options.isSortingStore, options.isExpandingSelects);
|
|
145
146
|
this.seq = new SeqRewriter(manager, options.isCoalescingChars ?? true, this);
|
|
146
147
|
this.unusedVarsEliminator = new UnusedVarsEliminator(manager);
|
|
147
148
|
this.der = new Der(manager);
|
|
@@ -154,6 +155,17 @@ export class Rewriter extends RewriterTpl {
|
|
|
154
155
|
super.release();
|
|
155
156
|
}
|
|
156
157
|
|
|
158
|
+
// A rewrite that the spent resource limit stops answers its input instead of failing.
|
|
159
|
+
rewrite(expr: number) {
|
|
160
|
+
try {
|
|
161
|
+
return super.rewrite(expr);
|
|
162
|
+
} catch (error) {
|
|
163
|
+
if (this.manager.limit.inc()) throw error;
|
|
164
|
+
this.manager.incRef(expr);
|
|
165
|
+
return expr;
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
|
|
157
169
|
private reduceTo(expr: number, depth: number): number {
|
|
158
170
|
const manager = this.manager;
|
|
159
171
|
const frames: ReduceFrame[] = [];
|
|
@@ -465,7 +477,7 @@ export class Rewriter extends RewriterTpl {
|
|
|
465
477
|
const manager = this.manager;
|
|
466
478
|
if (sort === SORT_BOOL && manager.sorts[first] !== SORT_BOOL) {
|
|
467
479
|
if (this.isIte(first)) {
|
|
468
|
-
if (manager.
|
|
480
|
+
if (manager.isValue(second) && manager.getRefCount(first) === 1)
|
|
469
481
|
return this.pullIteCore(decl, first, second, sort, false);
|
|
470
482
|
if (this.isIte(second) && manager.getArg(first, 0) === manager.getArg(second, 0)) {
|
|
471
483
|
const branches = [1, 2].map((index) =>
|
|
@@ -481,15 +493,15 @@ export class Rewriter extends RewriterTpl {
|
|
|
481
493
|
};
|
|
482
494
|
}
|
|
483
495
|
}
|
|
484
|
-
if (this.isIte(second) && manager.
|
|
496
|
+
if (this.isIte(second) && manager.isValue(first) && manager.getRefCount(second) === 1)
|
|
485
497
|
return this.pullIteCore(decl, second, first, sort, true);
|
|
486
498
|
}
|
|
487
499
|
const family = manager.funcDecls[decl].family;
|
|
488
500
|
if (family !== FAMILY_BASIC && family !== FAMILY_ARITH && family !== FAMILY_BV)
|
|
489
501
|
return undefined;
|
|
490
|
-
if (manager.
|
|
502
|
+
if (manager.isValue(first) && this.isIteValueTree(second))
|
|
491
503
|
return this.pullIteCore(decl, second, first, sort, true);
|
|
492
|
-
if (manager.
|
|
504
|
+
if (manager.isValue(second) && this.isIteValueTree(first))
|
|
493
505
|
return this.pullIteCore(decl, first, second, sort, false);
|
|
494
506
|
return undefined;
|
|
495
507
|
}
|
|
@@ -506,7 +518,7 @@ export class Rewriter extends RewriterTpl {
|
|
|
506
518
|
manager.funcDecls[decl].op === OP_EQ
|
|
507
519
|
? branch === value
|
|
508
520
|
? manager.trueExpr
|
|
509
|
-
:
|
|
521
|
+
: manager.areDistinct(branch, value)
|
|
510
522
|
? manager.falseExpr
|
|
511
523
|
: manager.mkEq(branch, value)
|
|
512
524
|
: manager.mkApp(decl, isSwapped ? [value, branch] : [branch, value], sort),
|
|
@@ -521,7 +533,7 @@ export class Rewriter extends RewriterTpl {
|
|
|
521
533
|
for (let ite = todo.pop(); ite !== undefined; ite = todo.pop()) {
|
|
522
534
|
for (const branch of [manager.getArg(ite, 1), manager.getArg(ite, 2)]) {
|
|
523
535
|
if (this.isIte(branch) && manager.getRefCount(branch) === 1) todo.push(branch);
|
|
524
|
-
else if (!manager.
|
|
536
|
+
else if (!manager.isValue(branch)) return false;
|
|
525
537
|
}
|
|
526
538
|
}
|
|
527
539
|
return true;
|
|
@@ -879,9 +891,9 @@ export class Rewriter extends RewriterTpl {
|
|
|
879
891
|
private tryIteEq(ite: number, other: number): Rewrite | undefined {
|
|
880
892
|
const manager = this.manager;
|
|
881
893
|
if (!this.isIte(ite)) return undefined;
|
|
882
|
-
if (manager.getArg(ite, 1) === other &&
|
|
894
|
+
if (manager.getArg(ite, 1) === other && manager.areDistinct(manager.getArg(ite, 2), other))
|
|
883
895
|
return { expr: manager.getArg(ite, 0), depth: 1 };
|
|
884
|
-
if (manager.getArg(ite, 2) === other &&
|
|
896
|
+
if (manager.getArg(ite, 2) === other && manager.areDistinct(manager.getArg(ite, 1), other))
|
|
885
897
|
return { expr: manager.mkNot(manager.getArg(ite, 0)), depth: 1 };
|
|
886
898
|
return undefined;
|
|
887
899
|
}
|
|
@@ -890,15 +902,10 @@ export class Rewriter extends RewriterTpl {
|
|
|
890
902
|
return this.manager.getOp(expr) === OP_ITE;
|
|
891
903
|
}
|
|
892
904
|
|
|
893
|
-
private areDistinct(first: number, second: number) {
|
|
894
|
-
const manager = this.manager;
|
|
895
|
-
return first !== second && manager.isUniqueValue(first) && manager.isUniqueValue(second);
|
|
896
|
-
}
|
|
897
|
-
|
|
898
905
|
private mkIteValueEq(left: number, right: number): number | Rewrite | undefined {
|
|
899
906
|
const manager = this.manager;
|
|
900
|
-
if (this.isIte(left) && manager.
|
|
901
|
-
if (this.isIte(right) && manager.
|
|
907
|
+
if (this.isIte(left) && manager.isValue(right)) return this.tryIteValue(left, right);
|
|
908
|
+
if (this.isIte(right) && manager.isValue(left)) return this.tryIteValue(right, left);
|
|
902
909
|
if (
|
|
903
910
|
!this.isIte(left) ||
|
|
904
911
|
!this.isIte(right) ||
|
|
@@ -907,7 +914,7 @@ export class Rewriter extends RewriterTpl {
|
|
|
907
914
|
manager.getArg(left, 2),
|
|
908
915
|
manager.getArg(right, 1),
|
|
909
916
|
manager.getArg(right, 2),
|
|
910
|
-
].every((arg) => manager.
|
|
917
|
+
].every((arg) => manager.isValue(arg))
|
|
911
918
|
)
|
|
912
919
|
return undefined;
|
|
913
920
|
const mkOr = (args: number[]) => manager.mkApp(OP_OR, args, SORT_BOOL);
|
|
@@ -950,16 +957,16 @@ export class Rewriter extends RewriterTpl {
|
|
|
950
957
|
const mkPlainEq = (branch: number) =>
|
|
951
958
|
branch === value
|
|
952
959
|
? manager.trueExpr
|
|
953
|
-
:
|
|
960
|
+
: manager.areDistinct(branch, value)
|
|
954
961
|
? manager.falseExpr
|
|
955
962
|
: manager.mkEq(branch, value);
|
|
956
963
|
const mkAnd = (first: number, second: number) =>
|
|
957
964
|
manager.mkApp(OP_AND, [first, second], SORT_BOOL);
|
|
958
965
|
const mkOr = (first: number, second: number) =>
|
|
959
966
|
manager.mkApp(OP_OR, [first, second], SORT_BOOL);
|
|
960
|
-
if (
|
|
967
|
+
if (manager.areDistinct(value, elseExpr))
|
|
961
968
|
return { expr: mkAnd(mkBranchEq(thenExpr), condition), depth: 2 };
|
|
962
|
-
if (
|
|
969
|
+
if (manager.areDistinct(value, thenExpr))
|
|
963
970
|
return { expr: mkAnd(mkBranchEq(elseExpr), manager.mkNot(condition)), depth: 2 };
|
|
964
971
|
if (value === thenExpr)
|
|
965
972
|
return value === elseExpr
|
|
@@ -969,8 +976,8 @@ export class Rewriter extends RewriterTpl {
|
|
|
969
976
|
return { expr: mkOr(write(this.mkEq(thenExpr, value)), manager.mkNot(condition)), depth: 2 };
|
|
970
977
|
const isValueIte = (expr: number) =>
|
|
971
978
|
this.isIte(expr) &&
|
|
972
|
-
manager.
|
|
973
|
-
manager.
|
|
979
|
+
manager.isValue(manager.getArg(expr, 1)) &&
|
|
980
|
+
manager.isValue(manager.getArg(expr, 2));
|
|
974
981
|
const getExpr = (result: number | Rewrite) =>
|
|
975
982
|
typeof result === "number" ? result : result.expr;
|
|
976
983
|
const thenEq = isValueIte(thenExpr) ? this.tryIteValue(thenExpr, value) : undefined;
|
|
@@ -995,7 +1002,7 @@ export class Rewriter extends RewriterTpl {
|
|
|
995
1002
|
const expr = todo.pop() ?? ite;
|
|
996
1003
|
if (visited.has(expr)) continue;
|
|
997
1004
|
visited.add(expr);
|
|
998
|
-
if (
|
|
1005
|
+
if (manager.isValue(expr) && manager.areDistinct(expr, value)) continue;
|
|
999
1006
|
if (!this.isIte(expr)) return false;
|
|
1000
1007
|
todo.push(manager.getArg(expr, 1), manager.getArg(expr, 2));
|
|
1001
1008
|
}
|
|
@@ -1014,8 +1021,7 @@ export class Rewriter extends RewriterTpl {
|
|
|
1014
1021
|
private mkEqCore(inputLeft: number, inputRight: number): number | Rewrite | undefined {
|
|
1015
1022
|
const manager = this.manager;
|
|
1016
1023
|
if (inputLeft === inputRight) return manager.trueExpr;
|
|
1017
|
-
if (manager.
|
|
1018
|
-
return manager.falseExpr;
|
|
1024
|
+
if (manager.areDistinct(inputLeft, inputRight)) return manager.falseExpr;
|
|
1019
1025
|
const iteEq = this.tryIteEq(inputLeft, inputRight) ?? this.tryIteEq(inputRight, inputLeft);
|
|
1020
1026
|
if (iteEq !== undefined) return iteEq;
|
|
1021
1027
|
const iteValueEq = this.mkIteValueEq(inputLeft, inputRight);
|
|
@@ -14,11 +14,11 @@ export class ResourceLimit {
|
|
|
14
14
|
private signal?: AbortSignal,
|
|
15
15
|
) {}
|
|
16
16
|
|
|
17
|
-
inc() {
|
|
18
|
-
this.count
|
|
17
|
+
inc(offset = 1) {
|
|
18
|
+
this.count += offset;
|
|
19
19
|
if (
|
|
20
20
|
!this.isCanceled &&
|
|
21
|
-
(this.count & CLOCK_CHECK_MASK)
|
|
21
|
+
(this.count & CLOCK_CHECK_MASK) < offset &&
|
|
22
22
|
(Date.now() > this.deadline || this.signal?.aborted === true || this.isHeapNearlyFull())
|
|
23
23
|
) {
|
|
24
24
|
this.isCanceled = true;
|
|
@@ -31,6 +31,10 @@ export class ResourceLimit {
|
|
|
31
31
|
return !this.isSuspended && (this.isCanceled || this.count > this.limit);
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
+
getCancelMessage() {
|
|
35
|
+
return this.isCanceled ? "canceled" : "max. resource limit exceeded";
|
|
36
|
+
}
|
|
37
|
+
|
|
34
38
|
push(delta: number) {
|
|
35
39
|
this.limits.push(this.limit);
|
|
36
40
|
this.limit = Math.min(delta === 0 ? Infinity : this.count + delta, this.limit);
|
|
@@ -13,8 +13,11 @@ import {
|
|
|
13
13
|
OP_OR,
|
|
14
14
|
OP_TRUE,
|
|
15
15
|
OP_XOR,
|
|
16
|
+
SORT_BOOL,
|
|
16
17
|
} from "../ast";
|
|
17
18
|
import { EufSolver, type EufInternalizer, type ThSolverFactory } from "../euf/euf-solver";
|
|
19
|
+
import { getDependencyValues, type Goal } from "../goal";
|
|
20
|
+
import type { ObjMap } from "../hashtable";
|
|
18
21
|
import { DEFAULT_PRINT_OPTIONS, printExpr } from "../smt2-printer";
|
|
19
22
|
import { NULL_LITERAL } from "./clause";
|
|
20
23
|
import { PbSolver, type SatInternalizer } from "./pb-solver";
|
|
@@ -26,6 +29,12 @@ const PRINT_ENVIRONMENT = {
|
|
|
26
29
|
isClashing: () => false,
|
|
27
30
|
};
|
|
28
31
|
|
|
32
|
+
interface UnhandledFun {
|
|
33
|
+
decl: number;
|
|
34
|
+
domain: number[];
|
|
35
|
+
range: number;
|
|
36
|
+
}
|
|
37
|
+
|
|
29
38
|
interface Frame {
|
|
30
39
|
expr: number;
|
|
31
40
|
isRoot: boolean;
|
|
@@ -35,7 +44,7 @@ interface Frame {
|
|
|
35
44
|
|
|
36
45
|
export class Goal2Sat implements SatInternalizer, EufInternalizer {
|
|
37
46
|
readonly atoms = new Map<number, number>();
|
|
38
|
-
readonly unhandledFuns:
|
|
47
|
+
readonly unhandledFuns: UnhandledFun[] = [];
|
|
39
48
|
private frames: Frame[] = [];
|
|
40
49
|
private results: number[] = [];
|
|
41
50
|
private app2lit = new Map<number, number>();
|
|
@@ -108,13 +117,14 @@ export class Goal2Sat implements SatInternalizer, EufInternalizer {
|
|
|
108
117
|
this.app2lit.delete(expr);
|
|
109
118
|
this.lit2app.delete(lit);
|
|
110
119
|
}
|
|
120
|
+
for (let index = cacheLim; index < this.cacheTrail.length; index++)
|
|
121
|
+
manager.decRef(this.cacheTrail[index]);
|
|
111
122
|
this.cacheTrail.length = cacheLim;
|
|
112
123
|
this.cacheLim.length -= remaining;
|
|
113
124
|
}
|
|
114
125
|
|
|
115
126
|
private insertAtom(expr: number, boolVar: number) {
|
|
116
127
|
this.atoms.set(expr, boolVar);
|
|
117
|
-
if (this.mkThSolver === null) return;
|
|
118
128
|
this.manager.incRef(expr);
|
|
119
129
|
this.recentAtoms.push(expr);
|
|
120
130
|
}
|
|
@@ -214,7 +224,11 @@ export class Goal2Sat implements SatInternalizer, EufInternalizer {
|
|
|
214
224
|
} else {
|
|
215
225
|
if (!manager.isUninterpretedConst(expr)) {
|
|
216
226
|
if (!manager.isApp(expr)) this.throwOpNotHandled(expr);
|
|
217
|
-
this.unhandledFuns.push(
|
|
227
|
+
this.unhandledFuns.push({
|
|
228
|
+
decl: manager.decls[expr],
|
|
229
|
+
domain: manager.getArgs(expr).map((arg) => manager.sorts[arg]),
|
|
230
|
+
range: manager.sorts[expr],
|
|
231
|
+
});
|
|
218
232
|
}
|
|
219
233
|
lit = 2 * this.mkBoolVar(expr) + (isSign ? 1 : 0);
|
|
220
234
|
}
|
|
@@ -500,16 +514,29 @@ export class Goal2Sat implements SatInternalizer, EufInternalizer {
|
|
|
500
514
|
this.forcePush();
|
|
501
515
|
this.app2lit.set(expr, lit);
|
|
502
516
|
this.lit2app.set(lit, expr);
|
|
517
|
+
this.manager.incRef(expr);
|
|
503
518
|
this.cacheTrail.push(expr);
|
|
504
519
|
}
|
|
505
520
|
|
|
506
|
-
|
|
507
|
-
getAssumptionLit(assumption: number) {
|
|
521
|
+
private insertDep(dep: number, dep2asm: Map<number, number> | ObjMap<number>) {
|
|
508
522
|
const manager = this.manager;
|
|
509
|
-
const
|
|
510
|
-
|
|
523
|
+
const isSign = manager.isNot(dep);
|
|
524
|
+
const atom = isSign ? manager.getArg(dep, 0) : dep;
|
|
525
|
+
const newDep = manager.isUninterpretedConst(atom)
|
|
526
|
+
? atom
|
|
527
|
+
: manager.mkFreshConst("dep", SORT_BOOL);
|
|
528
|
+
if (newDep !== atom) this.process(manager.mkEq(newDep, atom), true);
|
|
529
|
+
this.convertAtom(newDep, false, false);
|
|
511
530
|
const lit = this.results.pop() as number;
|
|
512
|
-
|
|
531
|
+
dep2asm.set(dep, isSign ? lit ^ 1 : lit);
|
|
532
|
+
}
|
|
533
|
+
|
|
534
|
+
assumptions(assumptions: readonly number[], dep2asm: Map<number, number>) {
|
|
535
|
+
try {
|
|
536
|
+
for (const assumption of assumptions) this.insertDep(assumption, dep2asm);
|
|
537
|
+
} finally {
|
|
538
|
+
this.reset();
|
|
539
|
+
}
|
|
513
540
|
}
|
|
514
541
|
|
|
515
542
|
run(forms: readonly number[]) {
|
|
@@ -517,10 +544,46 @@ export class Goal2Sat implements SatInternalizer, EufInternalizer {
|
|
|
517
544
|
try {
|
|
518
545
|
for (const form of forms) this.process(form, true);
|
|
519
546
|
} finally {
|
|
520
|
-
this.
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
547
|
+
this.reset();
|
|
548
|
+
}
|
|
549
|
+
}
|
|
550
|
+
|
|
551
|
+
runGoal(goal: Goal, dep2asm: Map<number, number> | ObjMap<number>) {
|
|
552
|
+
const manager = this.manager;
|
|
553
|
+
if (this.mkThSolver !== null) this.ensureEuf();
|
|
554
|
+
try {
|
|
555
|
+
forms: for (let index = 0; index < goal.forms.size; index++) {
|
|
556
|
+
const form = goal.forms.items[index];
|
|
557
|
+
const dependency = goal.getDependency(index);
|
|
558
|
+
if (dependency === undefined) {
|
|
559
|
+
this.process(form, true);
|
|
560
|
+
continue;
|
|
561
|
+
}
|
|
562
|
+
const clause = [form];
|
|
563
|
+
const deps = getDependencyValues(dependency);
|
|
564
|
+
for (let depIndex = 0; depIndex < deps.length; depIndex++) {
|
|
565
|
+
const dep = deps[depIndex];
|
|
566
|
+
this.insertDep(dep, dep2asm);
|
|
567
|
+
if (dep === form) continue forms;
|
|
568
|
+
clause.push(manager.isNot(dep) ? manager.getArg(dep, 0) : manager.mkNot(dep));
|
|
569
|
+
}
|
|
570
|
+
this.process(manager.mkOr(clause), true);
|
|
571
|
+
}
|
|
572
|
+
} finally {
|
|
573
|
+
this.reset();
|
|
524
574
|
}
|
|
525
575
|
}
|
|
576
|
+
|
|
577
|
+
private reset() {
|
|
578
|
+
this.frames = [];
|
|
579
|
+
this.results = [];
|
|
580
|
+
this.app2lit = new Map();
|
|
581
|
+
this.lit2app = new Map();
|
|
582
|
+
}
|
|
583
|
+
|
|
584
|
+
release() {
|
|
585
|
+
for (let index = 0; index < this.cacheTrail.length; index++)
|
|
586
|
+
this.manager.decRef(this.cacheTrail[index]);
|
|
587
|
+
this.cacheTrail = [];
|
|
588
|
+
}
|
|
526
589
|
}
|