tla-ts 0.0.10-dev.c92e6a4ea → 0.0.10-dev.d166e0ae9
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 +13 -3
- package/dist/index.d.ts +13 -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 +68 -68
- package/dist/prove.js +78 -78
- package/dist/run.cjs +42 -42
- package/dist/run.js +44 -44
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +45 -43
- package/dist/transfer.js +45 -43
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +11 -1
- package/src/bags.ts +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +9 -6
- package/src/check-trace.ts +116 -64
- package/src/check.ts +356 -173
- package/src/cli/tlc-output.ts +1 -0
- package/src/cli/tlc.ts +4 -3
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +34 -13
- package/src/coverage.ts +3 -0
- package/src/dependencies.ts +61 -13
- package/src/dfid.ts +22 -10
- package/src/environment.ts +71 -35
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +149 -54
- package/src/exit-codes.ts +29 -15
- package/src/instances.ts +16 -6
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +186 -97
- package/src/liveness-checker.ts +131 -83
- package/src/liveness.ts +52 -11
- 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 +115 -145
- package/src/prover/isabelle/isar/attrib.ts +4 -4
- package/src/prover/isabelle/isar/rule-cases.ts +8 -6
- package/src/prover/isabelle/provers/clasimp.ts +1 -1
- package/src/prover/isabelle/provers/hypsubst.ts +2 -2
- package/src/prover/isabelle/pure/rewriter.ts +3 -3
- package/src/prover/isabelle/pure/term.ts +3 -3
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/smt/rewrite.ts +2 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/arith-rewriter.ts +11 -3
- package/src/prover/smt/solver/array-rewriter.ts +12 -2
- package/src/prover/smt/solver/asserted-formulas.ts +169 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +63 -14
- package/src/prover/smt/solver/auf-solver.ts +23 -12
- package/src/prover/smt/solver/bit-blast-tactic.ts +26 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-simplifier.ts +11 -13
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
- package/src/prover/smt/solver/bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/card2bv.ts +35 -18
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
- package/src/prover/smt/solver/context.ts +67 -13
- 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 +26 -15
- package/src/prover/smt/solver/diff-neq.ts +1 -2
- package/src/prover/smt/solver/dt2bv-tactic.ts +36 -20
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +5 -8
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/egraph.ts +4 -11
- package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
- package/src/prover/smt/solver/euf/mam.ts +1 -5
- package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
- package/src/prover/smt/solver/euf/th-solver.ts +0 -7
- package/src/prover/smt/solver/expr2polynomial.ts +204 -79
- package/src/prover/smt/solver/factor.ts +36 -14
- package/src/prover/smt/solver/fd-solver.ts +148 -39
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
- package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
- package/src/prover/smt/solver/goal.ts +6 -3
- package/src/prover/smt/solver/goal2nlsat.ts +57 -30
- package/src/prover/smt/solver/hashtable.ts +4 -0
- package/src/prover/smt/solver/internalizer.ts +1 -1
- package/src/prover/smt/solver/logic-tactics.ts +9 -2
- package/src/prover/smt/solver/lp/lp-settings.ts +5 -1
- package/src/prover/smt/solver/lp/nla-core.ts +1 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +2 -2
- package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
- package/src/prover/smt/solver/lp/pdd.ts +2 -3
- package/src/prover/smt/solver/lp/union-find.ts +1 -1
- package/src/prover/smt/solver/mam-compiler.ts +1 -1
- package/src/prover/smt/solver/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 +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 +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/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/quantifier-manager.ts +14 -9
- 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 +4 -0
- package/src/prover/smt/solver/sat/config.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +0 -1
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +81 -28
- 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 +17 -7
- package/src/prover/smt/solver/sat/sat2goal.ts +10 -7
- package/src/prover/smt/solver/sat/simplifier.ts +1 -1
- package/src/prover/smt/solver/sat/solver.ts +25 -47
- package/src/prover/smt/solver/seq-axioms.ts +20 -35
- package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
- package/src/prover/smt/solver/seq-derive.ts +2 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
- package/src/prover/smt/solver/seq-monadic.ts +7 -5
- package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
- package/src/prover/smt/solver/seq-re-util.ts +1 -1
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
- package/src/prover/smt/solver/seq-regex-live.ts +2 -2
- package/src/prover/smt/solver/seq-rewriter.ts +31 -29
- package/src/prover/smt/solver/seq-skolem.ts +0 -23
- package/src/prover/smt/solver/seq-view-witness.ts +4 -4
- package/src/prover/smt/solver/smt-consequences.ts +1 -1
- package/src/prover/smt/solver/smt-kernel.ts +48 -7
- package/src/prover/smt/solver/smt-setup.ts +96 -10
- package/src/prover/smt/solver/smtlib-parser.ts +589 -224
- package/src/prover/smt/solver/smtlib-script.ts +674 -195
- 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 +332 -189
- package/src/prover/smt/solver/theory-bv.ts +13 -3
- package/src/prover/smt/solver/theory-fpa.ts +1 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
- package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
- package/src/prover/smt/solver/theory-lra.ts +1 -1
- package/src/prover/smt/solver/theory-pb.ts +24 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
- package/src/prover/smt/solver/theory-seq-state.ts +2 -21
- package/src/prover/smt/solver/tseitin-cnf.ts +1 -0
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/index-table.ts +5 -2
- package/src/prover/zenon/isar-case.ts +1 -1
- package/src/prover/zenon/isar.ts +2 -2
- package/src/prover/zenon/phrase.ts +1 -1
- package/src/resolve.ts +1071 -251
- package/src/runtime.ts +5 -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 +38 -30
- package/src/sany/generator-proofs.ts +6 -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 +197 -117
- package/src/simulate.ts +165 -102
- package/src/spec-description.ts +8 -6
- package/src/standard-modules.ts +56 -22
- package/src/subexpressions.ts +518 -123
- package/src/successors.ts +10 -3
- package/src/symmetry.ts +2 -1
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/random.ts +2 -1
- package/src/tlc/replay.ts +27 -14
- 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/typed-tier.ts +44 -27
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +135 -78
|
@@ -88,6 +88,8 @@ export class BitBlasterRewriter extends RewriterTpl {
|
|
|
88
88
|
readonly keys: number[] = [];
|
|
89
89
|
readonly values: RefVector;
|
|
90
90
|
readonly newbits: number[] = [];
|
|
91
|
+
private keyLimits: number[] = [];
|
|
92
|
+
private newbitLimits: number[] = [];
|
|
91
93
|
|
|
92
94
|
constructor(
|
|
93
95
|
manager: AstManager,
|
|
@@ -123,6 +125,30 @@ export class BitBlasterRewriter extends RewriterTpl {
|
|
|
123
125
|
return this.const2bits.get(decl);
|
|
124
126
|
}
|
|
125
127
|
|
|
128
|
+
getNumScopes() {
|
|
129
|
+
return this.keyLimits.length;
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
push() {
|
|
133
|
+
this.keyLimits.push(this.keys.length);
|
|
134
|
+
this.newbitLimits.push(this.newbits.length);
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
pop(numScopes: number) {
|
|
138
|
+
if (numScopes === 0) return;
|
|
139
|
+
const manager = this.manager;
|
|
140
|
+
const size = this.keyLimits.length - numScopes;
|
|
141
|
+
const keyLimit = this.keyLimits[size];
|
|
142
|
+
for (const decl of this.keys.splice(keyLimit)) {
|
|
143
|
+
this.const2bits.delete(decl);
|
|
144
|
+
manager.decDeclRef(decl);
|
|
145
|
+
}
|
|
146
|
+
this.values.shrink(keyLimit);
|
|
147
|
+
this.keyLimits.length = size;
|
|
148
|
+
for (const decl of this.newbits.splice(this.newbitLimits[size])) manager.decDeclRef(decl);
|
|
149
|
+
this.newbitLimits.length = size;
|
|
150
|
+
}
|
|
151
|
+
|
|
126
152
|
private mkConst(decl: number) {
|
|
127
153
|
const manager = this.manager;
|
|
128
154
|
const existing = this.const2bits.get(decl);
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import { type AstManager, OP_ITE, SORT_BOOL } from "./ast";
|
|
2
|
+
import { runSimplifier } from "./dependent-expr-state";
|
|
3
|
+
import type { Goal } from "./goal";
|
|
4
|
+
import { RewriterTpl } from "./rewriter-tpl";
|
|
5
|
+
|
|
6
|
+
class BlastTermIteRewriter extends RewriterTpl {
|
|
7
|
+
isRewritingPatterns() {
|
|
8
|
+
return false;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
reduceApp(decl: number, args: number[], sort: number) {
|
|
12
|
+
const manager = this.manager;
|
|
13
|
+
if (decl === OP_ITE) return -1;
|
|
14
|
+
for (let index = 0; index < args.length; index++) {
|
|
15
|
+
const arg = args[index];
|
|
16
|
+
if (manager.sorts[arg] === SORT_BOOL || manager.getOp(arg) !== OP_ITE) continue;
|
|
17
|
+
const thenBranch = manager.getArg(arg, 1);
|
|
18
|
+
const elseBranch = manager.getArg(arg, 2);
|
|
19
|
+
const newArgs = [...args];
|
|
20
|
+
newArgs[index] = thenBranch;
|
|
21
|
+
const thenApp = manager.mkApp(decl, newArgs, sort);
|
|
22
|
+
if (thenBranch === elseBranch) {
|
|
23
|
+
manager.incRef(thenApp);
|
|
24
|
+
return { expr: thenApp, depth: 1 };
|
|
25
|
+
}
|
|
26
|
+
newArgs[index] = elseBranch;
|
|
27
|
+
const elseApp = manager.mkApp(decl, newArgs, sort);
|
|
28
|
+
const result = manager.mkApp(
|
|
29
|
+
OP_ITE,
|
|
30
|
+
[manager.getArg(arg, 0), thenApp, elseApp],
|
|
31
|
+
manager.sorts[thenApp],
|
|
32
|
+
);
|
|
33
|
+
manager.incRef(result);
|
|
34
|
+
return { expr: result, depth: 3 };
|
|
35
|
+
}
|
|
36
|
+
return -1;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
export const blastTermIte = (manager: AstManager, goal: Goal) =>
|
|
41
|
+
runSimplifier(goal, false, (state) => {
|
|
42
|
+
const rewriter = new BlastTermIteRewriter(manager);
|
|
43
|
+
return {
|
|
44
|
+
reduce: () => state.rewriteEach((form) => rewriter.rewrite(form)),
|
|
45
|
+
release: () => rewriter.release(),
|
|
46
|
+
};
|
|
47
|
+
});
|
|
@@ -29,6 +29,7 @@ import { Rational } from "./rational";
|
|
|
29
29
|
import { RefVector } from "./ref-vector";
|
|
30
30
|
import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
31
31
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
32
|
+
import { DependentExprState, finishSimplifier } from "./dependent-expr-state";
|
|
32
33
|
|
|
33
34
|
interface Bound {
|
|
34
35
|
value: Rational;
|
|
@@ -373,22 +374,21 @@ class BoundSimplifier {
|
|
|
373
374
|
|
|
374
375
|
reduce() {
|
|
375
376
|
const goal = this.goal;
|
|
377
|
+
const state = new DependentExprState(this.manager, goal);
|
|
376
378
|
let isUpdated = true;
|
|
377
379
|
for (let round = 0; round < 5 && isUpdated; round++) {
|
|
378
380
|
isUpdated = false;
|
|
379
381
|
let isBoundFound = false;
|
|
380
382
|
this.reset();
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
}
|
|
383
|
+
state.forEachIndex((index) => {
|
|
384
|
+
if (!this.insertBound(goal.forms.items[index])) return;
|
|
385
|
+
goal.update(index, this.manager.trueExpr);
|
|
386
|
+
isBoundFound = true;
|
|
387
|
+
});
|
|
387
388
|
if (!isBoundFound) break;
|
|
388
|
-
|
|
389
|
-
this.tightenBound(goal.forms.items[index]);
|
|
389
|
+
state.forEachIndex((index) => this.tightenBound(goal.forms.items[index]));
|
|
390
390
|
const rewriter = new BoundRewriter(this.manager, this);
|
|
391
|
-
|
|
391
|
+
state.forEachIndex((index) => {
|
|
392
392
|
const form = goal.forms.items[index];
|
|
393
393
|
const result = rewriter.rewrite(form);
|
|
394
394
|
if (result !== form) {
|
|
@@ -396,7 +396,7 @@ class BoundSimplifier {
|
|
|
396
396
|
isUpdated = true;
|
|
397
397
|
}
|
|
398
398
|
this.manager.decRef(result);
|
|
399
|
-
}
|
|
399
|
+
});
|
|
400
400
|
rewriter.release();
|
|
401
401
|
this.restoreBounds();
|
|
402
402
|
}
|
|
@@ -594,7 +594,5 @@ export const propagateIneqs = (manager: AstManager, goal: Goal) => {
|
|
|
594
594
|
simplifier.reduce();
|
|
595
595
|
simplifier.release();
|
|
596
596
|
}
|
|
597
|
-
goal
|
|
598
|
-
goal.elimRedundancies();
|
|
599
|
-
goal.depth++;
|
|
597
|
+
finishSimplifier(goal);
|
|
600
598
|
};
|
|
@@ -254,13 +254,12 @@ export const getBvSignature = (
|
|
|
254
254
|
: op === OP_BCOMP
|
|
255
255
|
? { name: "bvcomp", domain: [sort, sort], range: manager.mkBvSort(1) }
|
|
256
256
|
: undefined;
|
|
257
|
-
if (fixed !== undefined) {
|
|
258
|
-
if (
|
|
259
|
-
return "declared arity mismatches supplied arity";
|
|
257
|
+
if (fixed !== undefined && argSorts.length !== fixed.domain.length) {
|
|
258
|
+
if (binary?.[1] !== true) return "declared arity mismatches supplied arity";
|
|
260
259
|
if (argSorts.some((argSort) => argSort !== sort))
|
|
261
260
|
return "declared sorts do not match supplied sorts";
|
|
262
|
-
return fixed;
|
|
263
261
|
}
|
|
262
|
+
if (fixed !== undefined) return fixed;
|
|
264
263
|
const isUnaryWithInt = argSorts.length === 1 && parameters.length === 1;
|
|
265
264
|
switch (op) {
|
|
266
265
|
case OP_BIT2BOOL:
|
|
@@ -320,19 +319,23 @@ export const getBvSignature = (
|
|
|
320
319
|
}
|
|
321
320
|
};
|
|
322
321
|
|
|
322
|
+
// mk_func_decl checks each argument against the declaration whose size the first one gives.
|
|
323
|
+
export const getMismatchedArgument = (signature: BvSignature, argSorts: number[]) =>
|
|
324
|
+
argSorts.length === signature.domain.length
|
|
325
|
+
? argSorts.findIndex((sort, index) => sort !== signature.domain[index])
|
|
326
|
+
: -1;
|
|
327
|
+
|
|
323
328
|
export const mkBvApp = (
|
|
324
329
|
manager: AstManager,
|
|
325
330
|
op: number,
|
|
326
331
|
args: number[],
|
|
327
332
|
parameters: number[] = [],
|
|
328
333
|
) => {
|
|
329
|
-
const
|
|
330
|
-
|
|
331
|
-
op,
|
|
332
|
-
args.map((arg) => manager.sorts[arg]),
|
|
333
|
-
parameters,
|
|
334
|
-
);
|
|
334
|
+
const argSorts = args.map((arg) => manager.sorts[arg]);
|
|
335
|
+
const signature = getBvSignature(manager, op, argSorts, parameters);
|
|
335
336
|
if (typeof signature === "string") throw new SmtInvariantError(signature);
|
|
337
|
+
if (getMismatchedArgument(signature, argSorts) !== -1)
|
|
338
|
+
throw new SmtInvariantError("an argument does not match the declaration");
|
|
336
339
|
const decl = manager.mkBvDecl(op, signature.name, parameters, signature.domain, signature.range);
|
|
337
340
|
return manager.mkApp(decl, args, signature.range);
|
|
338
341
|
};
|
|
@@ -100,7 +100,7 @@ export const DEFAULT_BV_OPTIONS: Omit<BvRewriterOptions, "isHiDiv0"> = {
|
|
|
100
100
|
isSplitConcatEq: false,
|
|
101
101
|
};
|
|
102
102
|
|
|
103
|
-
|
|
103
|
+
interface BoolRewrites {
|
|
104
104
|
mkEq: (left: number, right: number) => number;
|
|
105
105
|
mkIte: (condition: number, thenExpr: number, elseExpr: number) => number;
|
|
106
106
|
}
|
|
@@ -17,6 +17,8 @@ import {
|
|
|
17
17
|
import type { Goal } from "./goal";
|
|
18
18
|
import { Rational } from "./rational";
|
|
19
19
|
import { Rewriter, type RewriterOptions } from "./rewriter";
|
|
20
|
+
import { type DependentExprState, runSimplifier } from "./dependent-expr-state";
|
|
21
|
+
import { RewriterTpl } from "./rewriter-tpl";
|
|
20
22
|
|
|
21
23
|
interface Bound {
|
|
22
24
|
value: Rational;
|
|
@@ -69,8 +71,7 @@ const isPb = (manager: AstManager, first: number, second: number) => {
|
|
|
69
71
|
export const checkPbFree = (manager: AstManager, form: number) => {
|
|
70
72
|
const visited = new Set<number>();
|
|
71
73
|
const todo = [form];
|
|
72
|
-
|
|
73
|
-
const expr = todo.pop() as number;
|
|
74
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
74
75
|
if (visited.has(expr)) continue;
|
|
75
76
|
visited.add(expr);
|
|
76
77
|
if (manager.kinds[expr] === KIND_QUANTIFIER) {
|
|
@@ -91,20 +92,36 @@ export const checkPbFree = (manager: AstManager, form: number) => {
|
|
|
91
92
|
}
|
|
92
93
|
};
|
|
93
94
|
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
for (let index = 0; index < size && !goal.isInconsistent; index++) {
|
|
99
|
-
const form = goal.forms.items[index];
|
|
100
|
-
const rewritten = rewriter.rewrite(form);
|
|
101
|
-
checkPbFree(manager, rewritten);
|
|
102
|
-
if (rewritten !== form) goal.update(index, rewritten);
|
|
103
|
-
manager.decRef(rewritten);
|
|
104
|
-
}
|
|
105
|
-
rewriter.release();
|
|
95
|
+
// The port has no encoding to rewrite to, but the walk still counts its steps of the limit.
|
|
96
|
+
class CardPbRewriter extends RewriterTpl {
|
|
97
|
+
isRewritingPatterns() {
|
|
98
|
+
return false;
|
|
106
99
|
}
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
export const createCard2Bv =
|
|
103
|
+
(manager: AstManager, options: RewriterOptions) => (state: DependentExprState) => {
|
|
104
|
+
const rewriter = new Rewriter(manager, options);
|
|
105
|
+
const pbRewriter = new CardPbRewriter(manager);
|
|
106
|
+
let simplified = -1;
|
|
107
|
+
return {
|
|
108
|
+
reduce: () => {
|
|
109
|
+
state.rewriteEach((form) => {
|
|
110
|
+
const next = rewriter.rewrite(form);
|
|
111
|
+
if (simplified !== -1) manager.decRef(simplified);
|
|
112
|
+
simplified = next;
|
|
113
|
+
const rewritten = pbRewriter.rewrite(simplified);
|
|
114
|
+
checkPbFree(manager, rewritten);
|
|
115
|
+
return rewritten;
|
|
116
|
+
});
|
|
117
|
+
if (simplified !== -1) manager.decRef(simplified);
|
|
118
|
+
},
|
|
119
|
+
release: () => {
|
|
120
|
+
rewriter.release();
|
|
121
|
+
pbRewriter.release();
|
|
122
|
+
},
|
|
123
|
+
};
|
|
124
|
+
};
|
|
125
|
+
|
|
126
|
+
export const card2bv = (manager: AstManager, goal: Goal, options: RewriterOptions) =>
|
|
127
|
+
runSimplifier(goal, false, createCard2Bv(manager, options));
|
|
@@ -18,6 +18,7 @@ import { ObjMap } from "./hashtable";
|
|
|
18
18
|
import { RefVector } from "./ref-vector";
|
|
19
19
|
import { Rewriter, type RewriterOptions } from "./rewriter";
|
|
20
20
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
21
|
+
import { runSimplifier } from "./dependent-expr-state";
|
|
21
22
|
|
|
22
23
|
const SIMPLIFIED_FAMILIES = [
|
|
23
24
|
FAMILY_BASIC,
|
|
@@ -48,6 +49,10 @@ class CofactorRewriter extends RewriterTpl {
|
|
|
48
49
|
return false;
|
|
49
50
|
}
|
|
50
51
|
|
|
52
|
+
checkMaxSteps() {
|
|
53
|
+
this.manager.limit.checkpoint();
|
|
54
|
+
}
|
|
55
|
+
|
|
51
56
|
setCofactorAtom(expr: number) {
|
|
52
57
|
const manager = this.manager;
|
|
53
58
|
this.term = -1;
|
|
@@ -121,16 +126,30 @@ class CofactorElimTermIte {
|
|
|
121
126
|
const manager = this.manager;
|
|
122
127
|
const occs = new ObjMap<number>((key) => manager.hashes[key]);
|
|
123
128
|
const visited = new Set<number>();
|
|
124
|
-
const
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
129
|
+
const frames = [expr];
|
|
130
|
+
const childIndexes = [0];
|
|
131
|
+
while (frames.length > 0) {
|
|
132
|
+
manager.limit.checkpoint();
|
|
133
|
+
const top = frames.length - 1;
|
|
134
|
+
const curr = frames[top];
|
|
135
|
+
const numArgs = manager.kinds[curr] === KIND_APP ? manager.getNumArgs(curr) : 0;
|
|
136
|
+
const isTermIte = this.isTermIte(curr);
|
|
137
|
+
let isPushed = false;
|
|
138
|
+
while (!isPushed && childIndexes[top] < numArgs) {
|
|
139
|
+
const arg = manager.getArg(curr, childIndexes[top]);
|
|
140
|
+
if (childIndexes[top] === 0 && isTermIte) occs.set(arg, (occs.get(arg) ?? 0) + 1);
|
|
141
|
+
childIndexes[top]++;
|
|
131
142
|
if (visited.has(arg)) continue;
|
|
132
143
|
visited.add(arg);
|
|
133
|
-
if (manager.kinds[arg] === KIND_APP && manager.getNumArgs(arg) > 0)
|
|
144
|
+
if (manager.kinds[arg] === KIND_APP && manager.getNumArgs(arg) > 0) {
|
|
145
|
+
frames.push(arg);
|
|
146
|
+
childIndexes.push(0);
|
|
147
|
+
isPushed = true;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
if (!isPushed) {
|
|
151
|
+
frames.pop();
|
|
152
|
+
childIndexes.pop();
|
|
134
153
|
}
|
|
135
154
|
}
|
|
136
155
|
let best = -1;
|
|
@@ -200,6 +219,7 @@ class CofactorElimTermIte {
|
|
|
200
219
|
const manager = this.manager;
|
|
201
220
|
const frames = [{ expr: root, isFirst: true }];
|
|
202
221
|
while (frames.length > 0) {
|
|
222
|
+
manager.limit.checkpoint();
|
|
203
223
|
const frame = frames[frames.length - 1];
|
|
204
224
|
const expr = frame.expr;
|
|
205
225
|
if (manager.kinds[expr] !== KIND_APP) {
|
|
@@ -260,19 +280,14 @@ export const cofactorTermIte = (
|
|
|
260
280
|
goal: Goal,
|
|
261
281
|
options: RewriterOptions,
|
|
262
282
|
isCofactoringEqualities: boolean,
|
|
263
|
-
) =>
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
}
|
|
275
|
-
goal.elimTrue();
|
|
276
|
-
goal.elimRedundancies();
|
|
277
|
-
goal.depth++;
|
|
278
|
-
};
|
|
283
|
+
) =>
|
|
284
|
+
runSimplifier(goal, false, (state) => ({
|
|
285
|
+
reduce: () =>
|
|
286
|
+
state.rewriteEach((form) => {
|
|
287
|
+
const eliminator = new CofactorElimTermIte(manager, options, isCofactoringEqualities);
|
|
288
|
+
const result = eliminator.apply(form);
|
|
289
|
+
eliminator.release();
|
|
290
|
+
return result;
|
|
291
|
+
}),
|
|
292
|
+
release: () => {},
|
|
293
|
+
}));
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { SmtInvariantError } from "../../../errors";
|
|
1
2
|
import type { AssertedFormulas } from "./asserted-formulas";
|
|
2
3
|
import {
|
|
3
4
|
AstManager,
|
|
@@ -68,6 +69,7 @@ import { TheoryPolymorphism } from "./theory-polymorphism";
|
|
|
68
69
|
import { TheoryLra } from "./theory-lra";
|
|
69
70
|
import { shrink } from "./array";
|
|
70
71
|
import {
|
|
72
|
+
DEFAULT_CONFIG,
|
|
71
73
|
getSmtConfig,
|
|
72
74
|
PS_ALWAYS_FALSE,
|
|
73
75
|
PS_CACHING_CONSERVATIVE,
|
|
@@ -77,6 +79,7 @@ import {
|
|
|
77
79
|
RS_LUBY,
|
|
78
80
|
type SmtSetup,
|
|
79
81
|
} from "./smt-setup";
|
|
82
|
+
import type { KernelParams } from "./solver";
|
|
80
83
|
|
|
81
84
|
const ACTIVITY_LIMIT = 1e100;
|
|
82
85
|
const INV_ACTIVITY_LIMIT = 1e-100;
|
|
@@ -152,6 +155,7 @@ export interface SmtParams {
|
|
|
152
155
|
isMbqi: boolean;
|
|
153
156
|
mbqiMaxIterations: number;
|
|
154
157
|
relevancyLevel: 0 | 2;
|
|
158
|
+
randomSeed?: number;
|
|
155
159
|
// The model checker's auxiliary context pretends every array operation is supported.
|
|
156
160
|
isArrayFakeSupport?: boolean;
|
|
157
161
|
}
|
|
@@ -170,6 +174,7 @@ export class Context extends Internalizer {
|
|
|
170
174
|
private scopeAuxClauseLimits: number[] = [];
|
|
171
175
|
private scopeTrailLimits: number[] = [];
|
|
172
176
|
private baseScopeLemmaLimits: number[] = [];
|
|
177
|
+
private isBaseScopeInconsistent: boolean[] = [];
|
|
173
178
|
private atomPropagationQueue: Literal[] = [];
|
|
174
179
|
private thEqQueue: number[] = [];
|
|
175
180
|
private thDiseqQueue: number[] = [];
|
|
@@ -191,6 +196,8 @@ export class Context extends Internalizer {
|
|
|
191
196
|
private r1ParentGenerations = new Map<Enode, number>();
|
|
192
197
|
private erasedGenerations = new Map<Enode, number>();
|
|
193
198
|
private lastSearchFailure: SearchFailure = FAILURE_OK;
|
|
199
|
+
// As in Z3, a new search doesn't reset it.
|
|
200
|
+
reasonUnknown = "unknown";
|
|
194
201
|
private hasCaseSplit = true;
|
|
195
202
|
private incompleteTheories: Theory[] = [];
|
|
196
203
|
private modelState: ModelState = { kind: "none" };
|
|
@@ -203,7 +210,22 @@ export class Context extends Internalizer {
|
|
|
203
210
|
readonly params: SmtParams,
|
|
204
211
|
) {
|
|
205
212
|
super(manager, params.relevancyLevel > 0);
|
|
206
|
-
this.qmanager = new DefaultQuantifierManager(this
|
|
213
|
+
this.qmanager = new DefaultQuantifierManager(this);
|
|
214
|
+
}
|
|
215
|
+
|
|
216
|
+
// As in Z3, rereading the parameters drops the setup's tuning but for eliminate_term_ite, eliminate_bounds and relevancy.
|
|
217
|
+
updateParams(params: KernelParams) {
|
|
218
|
+
this.params.isMbqi = params.isMbqi;
|
|
219
|
+
this.params.mbqiMaxIterations = params.mbqiMaxIterations;
|
|
220
|
+
this.params.randomSeed = params.randomSeed;
|
|
221
|
+
this.config = {
|
|
222
|
+
...DEFAULT_CONFIG,
|
|
223
|
+
theories: this.config.theories,
|
|
224
|
+
isFindingMacros: params.isFindingMacros,
|
|
225
|
+
isEliminatingTermIte: this.config.isEliminatingTermIte,
|
|
226
|
+
isEliminatingBounds: this.config.isEliminatingBounds,
|
|
227
|
+
};
|
|
228
|
+
this.qmanager.updateParams();
|
|
207
229
|
}
|
|
208
230
|
|
|
209
231
|
// setup_context and setup_components. The setup's theories come in its order, then setup_card's.
|
|
@@ -212,6 +234,7 @@ export class Context extends Internalizer {
|
|
|
212
234
|
isUsingStaticFeatures: boolean,
|
|
213
235
|
asserted: AssertedFormulas,
|
|
214
236
|
) {
|
|
237
|
+
if (this.isInconsistent() || asserted.isInconsistent) return false;
|
|
215
238
|
const config = getSmtConfig(
|
|
216
239
|
this.manager,
|
|
217
240
|
setup,
|
|
@@ -221,11 +244,13 @@ export class Context extends Internalizer {
|
|
|
221
244
|
);
|
|
222
245
|
this.setup = setup;
|
|
223
246
|
this.config = config;
|
|
247
|
+
this.randomSeed = this.params.randomSeed ?? 0;
|
|
224
248
|
if (config.relevancyLevel !== undefined) this.relevancy.isEnabled = config.relevancyLevel > 0;
|
|
225
249
|
for (const family of config.theories)
|
|
226
250
|
if (family !== FAMILY_POLY || this.manager.hasTypeVars) this.registerFamily(family);
|
|
227
251
|
this.registerFamily(FAMILY_PB);
|
|
228
252
|
asserted.setup(config);
|
|
253
|
+
return true;
|
|
229
254
|
}
|
|
230
255
|
|
|
231
256
|
// register_plugin keeps the theory a family already has.
|
|
@@ -244,7 +269,9 @@ export class Context extends Internalizer {
|
|
|
244
269
|
}
|
|
245
270
|
|
|
246
271
|
checkCanceled() {
|
|
247
|
-
|
|
272
|
+
if (this.manager.limit.inc()) return false;
|
|
273
|
+
this.lastSearchFailure = FAILURE_CANCELED;
|
|
274
|
+
return true;
|
|
248
275
|
}
|
|
249
276
|
|
|
250
277
|
assign(literal: Literal, justification: BJustification, isDecision = false) {
|
|
@@ -961,11 +988,12 @@ export class Context extends Internalizer {
|
|
|
961
988
|
this.cacheGeneration(newLevel, visited);
|
|
962
989
|
this.qmanager.pop(numScopes);
|
|
963
990
|
this.fingerprints.pop(numScopes);
|
|
991
|
+
if (newLevel >= this.baseLevel || !this.isBaseScopeInconsistent[newLevel]) this.conflict = null;
|
|
964
992
|
if (newLevel < this.baseLevel) {
|
|
965
993
|
this.deleteClauses(this.lemmas, this.baseScopeLemmaLimits[newLevel]);
|
|
966
994
|
shrink(this.baseScopeLemmaLimits, newLevel);
|
|
995
|
+
shrink(this.isBaseScopeInconsistent, newLevel);
|
|
967
996
|
}
|
|
968
|
-
this.conflict = null;
|
|
969
997
|
this.deleteClauses(this.auxClauses, this.scopeAuxClauseLimits[newLevel]);
|
|
970
998
|
this.relevancy.pop(numScopes);
|
|
971
999
|
this.unassignVars(this.scopeAssignedLimits[newLevel]);
|
|
@@ -1259,6 +1287,9 @@ export class Context extends Internalizer {
|
|
|
1259
1287
|
}
|
|
1260
1288
|
|
|
1261
1289
|
private mkProtoModel() {
|
|
1290
|
+
const failure = this.lastSearchFailure;
|
|
1291
|
+
if (this.hasCaseSplits() || failure === FAILURE_CANCELED || failure === FAILURE_NUM_CONFLICTS)
|
|
1292
|
+
return undefined;
|
|
1262
1293
|
if (this.modelState.kind !== "none") this.modelState.generated.model.decRef();
|
|
1263
1294
|
const generated = mkModel(this);
|
|
1264
1295
|
generated.model.incRef();
|
|
@@ -1277,7 +1308,7 @@ export class Context extends Internalizer {
|
|
|
1277
1308
|
if (this.lastSearchFailure === FAILURE_QUANTIFIERS) return "(incomplete quantifiers)";
|
|
1278
1309
|
if (this.lastSearchFailure === FAILURE_THEORY)
|
|
1279
1310
|
return `(incomplete (theory${this.incompleteTheories.map((theory) => ` ${theory.name}`).join("")}))`;
|
|
1280
|
-
return
|
|
1311
|
+
return this.reasonUnknown;
|
|
1281
1312
|
}
|
|
1282
1313
|
|
|
1283
1314
|
private hasCaseSplits() {
|
|
@@ -1301,9 +1332,11 @@ export class Context extends Internalizer {
|
|
|
1301
1332
|
}
|
|
1302
1333
|
|
|
1303
1334
|
getModel() {
|
|
1335
|
+
if (this.isInconsistent()) return undefined;
|
|
1304
1336
|
if (this.modelState.kind === "final") return this.modelState.model;
|
|
1305
1337
|
const generated =
|
|
1306
1338
|
this.modelState.kind === "proto" ? this.modelState.generated : this.mkProtoModel();
|
|
1339
|
+
if (generated === undefined) return undefined;
|
|
1307
1340
|
const model = generated.model.mkModel();
|
|
1308
1341
|
model.addRecFuns();
|
|
1309
1342
|
model.incRef();
|
|
@@ -1311,6 +1344,12 @@ export class Context extends Internalizer {
|
|
|
1311
1344
|
return model;
|
|
1312
1345
|
}
|
|
1313
1346
|
|
|
1347
|
+
getSatModel() {
|
|
1348
|
+
const model = this.getModel();
|
|
1349
|
+
if (model === undefined) throw new SmtInvariantError("a sat answer without a model");
|
|
1350
|
+
return model;
|
|
1351
|
+
}
|
|
1352
|
+
|
|
1314
1353
|
validateModel(model: ProtoModel) {
|
|
1315
1354
|
const manager = this.manager;
|
|
1316
1355
|
for (const literal of this.assignedLiterals) {
|
|
@@ -1340,7 +1379,10 @@ export class Context extends Internalizer {
|
|
|
1340
1379
|
)
|
|
1341
1380
|
return status;
|
|
1342
1381
|
const generated = this.mkProtoModel();
|
|
1343
|
-
if (
|
|
1382
|
+
if (
|
|
1383
|
+
generated === undefined ||
|
|
1384
|
+
qmanager.checkModel(generated.model, generated.root2value) !== CHECK_MODEL_RESTART
|
|
1385
|
+
)
|
|
1344
1386
|
return status;
|
|
1345
1387
|
this.lastSearchFailure = FAILURE_OK;
|
|
1346
1388
|
status = L_UNDEF;
|
|
@@ -1350,9 +1392,10 @@ export class Context extends Internalizer {
|
|
|
1350
1392
|
if (status === L_TRUE && qmanager.quantifiers.length === 0) return L_TRUE;
|
|
1351
1393
|
if (status === L_TRUE) {
|
|
1352
1394
|
const generated = this.mkProtoModel();
|
|
1353
|
-
const result =
|
|
1354
|
-
|
|
1355
|
-
|
|
1395
|
+
const result =
|
|
1396
|
+
generated !== undefined && qmanager.isModelBased()
|
|
1397
|
+
? qmanager.checkModel(generated.model, generated.root2value)
|
|
1398
|
+
: CHECK_MODEL_UNKNOWN;
|
|
1356
1399
|
if (result === CHECK_MODEL_SAT) return L_TRUE;
|
|
1357
1400
|
if (result === CHECK_MODEL_UNKNOWN) {
|
|
1358
1401
|
this.lastSearchFailure = FAILURE_QUANTIFIERS;
|
|
@@ -1448,6 +1491,7 @@ export class Context extends Internalizer {
|
|
|
1448
1491
|
this.popToBaseLevel();
|
|
1449
1492
|
this.pushScope();
|
|
1450
1493
|
this.baseScopeLemmaLimits.push(this.lemmas.length);
|
|
1494
|
+
this.isBaseScopeInconsistent.push(this.isInconsistent());
|
|
1451
1495
|
this.baseLevel++;
|
|
1452
1496
|
this.searchLevel++;
|
|
1453
1497
|
}
|
|
@@ -1481,15 +1525,23 @@ export class Context extends Internalizer {
|
|
|
1481
1525
|
this.asserted = asserted;
|
|
1482
1526
|
this.macros = asserted.macros;
|
|
1483
1527
|
this.hasQuantifiers = asserted.hasQuantifiers;
|
|
1484
|
-
|
|
1528
|
+
if (this.checkCanceled()) return;
|
|
1529
|
+
asserted.reduce();
|
|
1530
|
+
if (this.checkCanceled()) return;
|
|
1485
1531
|
if (asserted.isInconsistent) {
|
|
1486
1532
|
this.setConflict("axiom", null);
|
|
1487
1533
|
return;
|
|
1488
1534
|
}
|
|
1489
|
-
|
|
1490
|
-
|
|
1491
|
-
|
|
1535
|
+
const formulas = asserted.getFormulas();
|
|
1536
|
+
const size = asserted.getNumFormulas();
|
|
1537
|
+
for (let qhead = asserted.getQhead(); qhead < size && !this.isInconsistent(); qhead++) {
|
|
1538
|
+
if (this.checkCanceled()) {
|
|
1539
|
+
asserted.commit(qhead);
|
|
1540
|
+
return;
|
|
1541
|
+
}
|
|
1542
|
+
this.internalizeAssertion(formulas[qhead], 0);
|
|
1492
1543
|
}
|
|
1544
|
+
asserted.commit();
|
|
1493
1545
|
}
|
|
1494
1546
|
|
|
1495
1547
|
initAssumptions(assumptions: number[], asserted: AssertedFormulas) {
|
|
@@ -1498,7 +1550,7 @@ export class Context extends Internalizer {
|
|
|
1498
1550
|
this.unsatCore = [];
|
|
1499
1551
|
if (assumptions.length > 0) {
|
|
1500
1552
|
this.propagate();
|
|
1501
|
-
if (this.isInconsistent()) return;
|
|
1553
|
+
if (this.isInconsistent() || this.checkCanceled()) return;
|
|
1502
1554
|
this.delInactiveLemmas();
|
|
1503
1555
|
this.pushScope();
|
|
1504
1556
|
const manager = this.manager;
|
|
@@ -1598,10 +1650,12 @@ export class Context extends Internalizer {
|
|
|
1598
1650
|
}
|
|
1599
1651
|
|
|
1600
1652
|
search() {
|
|
1653
|
+
if (this.asserted?.isInconsistent && !this.isInconsistent()) this.setConflict("axiom", null);
|
|
1601
1654
|
if (this.isInconsistent()) {
|
|
1602
1655
|
this.resolveConflict();
|
|
1603
1656
|
return L_FALSE;
|
|
1604
1657
|
}
|
|
1658
|
+
if (this.checkCanceled()) return L_UNDEF;
|
|
1605
1659
|
this.resetModel();
|
|
1606
1660
|
for (const theory of this.theories) theory.initSearchEh();
|
|
1607
1661
|
this.qmanager.initSearchEh();
|
|
@@ -74,8 +74,7 @@ class CtxSimplifier {
|
|
|
74
74
|
for (const form of goal.forms.items) {
|
|
75
75
|
this.pinned.push(form);
|
|
76
76
|
visit(form);
|
|
77
|
-
|
|
78
|
-
const expr = stack.pop() as number;
|
|
77
|
+
for (let expr = stack.pop(); expr !== undefined; expr = stack.pop()) {
|
|
79
78
|
if (manager.kinds[expr] !== KIND_APP) continue;
|
|
80
79
|
for (let index = manager.getNumArgs(expr) - 1; index >= 0; index--)
|
|
81
80
|
visit(manager.getArg(expr, index));
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { SmtInvariantError } from "../../../errors";
|
|
1
|
+
import { SmtDefaultError, SmtInvariantError } from "../../../errors";
|
|
2
2
|
import {
|
|
3
3
|
type AstManager,
|
|
4
4
|
OP_DT_ACCESSOR,
|
|
@@ -327,7 +327,7 @@ const computeSizeFunctions = (manager: AstManager, names: string[]) => {
|
|
|
327
327
|
}
|
|
328
328
|
};
|
|
329
329
|
|
|
330
|
-
const
|
|
330
|
+
export const resetDatatypePlugin = (manager: AstManager) => {
|
|
331
331
|
manager.datatypeConstructors = [];
|
|
332
332
|
manager.constructorAccessors = [];
|
|
333
333
|
manager.constructorRecognizers = [];
|
|
@@ -337,7 +337,7 @@ const resetDeclarations = (manager: AstManager) => {
|
|
|
337
337
|
|
|
338
338
|
export const removeDatatype = (manager: AstManager, name: string) => {
|
|
339
339
|
manager.datatypeDefs.delete(name);
|
|
340
|
-
|
|
340
|
+
resetDatatypePlugin(manager);
|
|
341
341
|
};
|
|
342
342
|
|
|
343
343
|
export const mkDatatypeDef = (
|
|
@@ -357,7 +357,7 @@ export const mkDatatypeDef = (
|
|
|
357
357
|
|
|
358
358
|
export const mkDatatypes = (manager: AstManager, defs: DatatypeDef[]): number[] | string => {
|
|
359
359
|
for (const def of defs) {
|
|
360
|
-
if (manager.datatypeDefs.has(def.name))
|
|
360
|
+
if (manager.datatypeDefs.has(def.name)) resetDatatypePlugin(manager);
|
|
361
361
|
manager.datatypeDefs.set(def.name, def);
|
|
362
362
|
}
|
|
363
363
|
const sorts = defs.map((def) => instantiateDef(manager, def, []));
|
|
@@ -415,7 +415,12 @@ export const instantiateAccessor = (
|
|
|
415
415
|
export const getDatatypeConstructors = (manager: AstManager, sort: number) => {
|
|
416
416
|
const existing = manager.datatypeConstructors[sort];
|
|
417
417
|
if (existing !== undefined) return existing;
|
|
418
|
-
const def =
|
|
418
|
+
const def = getDatatypeDef(manager, sort);
|
|
419
|
+
if (def === undefined) {
|
|
420
|
+
// Z3 caches the empty list before it raises, so a later call gets no constructors.
|
|
421
|
+
manager.datatypeConstructors[sort] = [];
|
|
422
|
+
throw new SmtDefaultError("datatype constructors have not been created");
|
|
423
|
+
}
|
|
419
424
|
const parameters = manager.getSortParameters(sort);
|
|
420
425
|
const constructors = def.constructors.map((constructor, index) =>
|
|
421
426
|
manager.mkDatatypeDecl(
|
|
@@ -568,5 +573,8 @@ const getNonRecConstructorCore = (
|
|
|
568
573
|
return result === -1 ? { constructor: -1, depth: 0 } : remember(result, minDepth);
|
|
569
574
|
};
|
|
570
575
|
|
|
571
|
-
export const getNonRecConstructor = (manager: AstManager, sort: number) =>
|
|
572
|
-
getNonRecConstructorCore(manager, sort, [sort]).constructor;
|
|
576
|
+
export const getNonRecConstructor = (manager: AstManager, sort: number) => {
|
|
577
|
+
const constructor = getNonRecConstructorCore(manager, sort, [sort]).constructor;
|
|
578
|
+
if (constructor === -1) throw new SmtDefaultError("constructor not available");
|
|
579
|
+
return constructor;
|
|
580
|
+
};
|