tla-ts 0.0.10-dev.37a75eb5b → 0.0.10-dev.45c0eaef5
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 +33 -33
- package/dist/deciders.js +53 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +17 -3
- package/dist/index.d.ts +17 -3
- 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 +55 -55
- package/dist/prove.js +78 -78
- package/dist/run.cjs +40 -42
- package/dist/run.js +42 -44
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +96 -91
- package/dist/transfer.js +95 -90
- 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 +12 -10
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +13 -11
- package/src/check-trace.ts +146 -93
- package/src/check.ts +418 -246
- package/src/cli/tlc-output.ts +17 -2
- package/src/cli/tlc.ts +5 -4
- 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 +93 -35
- package/src/environment.ts +106 -39
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +415 -132
- package/src/exit-codes.ts +28 -15
- package/src/instances.ts +135 -11
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +674 -236
- package/src/lexer.ts +12 -2
- package/src/liveness-checker.ts +161 -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/parser.ts +110 -111
- 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 +164 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +65 -13
- package/src/prover/smt/solver/auf-solver.ts +23 -12
- package/src/prover/smt/solver/bit-blast-tactic.ts +27 -1
- 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 +35 -18
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
- package/src/prover/smt/solver/context.ts +65 -14
- 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 +28 -16
- package/src/prover/smt/solver/diff-neq.ts +1 -2
- package/src/prover/smt/solver/dt2bv-tactic.ts +57 -21
- 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 +3 -9
- 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/fd-solver.ts +608 -141
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
- package/src/prover/smt/solver/goal.ts +4 -3
- 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 +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-grobner.ts +2 -2
- 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/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 +14 -42
- 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 +1 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -1
- package/src/prover/smt/solver/nlqsat.ts +1 -1
- package/src/prover/smt/solver/nlsat/algebraic.ts +4 -5
- package/src/prover/smt/solver/nlsat/levelwise.ts +0 -4
- package/src/prover/smt/solver/nlsat/polynomial.ts +1 -36
- package/src/prover/smt/solver/nlsat/upolynomial.ts +1 -1
- 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 +16 -7
- 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 +4 -3
- 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/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 +23 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
- 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 +65 -12
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +129 -43
- 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 +15 -6
- package/src/prover/smt/solver/sat/sat2goal.ts +72 -48
- 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 +1 -1
- 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 +40 -6
- package/src/prover/smt/solver/smt-setup.ts +106 -13
- package/src/prover/smt/solver/smtlib-parser.ts +579 -214
- package/src/prover/smt/solver/smtlib-script.ts +600 -170
- 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 +342 -196
- 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-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 +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 +1226 -246
- package/src/runtime.ts +19 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +4 -2
- package/src/sany/generator-def-entries.ts +123 -36
- package/src/sany/generator-definitions.ts +4 -2
- package/src/sany/generator-expressions.ts +51 -20
- package/src/sany/generator-proofs.ts +17 -11
- package/src/sany/generator.ts +11 -5
- 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 +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +283 -126
- 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 +563 -139
- package/src/successors.ts +50 -20
- package/src/symmetry.ts +2 -1
- package/src/tlc/jar-data.ts +1 -3
- package/src/tlc/messages.ts +3 -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 +26 -10
- 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
|
@@ -27,7 +27,7 @@ export interface SeqLength {
|
|
|
27
27
|
value: Rational;
|
|
28
28
|
}
|
|
29
29
|
|
|
30
|
-
|
|
30
|
+
interface SeqEqSolverHost {
|
|
31
31
|
addConsequence(isUsingDeps: boolean, clause: number[]): void;
|
|
32
32
|
addSolution(variable: number, term: number): void;
|
|
33
33
|
expr2rep(expr: number): number;
|
|
@@ -41,7 +41,7 @@ export interface BinaryEq {
|
|
|
41
41
|
y: number;
|
|
42
42
|
}
|
|
43
43
|
|
|
44
|
-
|
|
44
|
+
interface TernaryEq {
|
|
45
45
|
x: number;
|
|
46
46
|
xs: number[];
|
|
47
47
|
y1: number;
|
|
@@ -35,15 +35,15 @@ import {
|
|
|
35
35
|
ViewWitness,
|
|
36
36
|
} from "./seq-view-witness";
|
|
37
37
|
|
|
38
|
-
|
|
39
|
-
|
|
38
|
+
const ORIENTATION_FORWARD = 0;
|
|
39
|
+
const ORIENTATION_REVERSED = 1;
|
|
40
40
|
export const ORIENTATION_RETRY = 2;
|
|
41
41
|
|
|
42
42
|
const LIVE_STATE_CAP = 1 << 12;
|
|
43
43
|
const COFACTOR_CACHE_CAP = 1 << 16;
|
|
44
44
|
const LENGTH_CONSTRAINING_KEY = 2 ** 40;
|
|
45
45
|
|
|
46
|
-
|
|
46
|
+
interface Memberships {
|
|
47
47
|
terms: number[];
|
|
48
48
|
regexes: number[];
|
|
49
49
|
deps: number[];
|
|
@@ -133,8 +133,10 @@ export class Monadic {
|
|
|
133
133
|
this.pins.push(regex);
|
|
134
134
|
this.pins.push(element);
|
|
135
135
|
this.pins.pushOwned(derivative);
|
|
136
|
-
|
|
137
|
-
|
|
136
|
+
const derivatives = this.derivativeCache.get(regex);
|
|
137
|
+
if (derivatives === undefined)
|
|
138
|
+
this.derivativeCache.set(regex, new Map([[element, derivative]]));
|
|
139
|
+
else derivatives.set(element, derivative);
|
|
138
140
|
return derivative;
|
|
139
141
|
}
|
|
140
142
|
|
|
@@ -484,7 +484,8 @@ export class ReRewriter {
|
|
|
484
484
|
left === right ? 0 : getId(left) < getId(right) ? -1 : 1;
|
|
485
485
|
const composeResult = (suffix: number) => {
|
|
486
486
|
let result = suffix;
|
|
487
|
-
|
|
487
|
+
for (let regex = prefix.pop(); regex !== undefined; regex = prefix.pop())
|
|
488
|
+
result = compose(regex, result);
|
|
488
489
|
return result;
|
|
489
490
|
};
|
|
490
491
|
let left = first;
|
|
@@ -117,7 +117,7 @@ export class RegexBisim {
|
|
|
117
117
|
this.worklist.pop();
|
|
118
118
|
const cofactors = new RefVector(manager);
|
|
119
119
|
derive.derivativeCofactors(regex, cofactors);
|
|
120
|
-
const leaves = cofactors.items.filter((
|
|
120
|
+
const leaves = cofactors.items.filter((_value, index) => index % 2 === 1);
|
|
121
121
|
const status = this.areLeavesEquivalent(leaves);
|
|
122
122
|
if (status === L_TRUE)
|
|
123
123
|
for (const leaf of leaves) {
|
|
@@ -5,8 +5,8 @@ import type { ReRewriter } from "./seq-re-rewriter";
|
|
|
5
5
|
import { isReEmpty } from "./seq-re-util";
|
|
6
6
|
|
|
7
7
|
export const LIVE_FAILURE_NONE = 0;
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
const LIVE_FAILURE_STATE_CAP = 1;
|
|
9
|
+
const LIVE_FAILURE_RESOURCE = 2;
|
|
10
10
|
|
|
11
11
|
const NULLABLE_UNKNOWN = 2;
|
|
12
12
|
const NULLABLE_UNDEF = 3;
|
|
@@ -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
|
}
|
|
@@ -239,7 +239,7 @@ class ConsequenceFinder {
|
|
|
239
239
|
const result = kernel.check(assumptions);
|
|
240
240
|
if (result !== L_TRUE) return result;
|
|
241
241
|
if (context.qmanager.hasQuantifiers()) return L_UNDEF;
|
|
242
|
-
const model = context.
|
|
242
|
+
const model = context.getSatModel();
|
|
243
243
|
for (const variable of vars) {
|
|
244
244
|
const value = model.eval(variable, false);
|
|
245
245
|
trail.pushOwned(value);
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { SmtDefaultError } from "../../../errors";
|
|
2
2
|
import { type AstManager } from "./ast";
|
|
3
3
|
import type { SmtSetup } from "./smt-setup";
|
|
4
4
|
import { AssertedFormulas } from "./asserted-formulas";
|
|
5
5
|
import { Context } from "./context";
|
|
6
|
+
import { L_TRUE } from "./lbool";
|
|
7
|
+
import { Mus } from "./mus";
|
|
8
|
+
import { RefVector } from "./ref-vector";
|
|
6
9
|
import type { KernelParams } from "./solver";
|
|
7
10
|
|
|
8
11
|
export class SmtKernel {
|
|
@@ -10,6 +13,8 @@ export class SmtKernel {
|
|
|
10
13
|
private asserted: AssertedFormulas;
|
|
11
14
|
isSetUp = false;
|
|
12
15
|
private setup: SmtSetup | undefined;
|
|
16
|
+
private isCoreMinimizing: boolean;
|
|
17
|
+
private scopeCount = 0;
|
|
13
18
|
|
|
14
19
|
constructor(manager: AstManager, params: KernelParams) {
|
|
15
20
|
this.asserted = new AssertedFormulas(manager, params.isFindingMacros);
|
|
@@ -17,21 +22,23 @@ export class SmtKernel {
|
|
|
17
22
|
isMbqi: params.isMbqi,
|
|
18
23
|
mbqiMaxIterations: params.mbqiMaxIterations,
|
|
19
24
|
relevancyLevel: params.relevancyLevel ?? 2,
|
|
25
|
+
randomSeed: params.randomSeed,
|
|
20
26
|
});
|
|
21
27
|
this.setup = params.setup;
|
|
28
|
+
this.isCoreMinimizing = params.isCoreMinimizing ?? false;
|
|
22
29
|
}
|
|
23
30
|
|
|
24
31
|
// As in Z3, a kernel not yet set up reads auto_config again.
|
|
25
32
|
updateParams(params: KernelParams) {
|
|
26
33
|
if (!this.isSetUp) this.setup = params.setup;
|
|
34
|
+
this.isCoreMinimizing = params.isCoreMinimizing ?? false;
|
|
27
35
|
this.context.updateParams(params);
|
|
28
36
|
this.asserted.updateParams(this.context.config);
|
|
29
37
|
}
|
|
30
38
|
|
|
31
39
|
private setupContext(isUsingStaticFeatures: boolean) {
|
|
32
40
|
if (this.isSetUp) return;
|
|
33
|
-
this.isSetUp =
|
|
34
|
-
this.context.setupContext(this.setup, isUsingStaticFeatures, this.asserted);
|
|
41
|
+
this.isSetUp = this.context.setupContext(this.setup, isUsingStaticFeatures, this.asserted);
|
|
35
42
|
}
|
|
36
43
|
|
|
37
44
|
// context::copy sets up and internalizes a copy as soon as it makes it.
|
|
@@ -44,7 +51,9 @@ export class SmtKernel {
|
|
|
44
51
|
this.asserted.isPreprocessing = isPreprocessing;
|
|
45
52
|
}
|
|
46
53
|
|
|
54
|
+
// context::assert_expr_core counts a step, and drops the formula once the limit is spent.
|
|
47
55
|
assertExpr(expr: number) {
|
|
56
|
+
if (this.context.checkCanceled()) return;
|
|
48
57
|
this.context.popToBaseLevel();
|
|
49
58
|
this.asserted.assertExpr(expr);
|
|
50
59
|
}
|
|
@@ -53,15 +62,19 @@ export class SmtKernel {
|
|
|
53
62
|
const context = this.context;
|
|
54
63
|
context.popToBaseLevel();
|
|
55
64
|
this.setupContext(false);
|
|
65
|
+
const wasConsistent = !context.isInconsistent();
|
|
56
66
|
context.internalizeAssertions(this.asserted);
|
|
57
67
|
const limit = context.manager.limit;
|
|
58
|
-
if (!limit.inc()) throw new
|
|
68
|
+
if (!limit.inc()) throw new SmtDefaultError("push canceled");
|
|
59
69
|
const wasSuspended = limit.isSuspended;
|
|
60
70
|
limit.isSuspended = true;
|
|
61
71
|
if (!context.isInconsistent()) context.propagate();
|
|
72
|
+
if (wasConsistent && context.isInconsistent() && !this.asserted.isInconsistent)
|
|
73
|
+
context.resolveConflict();
|
|
62
74
|
limit.isSuspended = wasSuspended;
|
|
63
75
|
context.push();
|
|
64
76
|
this.asserted.push();
|
|
77
|
+
this.scopeCount++;
|
|
65
78
|
}
|
|
66
79
|
|
|
67
80
|
getAssertions() {
|
|
@@ -69,8 +82,11 @@ export class SmtKernel {
|
|
|
69
82
|
}
|
|
70
83
|
|
|
71
84
|
pop(numScopes: number) {
|
|
72
|
-
|
|
73
|
-
|
|
85
|
+
const count = Math.min(numScopes, this.scopeCount);
|
|
86
|
+
if (count === 0) return;
|
|
87
|
+
this.context.pop(count);
|
|
88
|
+
for (let index = 0; index < count; index++) this.asserted.pop();
|
|
89
|
+
this.scopeCount -= count;
|
|
74
90
|
}
|
|
75
91
|
|
|
76
92
|
initAssumptions(assumptions: number[]) {
|
|
@@ -87,4 +103,22 @@ export class SmtKernel {
|
|
|
87
103
|
this.setupContext(true);
|
|
88
104
|
return this.check();
|
|
89
105
|
}
|
|
106
|
+
|
|
107
|
+
getUnsatCore(core: RefVector) {
|
|
108
|
+
for (const expr of this.context.unsatCore) core.push(expr);
|
|
109
|
+
if (!this.isCoreMinimizing) return;
|
|
110
|
+
const manager = this.context.manager;
|
|
111
|
+
const mus = new Mus(manager, {
|
|
112
|
+
checkSat: (assumptions) => this.check(assumptions),
|
|
113
|
+
getUnsatCore: () => this.context.unsatCore,
|
|
114
|
+
});
|
|
115
|
+
for (const literal of core.items) mus.addSoft(literal);
|
|
116
|
+
const minimized = new RefVector(manager);
|
|
117
|
+
if (mus.getMus(minimized) === L_TRUE) {
|
|
118
|
+
core.reset();
|
|
119
|
+
for (const literal of minimized.items) core.push(literal);
|
|
120
|
+
}
|
|
121
|
+
minimized.reset();
|
|
122
|
+
mus.reset();
|
|
123
|
+
}
|
|
90
124
|
}
|