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
|
@@ -182,7 +182,7 @@ const isDigit = (code: number) => code >= 48 && code <= 57;
|
|
|
182
182
|
const getCount = (bag: Map<number, number>, key: number) => bag.get(key) ?? 0;
|
|
183
183
|
|
|
184
184
|
const isSameBag = (first: Map<number, number>, second: Map<number, number>) =>
|
|
185
|
-
first.size === second.size && [...first].every((
|
|
185
|
+
first.size === second.size && [...first].every((entry) => second.get(entry[0]) === entry[1]);
|
|
186
186
|
|
|
187
187
|
export class SeqRewriter {
|
|
188
188
|
readonly re: ReRewriter;
|
|
@@ -499,8 +499,7 @@ export class SeqRewriter {
|
|
|
499
499
|
return manager.mkString([...firstChars, ...secondChars]);
|
|
500
500
|
const elements: number[] = [];
|
|
501
501
|
const todo = [second, first];
|
|
502
|
-
|
|
503
|
-
const expr = todo.pop()!;
|
|
502
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
504
503
|
if (this.isConcat2(expr)) {
|
|
505
504
|
todo.push(this.getArg(expr, 1), this.getArg(expr, 0));
|
|
506
505
|
continue;
|
|
@@ -510,7 +509,8 @@ export class SeqRewriter {
|
|
|
510
509
|
if (elements.length === 0) return this.mkEmpty(manager.sorts[first]);
|
|
511
510
|
const coalesced: number[] = [];
|
|
512
511
|
for (const element of elements) {
|
|
513
|
-
const previous =
|
|
512
|
+
const previous =
|
|
513
|
+
coalesced.length > 0 ? manager.getString(coalesced[coalesced.length - 1]) : undefined;
|
|
514
514
|
const chars = manager.getString(element);
|
|
515
515
|
if (this.isCoalescingChars && previous !== undefined && chars !== undefined)
|
|
516
516
|
coalesced[coalesced.length - 1] = manager.mkString([...previous, ...chars]);
|
|
@@ -518,7 +518,10 @@ export class SeqRewriter {
|
|
|
518
518
|
}
|
|
519
519
|
return coalesced
|
|
520
520
|
.slice(0, -1)
|
|
521
|
-
.reduceRight(
|
|
521
|
+
.reduceRight(
|
|
522
|
+
(tail, element) => this.mkConcat(element, tail),
|
|
523
|
+
coalesced[coalesced.length - 1],
|
|
524
|
+
);
|
|
522
525
|
}
|
|
523
526
|
|
|
524
527
|
private mkSeqLength(seq: number): Result {
|
|
@@ -765,8 +768,7 @@ export class SeqRewriter {
|
|
|
765
768
|
let isOtherFactorAtLeastOne = true;
|
|
766
769
|
const todo = [offset];
|
|
767
770
|
const visited = new Set<number>();
|
|
768
|
-
|
|
769
|
-
const arg = todo.pop()!;
|
|
771
|
+
for (let arg = todo.pop(); arg !== undefined; arg = todo.pop()) {
|
|
770
772
|
if (visited.has(arg)) continue;
|
|
771
773
|
visited.add(arg);
|
|
772
774
|
if (this.isOp(arg, OP_MUL)) todo.push(...manager.getArgs(arg));
|
|
@@ -956,7 +958,7 @@ export class SeqRewriter {
|
|
|
956
958
|
let start = 0;
|
|
957
959
|
let end = seqUnits.length;
|
|
958
960
|
const first = otherUnits[0];
|
|
959
|
-
const last = otherUnits.
|
|
961
|
+
const last = otherUnits[otherUnits.length - 1];
|
|
960
962
|
while (start < seqUnits.length && this.isNotContainingPrefix(seqUnits[start], first)) start++;
|
|
961
963
|
while (end > start && this.isNotContainingSuffix(seqUnits[end - 1], last)) end--;
|
|
962
964
|
if (start === end) return rewrite(this.mkIsEmpty(other), BR_REWRITE2);
|
|
@@ -1701,7 +1703,7 @@ export class SeqRewriter {
|
|
|
1701
1703
|
const seq = this.getArg(value, 0);
|
|
1702
1704
|
const maxLength = this.getMaxLength(seq);
|
|
1703
1705
|
if (!maxLength.isBounded || maxLength.length > 1n) return undefined;
|
|
1704
|
-
const eqs = Array.from({ length: 10 }, (
|
|
1706
|
+
const eqs = Array.from({ length: 10 }, (_value, digit) =>
|
|
1705
1707
|
this.mkEq(seq, manager.mkString([48 + digit])),
|
|
1706
1708
|
);
|
|
1707
1709
|
const isDigitString = manager.mkApp(OP_OR, eqs, SORT_BOOL);
|
|
@@ -1738,8 +1740,8 @@ export class SeqRewriter {
|
|
|
1738
1740
|
}
|
|
1739
1741
|
const units = getConcatUnits(manager, seq, []);
|
|
1740
1742
|
if (units.length === 0) return this.minusOne();
|
|
1741
|
-
if (this.isUnit(units.
|
|
1742
|
-
const tail = this.mkSeq(OP_STRING_STOI, [units.
|
|
1743
|
+
if (this.isUnit(units[units.length - 1])) {
|
|
1744
|
+
const tail = this.mkSeq(OP_STRING_STOI, [units[units.length - 1]]);
|
|
1743
1745
|
const head = this.mkConcatOf(units.slice(0, -1), manager.sorts[seq]);
|
|
1744
1746
|
const headValue = this.mkSeq(OP_STRING_STOI, [head]);
|
|
1745
1747
|
const isHeadValid = this.mkGe(headValue, this.zero());
|
|
@@ -1789,24 +1791,20 @@ export class SeqRewriter {
|
|
|
1789
1791
|
if (isVisited) cache.set(expr, { isBounded: isValid, length: count });
|
|
1790
1792
|
return isVisited;
|
|
1791
1793
|
} else if (this.isOp(expr, OP_ITE)) {
|
|
1792
|
-
const size = pending.length;
|
|
1793
1794
|
const thenLength = cache.get(this.getArg(expr, 1));
|
|
1794
1795
|
const elseLength = cache.get(this.getArg(expr, 2));
|
|
1795
1796
|
if (thenLength === undefined) pending.push(this.getArg(expr, 1));
|
|
1796
1797
|
if (elseLength === undefined) pending.push(this.getArg(expr, 2));
|
|
1797
|
-
if (
|
|
1798
|
+
if (thenLength === undefined || elseLength === undefined) return false;
|
|
1798
1799
|
cache.set(expr, {
|
|
1799
1800
|
isBounded:
|
|
1800
|
-
thenLength
|
|
1801
|
-
|
|
1802
|
-
thenLength!.length === elseLength!.length,
|
|
1803
|
-
length: Math.min(thenLength!.length, elseLength!.length),
|
|
1801
|
+
thenLength.isBounded && elseLength.isBounded && thenLength.length === elseLength.length,
|
|
1802
|
+
length: Math.min(thenLength.length, elseLength.length),
|
|
1804
1803
|
});
|
|
1805
1804
|
} else cache.set(expr, { isBounded: false, length: 0 });
|
|
1806
1805
|
return true;
|
|
1807
1806
|
};
|
|
1808
|
-
|
|
1809
|
-
const expr = todo.pop()!;
|
|
1807
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
1810
1808
|
const chars = manager.getString(expr);
|
|
1811
1809
|
if (this.isUnit(expr)) length++;
|
|
1812
1810
|
else if (this.isEmpty(expr)) continue;
|
|
@@ -1816,7 +1814,7 @@ export class SeqRewriter {
|
|
|
1816
1814
|
const thenExpr = this.getArg(expr, 1);
|
|
1817
1815
|
const elseExpr = this.getArg(expr, 2);
|
|
1818
1816
|
pending.push(thenExpr, elseExpr);
|
|
1819
|
-
while (pending.length > 0) if (visit(pending.
|
|
1817
|
+
while (pending.length > 0) if (visit(pending[pending.length - 1])) pending.pop();
|
|
1820
1818
|
const thenLength = cache.get(thenExpr) ?? { isBounded: false, length: 0 };
|
|
1821
1819
|
const elseLength = cache.get(elseExpr) ?? { isBounded: false, length: 0 };
|
|
1822
1820
|
if (
|
|
@@ -1835,8 +1833,7 @@ export class SeqRewriter {
|
|
|
1835
1833
|
const manager = this.manager;
|
|
1836
1834
|
const todo = [seq];
|
|
1837
1835
|
let length = 0n;
|
|
1838
|
-
|
|
1839
|
-
const expr = todo.pop()!;
|
|
1836
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
1840
1837
|
const chars = manager.getString(expr);
|
|
1841
1838
|
if (this.isUnit(expr) || this.isApp(expr, OP_SEQ_AT, 2)) length += 1n;
|
|
1842
1839
|
else if (chars !== undefined) length += BigInt(chars.length);
|
|
@@ -2036,8 +2033,7 @@ export class SeqRewriter {
|
|
|
2036
2033
|
const manager = this.manager;
|
|
2037
2034
|
const elements: number[] = [];
|
|
2038
2035
|
const todo = [seq];
|
|
2039
|
-
|
|
2040
|
-
const expr = todo.pop()!;
|
|
2036
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
2041
2037
|
if (this.isOp(expr, OP_SEQ_CONCAT)) {
|
|
2042
2038
|
todo.push(...manager.getArgs(expr));
|
|
2043
2039
|
continue;
|
|
@@ -2113,10 +2109,13 @@ export class SeqRewriter {
|
|
|
2113
2109
|
private reduceBack(pair: SeqPair, eqs: EqPair[]) {
|
|
2114
2110
|
const manager = this.manager;
|
|
2115
2111
|
while (pair.left.length > 0 && pair.right.length > 0) {
|
|
2116
|
-
if (
|
|
2112
|
+
if (
|
|
2113
|
+
this.isUnit(pair.right[pair.right.length - 1]) &&
|
|
2114
|
+
manager.getString(pair.left[pair.left.length - 1]) !== undefined
|
|
2115
|
+
)
|
|
2117
2116
|
this.swap(pair);
|
|
2118
|
-
const left = pair.left.
|
|
2119
|
-
const right = pair.right.
|
|
2117
|
+
const left = pair.left[pair.left.length - 1];
|
|
2118
|
+
const right = pair.right[pair.right.length - 1];
|
|
2120
2119
|
const rightChars = manager.getString(right);
|
|
2121
2120
|
const leftChars = manager.getString(left);
|
|
2122
2121
|
if (left === right) {
|
|
@@ -2128,7 +2127,10 @@ export class SeqRewriter {
|
|
|
2128
2127
|
pair.left.pop();
|
|
2129
2128
|
pair.right.pop();
|
|
2130
2129
|
} else if (this.isUnit(left) && rightChars !== undefined) {
|
|
2131
|
-
eqs.push({
|
|
2130
|
+
eqs.push({
|
|
2131
|
+
left: manager.mkChar(rightChars[rightChars.length - 1]),
|
|
2132
|
+
right: this.getArg(left, 0),
|
|
2133
|
+
});
|
|
2132
2134
|
pair.left.pop();
|
|
2133
2135
|
if (rightChars.length === 1) pair.right.pop();
|
|
2134
2136
|
else pair.right[pair.right.length - 1] = manager.mkString(rightChars.slice(0, -1));
|
|
@@ -2229,7 +2231,7 @@ export class SeqRewriter {
|
|
|
2229
2231
|
for (const expr of right) {
|
|
2230
2232
|
const index = remaining.indexOf(expr);
|
|
2231
2233
|
if (index !== -1) {
|
|
2232
|
-
remaining[index] = remaining.
|
|
2234
|
+
remaining[index] = remaining[remaining.length - 1];
|
|
2233
2235
|
remaining.pop();
|
|
2234
2236
|
continue;
|
|
2235
2237
|
}
|
|
@@ -48,10 +48,6 @@ export class SeqSkolem {
|
|
|
48
48
|
return this.manager.mkNumeral(BigInt(value));
|
|
49
49
|
}
|
|
50
50
|
|
|
51
|
-
mkAlign(args: number[]) {
|
|
52
|
-
return this.mk("seq.align", args);
|
|
53
|
-
}
|
|
54
|
-
|
|
55
51
|
mkAlignL(args: number[]) {
|
|
56
52
|
return this.mk("seq.align.l", args);
|
|
57
53
|
}
|
|
@@ -201,12 +197,6 @@ export class SeqSkolem {
|
|
|
201
197
|
return this.isNamed(expr, TAIL);
|
|
202
198
|
}
|
|
203
199
|
|
|
204
|
-
getTailIndex(expr: number) {
|
|
205
|
-
if (!this.isTail(expr)) return undefined;
|
|
206
|
-
const index = this.manager.getNumeral(this.manager.getArg(expr, 1));
|
|
207
|
-
return index !== undefined && index >= 0n && index <= 0xffffffffn ? Number(index) : undefined;
|
|
208
|
-
}
|
|
209
|
-
|
|
210
200
|
isSeqFirst(expr: number) {
|
|
211
201
|
return this.isNamed(expr, SEQ_FIRST);
|
|
212
202
|
}
|
|
@@ -231,10 +221,6 @@ export class SeqSkolem {
|
|
|
231
221
|
return this.isNamed(expr, EQ) && this.manager.getNumArgs(expr) === 2;
|
|
232
222
|
}
|
|
233
223
|
|
|
234
|
-
isDigit(expr: number) {
|
|
235
|
-
return this.isNamed(expr, "seq.is_digit");
|
|
236
|
-
}
|
|
237
|
-
|
|
238
224
|
isMaxUnfolding(expr: number) {
|
|
239
225
|
return this.isNamed(expr, MAX_UNFOLDING);
|
|
240
226
|
}
|
|
@@ -257,15 +243,6 @@ export class SeqSkolem {
|
|
|
257
243
|
return this.isNamed(expr, "seq.align.r");
|
|
258
244
|
}
|
|
259
245
|
|
|
260
|
-
isRegexSkolem(expr: number) {
|
|
261
|
-
return (
|
|
262
|
-
this.isNamed(expr, ACCEPT) ||
|
|
263
|
-
this.isNamed(expr, "re.is_empty") ||
|
|
264
|
-
this.isNamed(expr, "re.is_non_empty") ||
|
|
265
|
-
this.isNamed(expr, "aut.step")
|
|
266
|
-
);
|
|
267
|
-
}
|
|
268
|
-
|
|
269
246
|
decompose(input: number): Decomposition {
|
|
270
247
|
const manager = this.manager;
|
|
271
248
|
const mkNthUnit = (seq: number, index: number | bigint) =>
|
|
@@ -8,12 +8,12 @@ import type { ReRewriter } from "./seq-re-rewriter";
|
|
|
8
8
|
import { isReEmpty } from "./seq-re-util";
|
|
9
9
|
|
|
10
10
|
export const VIEW_FAILURE_NONE = 0;
|
|
11
|
-
|
|
11
|
+
const VIEW_FAILURE_UNSUPPORTED = 1;
|
|
12
12
|
export const VIEW_FAILURE_BUDGET = 2;
|
|
13
13
|
export const VIEW_FAILURE_RESOURCE = 3;
|
|
14
14
|
export const VIEW_FAILURE_STATE_EXPANSION = 4;
|
|
15
|
-
|
|
16
|
-
|
|
15
|
+
const VIEW_FAILURE_NULLABILITY = 5;
|
|
16
|
+
const VIEW_FAILURE_GUARD = 6;
|
|
17
17
|
|
|
18
18
|
const INNER_LIMIT = 1 << 16;
|
|
19
19
|
const RANGE_CACHE_CAP = 1 << 16;
|
|
@@ -24,7 +24,7 @@ interface IntervalList {
|
|
|
24
24
|
isOk: boolean;
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
-
|
|
27
|
+
interface ProductResult {
|
|
28
28
|
status: number;
|
|
29
29
|
word: number;
|
|
30
30
|
}
|
|
@@ -8,7 +8,7 @@ import type { KernelParams } from "./solver";
|
|
|
8
8
|
export class SmtKernel {
|
|
9
9
|
readonly context: Context;
|
|
10
10
|
private asserted: AssertedFormulas;
|
|
11
|
-
|
|
11
|
+
isSetUp = false;
|
|
12
12
|
private setup: SmtSetup | undefined;
|
|
13
13
|
|
|
14
14
|
constructor(manager: AstManager, params: KernelParams) {
|
|
@@ -21,10 +21,16 @@ export class SmtKernel {
|
|
|
21
21
|
this.setup = params.setup;
|
|
22
22
|
}
|
|
23
23
|
|
|
24
|
+
// As in Z3, a kernel not yet set up reads auto_config again.
|
|
25
|
+
updateParams(params: KernelParams) {
|
|
26
|
+
if (!this.isSetUp) this.setup = params.setup;
|
|
27
|
+
this.context.updateParams(params);
|
|
28
|
+
this.asserted.updateParams(this.context.config);
|
|
29
|
+
}
|
|
30
|
+
|
|
24
31
|
private setupContext(isUsingStaticFeatures: boolean) {
|
|
25
32
|
if (this.isSetUp) return;
|
|
26
|
-
this.isSetUp =
|
|
27
|
-
this.context.setupContext(this.setup, isUsingStaticFeatures, this.asserted);
|
|
33
|
+
this.isSetUp = this.context.setupContext(this.setup, isUsingStaticFeatures, this.asserted);
|
|
28
34
|
}
|
|
29
35
|
|
|
30
36
|
// context::copy sets up and internalizes a copy as soon as it makes it.
|
|
@@ -14,6 +14,7 @@ import {
|
|
|
14
14
|
FAMILY_RECFUN,
|
|
15
15
|
FAMILY_SEQ,
|
|
16
16
|
} from "./ast";
|
|
17
|
+
import { SmtDefaultError } from "../../../errors";
|
|
17
18
|
import { collectStaticFeatures, isDense, type StaticFeatures } from "./static-features";
|
|
18
19
|
|
|
19
20
|
const AUFLIA_LOGICS = new Set([
|
|
@@ -101,6 +102,8 @@ export interface SmtConfig {
|
|
|
101
102
|
isNnfCnf: boolean;
|
|
102
103
|
isEq2Ineq: boolean;
|
|
103
104
|
isFindingMacros: boolean;
|
|
105
|
+
isEliminatingTermIte: boolean;
|
|
106
|
+
isArithPropagatingEqs: boolean;
|
|
104
107
|
}
|
|
105
108
|
|
|
106
109
|
const UNKNOWN_THEORIES = [
|
|
@@ -128,6 +131,8 @@ export const DEFAULT_CONFIG: SmtConfig = {
|
|
|
128
131
|
isNnfCnf: true,
|
|
129
132
|
isEq2Ineq: false,
|
|
130
133
|
isFindingMacros: false,
|
|
134
|
+
isEliminatingTermIte: false,
|
|
135
|
+
isArithPropagatingEqs: true,
|
|
131
136
|
};
|
|
132
137
|
|
|
133
138
|
// setup_unknown(), which closes with setup_relevancy.
|
|
@@ -144,15 +149,23 @@ const setupQfUf = (config: SmtConfig) => {
|
|
|
144
149
|
config.randomInitialActivity = IA_RANDOM;
|
|
145
150
|
};
|
|
146
151
|
|
|
152
|
+
const setupQfUfByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
153
|
+
if (isArith(features))
|
|
154
|
+
throw new SmtDefaultError(
|
|
155
|
+
"Benchmark constrains arithmetic, but specified logic does not support it.",
|
|
156
|
+
);
|
|
157
|
+
setupQfUf(config);
|
|
158
|
+
};
|
|
159
|
+
|
|
147
160
|
const setupQfDt = (config: SmtConfig) => {
|
|
148
161
|
setupQfUf(config);
|
|
149
162
|
config.theories.push(FAMILY_DATATYPE, FAMILY_RECFUN);
|
|
150
163
|
};
|
|
151
164
|
|
|
152
|
-
// The parameters smt_params::setup_QF_IDL, setup_QF_RDL and setup_QF_LIA share.
|
|
153
165
|
const setupDiffLogicParams = (config: SmtConfig) => {
|
|
154
166
|
config.relevancyLevel = 0;
|
|
155
167
|
config.isEq2Ineq = true;
|
|
168
|
+
config.isArithPropagatingEqs = false;
|
|
156
169
|
config.isNnfCnf = false;
|
|
157
170
|
};
|
|
158
171
|
|
|
@@ -161,13 +174,25 @@ const setupQfLia = (config: SmtConfig) => {
|
|
|
161
174
|
config.theories.push(FAMILY_ARITH);
|
|
162
175
|
};
|
|
163
176
|
|
|
177
|
+
const checkNoUninterpretedFunctions = (features: StaticFeatures) => {
|
|
178
|
+
if (features.numUninterpretedFunctions !== 0)
|
|
179
|
+
throw new SmtDefaultError(
|
|
180
|
+
"Benchmark contains uninterpreted function symbols, but specified logic does not support them.",
|
|
181
|
+
);
|
|
182
|
+
};
|
|
183
|
+
|
|
164
184
|
const setupQfLiaByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
185
|
+
checkNoUninterpretedFunctions(features);
|
|
165
186
|
setupDiffLogicParams(config);
|
|
166
187
|
if (features.maxIteTreeDepth > 50) {
|
|
167
188
|
config.isEq2Ineq = false;
|
|
189
|
+
config.isArithPropagatingEqs = true;
|
|
168
190
|
config.relevancyLevel = 2;
|
|
169
|
-
} else if (features.numClauses === features.numUnits)
|
|
170
|
-
|
|
191
|
+
} else if (features.numClauses === features.numUnits) {
|
|
192
|
+
config.relevancyLevel = 2;
|
|
193
|
+
config.isEliminatingTermIte = true;
|
|
194
|
+
} else {
|
|
195
|
+
config.isEliminatingTermIte = true;
|
|
171
196
|
config.isRestartAdaptive = false;
|
|
172
197
|
config.restartStrategy = RS_GEOMETRIC;
|
|
173
198
|
config.restartFactor = 1.5;
|
|
@@ -177,11 +202,13 @@ const setupQfLiaByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
|
177
202
|
|
|
178
203
|
const setupQfLra = (config: SmtConfig) => {
|
|
179
204
|
setupDiffLogicParams(config);
|
|
205
|
+
config.isEliminatingTermIte = true;
|
|
180
206
|
config.phaseSelection = PS_THEORY;
|
|
181
207
|
config.theories.push(FAMILY_ARITH);
|
|
182
208
|
};
|
|
183
209
|
|
|
184
210
|
const setupQfLraByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
211
|
+
checkNoUninterpretedFunctions(features);
|
|
185
212
|
setupQfLra(config);
|
|
186
213
|
if (features.arithKSum.num > 2000000n && features.arithKSum.den > 500n) config.relevancyLevel = 2;
|
|
187
214
|
if (features.isCnf) return;
|
|
@@ -190,6 +217,13 @@ const setupQfLraByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
|
190
217
|
};
|
|
191
218
|
|
|
192
219
|
const setupQfRdlByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
220
|
+
if (!isInDiffLogic(features))
|
|
221
|
+
throw new SmtDefaultError("Benchmark is not in QF_RDL (real difference logic).");
|
|
222
|
+
if (features.hasInt)
|
|
223
|
+
throw new SmtDefaultError(
|
|
224
|
+
"Benchmark has integer variables but it is marked as QF_RDL (real difference logic).",
|
|
225
|
+
);
|
|
226
|
+
checkNoUninterpretedFunctions(features);
|
|
193
227
|
setupDiffLogicParams(config);
|
|
194
228
|
if (isDense(features)) {
|
|
195
229
|
config.restartStrategy = RS_GEOMETRIC;
|
|
@@ -200,6 +234,13 @@ const setupQfRdlByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
|
200
234
|
};
|
|
201
235
|
|
|
202
236
|
const setupQfIdlByFeatures = (config: SmtConfig, features: StaticFeatures, setup: SmtSetup) => {
|
|
237
|
+
if (!isInDiffLogic(features))
|
|
238
|
+
throw new SmtDefaultError("Benchmark is not in QF_IDL (integer difference logic).");
|
|
239
|
+
if (features.hasReal)
|
|
240
|
+
throw new SmtDefaultError(
|
|
241
|
+
"Benchmark has real variables but it is marked as QF_IDL (integer difference logic).",
|
|
242
|
+
);
|
|
243
|
+
checkNoUninterpretedFunctions(features);
|
|
203
244
|
setupDiffLogicParams(config);
|
|
204
245
|
if (features.numUninterpretedConstants > 5000) config.relevancyLevel = 2;
|
|
205
246
|
else if (features.isCnf && !isDense(features)) config.phaseSelection = PS_CACHING_CONSERVATIVE2;
|
|
@@ -216,7 +257,9 @@ const setupQfIdlByFeatures = (config: SmtConfig, features: StaticFeatures, setup
|
|
|
216
257
|
};
|
|
217
258
|
|
|
218
259
|
const setupQfUfIdl = (config: SmtConfig) => {
|
|
219
|
-
|
|
260
|
+
config.relevancyLevel = 0;
|
|
261
|
+
config.isNnfCnf = false;
|
|
262
|
+
config.isEq2Ineq = true;
|
|
220
263
|
config.restartStrategy = RS_GEOMETRIC;
|
|
221
264
|
config.restartFactor = 1.5;
|
|
222
265
|
config.isRestartAdaptive = false;
|
|
@@ -224,10 +267,15 @@ const setupQfUfIdl = (config: SmtConfig) => {
|
|
|
224
267
|
};
|
|
225
268
|
|
|
226
269
|
const setupQfUfIdlByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
270
|
+
if (features.hasReal)
|
|
271
|
+
throw new SmtDefaultError(
|
|
272
|
+
"Benchmark has real variables but it is marked as QF_UFIDL (uninterpreted functions and difference logic).",
|
|
273
|
+
);
|
|
227
274
|
config.relevancyLevel = 0;
|
|
228
275
|
config.isNnfCnf = false;
|
|
229
276
|
if (features.numUninterpretedFunctions === 0) {
|
|
230
277
|
config.isEq2Ineq = true;
|
|
278
|
+
config.isArithPropagatingEqs = false;
|
|
231
279
|
if (isDense(features)) {
|
|
232
280
|
config.restartStrategy = RS_GEOMETRIC;
|
|
233
281
|
config.theories.push(FAMILY_ARITH);
|
|
@@ -253,6 +301,10 @@ const setupQfBv = (config: SmtConfig) => {
|
|
|
253
301
|
};
|
|
254
302
|
|
|
255
303
|
const setupQfUfLiaByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
304
|
+
if (features.hasReal)
|
|
305
|
+
throw new SmtDefaultError(
|
|
306
|
+
"Benchmark has real variables but it is marked as QF_UFLIA (uninterpreted functions and linear integer arithmetic).",
|
|
307
|
+
);
|
|
256
308
|
setupQfUfLia(config);
|
|
257
309
|
if (features.hasBv) setupQfBv(config);
|
|
258
310
|
};
|
|
@@ -311,6 +363,14 @@ const setupAufLia = (config: SmtConfig) => {
|
|
|
311
363
|
config.theories.push(FAMILY_ARITH, FAMILY_ARRAY);
|
|
312
364
|
};
|
|
313
365
|
|
|
366
|
+
const setupAufLiaByFeatures = (config: SmtConfig, features: StaticFeatures) => {
|
|
367
|
+
if (features.hasReal)
|
|
368
|
+
throw new SmtDefaultError(
|
|
369
|
+
"Benchmark has real variables but it is marked as AUFLIA (arrays, uninterpreted functions and linear integer arithmetic).",
|
|
370
|
+
);
|
|
371
|
+
setupAufLia(config);
|
|
372
|
+
};
|
|
373
|
+
|
|
314
374
|
const setupAufLira = (config: SmtConfig) => {
|
|
315
375
|
config.phaseSelection = PS_ALWAYS_FALSE;
|
|
316
376
|
config.isFindingMacros = true;
|
|
@@ -319,6 +379,8 @@ const setupAufLira = (config: SmtConfig) => {
|
|
|
319
379
|
|
|
320
380
|
const setupLra = (config: SmtConfig) => {
|
|
321
381
|
config.relevancyLevel = 0;
|
|
382
|
+
config.isArithPropagatingEqs = false;
|
|
383
|
+
config.isEliminatingTermIte = true;
|
|
322
384
|
config.theories.push(FAMILY_ARITH);
|
|
323
385
|
};
|
|
324
386
|
|
|
@@ -434,7 +496,7 @@ const AUTO_SETUPS = new Map<
|
|
|
434
496
|
string,
|
|
435
497
|
(config: SmtConfig, features: StaticFeatures, setup: SmtSetup) => void
|
|
436
498
|
>([
|
|
437
|
-
["QF_UF",
|
|
499
|
+
["QF_UF", setupQfUfByFeatures],
|
|
438
500
|
["QF_RDL", setupQfRdlByFeatures],
|
|
439
501
|
["QF_IDL", setupQfIdlByFeatures],
|
|
440
502
|
["QF_UFIDL", setupQfUfIdlByFeatures],
|
|
@@ -447,7 +509,7 @@ const AUTO_SETUPS = new Map<
|
|
|
447
509
|
["QF_AUFLIA", setupQfAufLiaByFeatures],
|
|
448
510
|
["QF_S", setupUnknown],
|
|
449
511
|
["QF_SLIA", setupUnknown],
|
|
450
|
-
["AUFLIA",
|
|
512
|
+
["AUFLIA", setupAufLiaByFeatures],
|
|
451
513
|
["AUFLIRA", setupAufLira],
|
|
452
514
|
["AUFNIRA", setupAufLira],
|
|
453
515
|
["AUFLIA+", setupAufLia],
|