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
|
@@ -68,6 +68,43 @@ export class PatternInferenceRw extends RewriterTpl {
|
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
70
|
|
|
71
|
+
// Like Z3's, it keeps the definitions it made until a pop, and each reduce asserts them all again.
|
|
72
|
+
class ElimTermIteRw extends RewriterTpl {
|
|
73
|
+
readonly definitions: RefVector;
|
|
74
|
+
private lims: number[] = [];
|
|
75
|
+
|
|
76
|
+
constructor(
|
|
77
|
+
manager: AstManager,
|
|
78
|
+
private names: DefinedNames,
|
|
79
|
+
) {
|
|
80
|
+
super(manager);
|
|
81
|
+
this.definitions = new RefVector(manager);
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
reduceApp(decl: number, args: number[], sort: number) {
|
|
85
|
+
const manager = this.manager;
|
|
86
|
+
if (decl !== OP_ITE || sort === SORT_BOOL) return -1;
|
|
87
|
+
const ite = manager.mkApp(OP_ITE, args, sort);
|
|
88
|
+
manager.incRef(ite);
|
|
89
|
+
const named = this.names.mkName(ite);
|
|
90
|
+
manager.decRef(ite);
|
|
91
|
+
if (named.definition === -1) return -1;
|
|
92
|
+
this.definitions.push(named.definition);
|
|
93
|
+
manager.decRef(named.definition);
|
|
94
|
+
manager.incRef(named.name);
|
|
95
|
+
return named.name;
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
push() {
|
|
99
|
+
this.lims.push(this.definitions.size);
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
pop() {
|
|
103
|
+
this.definitions.shrink(this.lims[this.lims.length - 1]);
|
|
104
|
+
this.lims.pop();
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
|
|
71
108
|
const isGreater = (manager: AstManager, left: number, right: number): boolean => {
|
|
72
109
|
if (left === right) return false;
|
|
73
110
|
const isLeftValue = manager.isValue(left);
|
|
@@ -156,7 +193,9 @@ export class AssertedFormulas {
|
|
|
156
193
|
private isReducePending = true;
|
|
157
194
|
private isNnfCnf = true;
|
|
158
195
|
private isEq2Ineq = false;
|
|
196
|
+
private isEliminatingTermIte = false;
|
|
159
197
|
private names: DefinedNames;
|
|
198
|
+
private termIteElim: ElimTermIteRw;
|
|
160
199
|
private patternInference: PatternInferenceRw;
|
|
161
200
|
private bvSharing: MaxBvSharing;
|
|
162
201
|
hasQuantifiers = false;
|
|
@@ -177,6 +216,7 @@ export class AssertedFormulas {
|
|
|
177
216
|
// string literals reach the seq theory as concatenations of units.
|
|
178
217
|
this.rewriter = new Rewriter(manager, { ...KERNEL_REWRITER_OPTIONS, isCoalescingChars: false });
|
|
179
218
|
this.names = new DefinedNames(manager);
|
|
219
|
+
this.termIteElim = new ElimTermIteRw(manager, this.names);
|
|
180
220
|
this.patternInference = new PatternInferenceRw(manager, new PatternInference(manager));
|
|
181
221
|
this.bvSharing = new MaxBvSharing(manager);
|
|
182
222
|
}
|
|
@@ -196,6 +236,7 @@ export class AssertedFormulas {
|
|
|
196
236
|
this.bvSharing.popScope();
|
|
197
237
|
this.macros.popScope();
|
|
198
238
|
this.names.pop();
|
|
239
|
+
this.termIteElim.pop();
|
|
199
240
|
this.substitution.pop();
|
|
200
241
|
this.formulas.shrink(scope.numFormulas);
|
|
201
242
|
this.qhead = scope.numFormulas;
|
|
@@ -207,6 +248,7 @@ export class AssertedFormulas {
|
|
|
207
248
|
this.substitution.push();
|
|
208
249
|
this.scopes.push({ numFormulas: this.formulas.size, isInconsistent: this.isInconsistent });
|
|
209
250
|
this.names.push();
|
|
251
|
+
this.termIteElim.push();
|
|
210
252
|
this.macros.pushScope();
|
|
211
253
|
this.bvSharing.pushScope();
|
|
212
254
|
}
|
|
@@ -232,9 +274,18 @@ export class AssertedFormulas {
|
|
|
232
274
|
setup(config: SmtConfig) {
|
|
233
275
|
this.isNnfCnf = config.isNnfCnf;
|
|
234
276
|
this.isEq2Ineq = config.isEq2Ineq;
|
|
277
|
+
this.isEliminatingTermIte = config.isEliminatingTermIte;
|
|
235
278
|
this.isFindingMacros ||= config.isFindingMacros;
|
|
236
279
|
}
|
|
237
280
|
|
|
281
|
+
updateParams(config: SmtConfig) {
|
|
282
|
+
this.isNnfCnf = config.isNnfCnf;
|
|
283
|
+
this.isEq2Ineq = config.isEq2Ineq;
|
|
284
|
+
this.isEliminatingTermIte = config.isEliminatingTermIte;
|
|
285
|
+
this.isFindingMacros = config.isFindingMacros;
|
|
286
|
+
this.isReducePending = true;
|
|
287
|
+
}
|
|
288
|
+
|
|
238
289
|
getNumFormulas() {
|
|
239
290
|
return this.formulas.size;
|
|
240
291
|
}
|
|
@@ -249,7 +300,7 @@ export class AssertedFormulas {
|
|
|
249
300
|
if (!this.isInconsistent && (this.hasQuantifiers || this.isPreprocessing)) this.reduceCore();
|
|
250
301
|
if (this.isInconsistent) return [];
|
|
251
302
|
const result = this.formulas.items.slice(this.qhead);
|
|
252
|
-
|
|
303
|
+
this.macros.markForbidden(result);
|
|
253
304
|
for (const formula of result) this.substitution.update(formula);
|
|
254
305
|
this.qhead = this.formulas.size;
|
|
255
306
|
return result;
|
|
@@ -270,6 +321,10 @@ export class AssertedFormulas {
|
|
|
270
321
|
this.setEliminateAnd(true);
|
|
271
322
|
this.reduceAsserted();
|
|
272
323
|
if (this.isInconsistent) return;
|
|
324
|
+
if (this.isEliminatingTermIte) {
|
|
325
|
+
this.elimTermIte();
|
|
326
|
+
if (this.isInconsistent) return;
|
|
327
|
+
}
|
|
273
328
|
if (this.hasQuantifiers && this.simplifyFormulas((formula) => this.refineInjAxiom(formula)))
|
|
274
329
|
this.isReducePending = true;
|
|
275
330
|
if (this.isInconsistent) return;
|
|
@@ -330,6 +385,16 @@ export class AssertedFormulas {
|
|
|
330
385
|
return formula;
|
|
331
386
|
}
|
|
332
387
|
|
|
388
|
+
private elimTermIte() {
|
|
389
|
+
const elim = this.termIteElim;
|
|
390
|
+
if (this.simplifyFormulas((formula) => elim.rewrite(formula))) this.isReducePending = true;
|
|
391
|
+
if (elim.definitions.size > 0) this.isReducePending = true;
|
|
392
|
+
for (const definition of elim.definitions.items) this.formulas.push(definition);
|
|
393
|
+
this.flushCache();
|
|
394
|
+
this.reduceAsserted();
|
|
395
|
+
elim.reset();
|
|
396
|
+
}
|
|
397
|
+
|
|
333
398
|
private findMacros() {
|
|
334
399
|
if (!this.isFindingMacros || !this.hasQuantifiers) return;
|
|
335
400
|
this.isReducePending = true;
|
|
@@ -250,7 +250,7 @@ const compareDecls = (manager: AstManager, first: number, second: number) => {
|
|
|
250
250
|
return compareSorts(manager, firstKey.range, secondKey.range);
|
|
251
251
|
};
|
|
252
252
|
|
|
253
|
-
|
|
253
|
+
const compareAsts = (manager: AstManager, first: number, second: number): number => {
|
|
254
254
|
if (first === second) return 0;
|
|
255
255
|
const byKind = compareValues(manager.kinds[first], manager.kinds[second]);
|
|
256
256
|
if (byKind !== 0) return byKind;
|
|
@@ -298,7 +298,6 @@ export const OP_INTERNAL_STRING_STRIDOF = SEQ_OP_BASE + 64;
|
|
|
298
298
|
export const OP_INTERNAL_STRING_POWER = SEQ_OP_BASE + 65;
|
|
299
299
|
export const OP_INTERNAL_REGEXP_EMPTY = SEQ_OP_BASE + 66;
|
|
300
300
|
export const OP_INTERNAL_REGEXP_FULL_CHAR = SEQ_OP_BASE + 67;
|
|
301
|
-
export const OP_RE_IS_NULLABLE = SEQ_OP_BASE + 68;
|
|
302
301
|
export const OP_SEQ_SKOLEM = SEQ_OP_BASE + 69;
|
|
303
302
|
const CHAR_OP_BASE = 600;
|
|
304
303
|
export const OP_CHAR_CONST = CHAR_OP_BASE;
|
|
@@ -316,6 +315,7 @@ export const OP_AT_LEAST_K = PB_OP_BASE + 1;
|
|
|
316
315
|
export const OP_PB_LE = PB_OP_BASE + 2;
|
|
317
316
|
export const OP_PB_GE = PB_OP_BASE + 3;
|
|
318
317
|
export const OP_PB_EQ = PB_OP_BASE + 4;
|
|
318
|
+
export const OP_PB_AUX_BOOL = PB_OP_BASE + 5;
|
|
319
319
|
const RECFUN_OP_BASE = 900;
|
|
320
320
|
export const OP_FUN_DEFINED = RECFUN_OP_BASE;
|
|
321
321
|
export const OP_FUN_CASE_PRED = RECFUN_OP_BASE + 1;
|
|
@@ -611,7 +611,10 @@ const hasOwnDeclHash = (family: number) =>
|
|
|
611
611
|
family === FAMILY_RECFUN;
|
|
612
612
|
|
|
613
613
|
// The declarations that Z3 makes once and counts references to, rather than on each use.
|
|
614
|
-
const
|
|
614
|
+
const isDeclared = (funcDecl: FuncDecl) =>
|
|
615
|
+
funcDecl.family === FAMILY_USER ||
|
|
616
|
+
funcDecl.family === FAMILY_RECFUN ||
|
|
617
|
+
funcDecl.op === OP_PB_AUX_BOOL;
|
|
615
618
|
|
|
616
619
|
export class AstManager {
|
|
617
620
|
private numNodes = 0;
|
|
@@ -674,6 +677,7 @@ export class AstManager {
|
|
|
674
677
|
private charSort = -1;
|
|
675
678
|
private stringSort = -1;
|
|
676
679
|
private reglanSort = -1;
|
|
680
|
+
private isSeqPluginInitialized = false;
|
|
677
681
|
private seqSorts = new Map<string, number>();
|
|
678
682
|
private seqDecls = new Map<string, number>();
|
|
679
683
|
private stringValues: number[][] = [];
|
|
@@ -739,6 +743,17 @@ export class AstManager {
|
|
|
739
743
|
smallId: Z3_SMALL_IDS.get(builtin[2]) ?? -1,
|
|
740
744
|
parameters: [],
|
|
741
745
|
});
|
|
746
|
+
// Each has one signature in Z3, and a model's tables hash its declaration as a user's.
|
|
747
|
+
for (const entry of Z3_BUILTINS)
|
|
748
|
+
if (entry[0] === OP_DIV0 || entry[0] === OP_IDIV0 || entry[0] === OP_MOD0) {
|
|
749
|
+
const range = this.funcDecls[entry[0]].range;
|
|
750
|
+
this.declHashes[entry[0]] = this.getFuncDeclHash(
|
|
751
|
+
entry[1][0],
|
|
752
|
+
[range, range],
|
|
753
|
+
range,
|
|
754
|
+
getInfoHash(Z3_ARITH_FAMILY, entry[1][1], []),
|
|
755
|
+
);
|
|
756
|
+
}
|
|
742
757
|
this.trueExpr = this.mkApp(OP_TRUE, [], SORT_BOOL);
|
|
743
758
|
this.falseExpr = this.mkApp(OP_FALSE, [], SORT_BOOL);
|
|
744
759
|
this.incRef(this.trueExpr);
|
|
@@ -799,6 +814,15 @@ export class AstManager {
|
|
|
799
814
|
this.declRefCounts[decl] = 1;
|
|
800
815
|
this.mkSmallId();
|
|
801
816
|
this.macros.set(decl, expr);
|
|
817
|
+
return decl;
|
|
818
|
+
}
|
|
819
|
+
|
|
820
|
+
eraseRecFunDef(decl: number) {
|
|
821
|
+
this.macros.delete(decl);
|
|
822
|
+
const def = this.recFunDefs.get(decl);
|
|
823
|
+
if (def === undefined) return;
|
|
824
|
+
for (const recFunCase of def.cases) this.recFunCases.delete(recFunCase.pred);
|
|
825
|
+
this.recFunDefs.delete(decl);
|
|
802
826
|
}
|
|
803
827
|
|
|
804
828
|
// recfun::def: the declaration of a defined function, which the definition holds.
|
|
@@ -881,7 +905,7 @@ export class AstManager {
|
|
|
881
905
|
|
|
882
906
|
private holdDecl(expr: number) {
|
|
883
907
|
const decl = this.decls[expr];
|
|
884
|
-
if (
|
|
908
|
+
if (isDeclared(this.funcDecls[decl])) {
|
|
885
909
|
this.incDeclRef(decl);
|
|
886
910
|
return;
|
|
887
911
|
}
|
|
@@ -900,7 +924,7 @@ export class AstManager {
|
|
|
900
924
|
|
|
901
925
|
private releaseDecl(expr: number) {
|
|
902
926
|
const decl = this.decls[expr];
|
|
903
|
-
if (
|
|
927
|
+
if (isDeclared(this.funcDecls[decl])) {
|
|
904
928
|
this.declRefCounts[decl]--;
|
|
905
929
|
if (this.declRefCounts[decl] > 0) return -1;
|
|
906
930
|
this.deletedDecls.add(decl);
|
|
@@ -1290,7 +1314,7 @@ export class AstManager {
|
|
|
1290
1314
|
return this.sortNames.length - 1;
|
|
1291
1315
|
}
|
|
1292
1316
|
|
|
1293
|
-
// Z3 makes the Char
|
|
1317
|
+
// Z3 makes the Char and String sorts at startup, so they take no small id.
|
|
1294
1318
|
mkCharSort() {
|
|
1295
1319
|
if (this.charSort === -1)
|
|
1296
1320
|
this.charSort = this.addSort(
|
|
@@ -1315,8 +1339,18 @@ export class AstManager {
|
|
|
1315
1339
|
return this.stringSort;
|
|
1316
1340
|
}
|
|
1317
1341
|
|
|
1342
|
+
initSeqPlugin() {
|
|
1343
|
+
if (this.isSeqPluginInitialized) return;
|
|
1344
|
+
this.isSeqPluginInitialized = true;
|
|
1345
|
+
const element = this.mkTypeParameter(0);
|
|
1346
|
+
this.mkReSort(this.mkSeqSort(element));
|
|
1347
|
+
this.mkReSort(this.mkStringSort());
|
|
1348
|
+
this.mkArraySort([element, SORT_BOOL]);
|
|
1349
|
+
}
|
|
1350
|
+
|
|
1318
1351
|
mkSeqSort(element: number) {
|
|
1319
1352
|
if (element === this.mkCharSort()) return this.mkStringSort();
|
|
1353
|
+
this.initSeqPlugin();
|
|
1320
1354
|
const key = `s${element}`;
|
|
1321
1355
|
const existing = this.seqSorts.get(key);
|
|
1322
1356
|
if (existing !== undefined) return existing;
|
|
@@ -1335,6 +1369,7 @@ export class AstManager {
|
|
|
1335
1369
|
}
|
|
1336
1370
|
|
|
1337
1371
|
mkReSort(seq: number) {
|
|
1372
|
+
this.initSeqPlugin();
|
|
1338
1373
|
const isReglan = seq === this.mkStringSort();
|
|
1339
1374
|
if (isReglan && this.reglanSort !== -1) return this.reglanSort;
|
|
1340
1375
|
const key = `r${seq}`;
|
|
@@ -1349,11 +1384,9 @@ export class AstManager {
|
|
|
1349
1384
|
getInfoHash(Z3_SEQ_FAMILY, Z3_RE_SORT, [this.sortHashes[seq]]),
|
|
1350
1385
|
),
|
|
1351
1386
|
);
|
|
1387
|
+
this.mkSmallId();
|
|
1352
1388
|
if (isReglan) this.reglanSort = sort;
|
|
1353
|
-
else
|
|
1354
|
-
this.mkSmallId();
|
|
1355
|
-
this.seqSorts.set(key, sort);
|
|
1356
|
-
}
|
|
1389
|
+
else this.seqSorts.set(key, sort);
|
|
1357
1390
|
return sort;
|
|
1358
1391
|
}
|
|
1359
1392
|
|
|
@@ -1732,7 +1765,7 @@ export class AstManager {
|
|
|
1732
1765
|
throw new SmtInvariantError(`the operator ${op} has no Z3 declaration`);
|
|
1733
1766
|
const argSort = op === OP_ITE ? this.sorts[args[1]] : this.sorts[args[0]];
|
|
1734
1767
|
const arity = builtin[2] === -1 ? args.length : builtin[2];
|
|
1735
|
-
const domain = Array.from({ length: arity }, (
|
|
1768
|
+
const domain = Array.from({ length: arity }, (_value, index) =>
|
|
1736
1769
|
op === OP_PATTERN
|
|
1737
1770
|
? this.sorts[args[index]]
|
|
1738
1771
|
: op === OP_ITE && index === 0
|
|
@@ -1873,6 +1906,20 @@ export class AstManager {
|
|
|
1873
1906
|
return decl;
|
|
1874
1907
|
}
|
|
1875
1908
|
|
|
1909
|
+
mkPbAuxBool() {
|
|
1910
|
+
const decl = this.addDecl(
|
|
1911
|
+
this.mkFreshVarName("pb"),
|
|
1912
|
+
FAMILY_PB,
|
|
1913
|
+
OP_PB_AUX_BOOL,
|
|
1914
|
+
[],
|
|
1915
|
+
SORT_BOOL,
|
|
1916
|
+
[],
|
|
1917
|
+
getInfoHash(Z3_PB_FAMILY, OP_PB_AUX_BOOL - PB_OP_BASE, []),
|
|
1918
|
+
);
|
|
1919
|
+
this.declRefCounts[decl] = 0;
|
|
1920
|
+
return this.mkApp(decl, [], SORT_BOOL);
|
|
1921
|
+
}
|
|
1922
|
+
|
|
1876
1923
|
mkFreshVarName(prefix: string | null) {
|
|
1877
1924
|
return `${prefix ?? "var"}!${this.mkFreshId()}`;
|
|
1878
1925
|
}
|
|
@@ -2051,7 +2098,7 @@ export class AstManager {
|
|
|
2051
2098
|
}
|
|
2052
2099
|
|
|
2053
2100
|
get am() {
|
|
2054
|
-
this.algebraicManager ??= new AlgebraicManager();
|
|
2101
|
+
this.algebraicManager ??= new AlgebraicManager(this.limit);
|
|
2055
2102
|
return this.algebraicManager;
|
|
2056
2103
|
}
|
|
2057
2104
|
|
|
@@ -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 { finishSimplifier } from "./dependent-expr-state";
|
|
32
33
|
|
|
33
34
|
interface Bound {
|
|
34
35
|
value: Rational;
|
|
@@ -594,7 +595,5 @@ export const propagateIneqs = (manager: AstManager, goal: Goal) => {
|
|
|
594
595
|
simplifier.reduce();
|
|
595
596
|
simplifier.release();
|
|
596
597
|
}
|
|
597
|
-
goal
|
|
598
|
-
goal.elimRedundancies();
|
|
599
|
-
goal.depth++;
|
|
598
|
+
finishSimplifier(goal);
|
|
600
599
|
};
|
|
@@ -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,7 @@ import {
|
|
|
17
17
|
import type { Goal } from "./goal";
|
|
18
18
|
import { Rational } from "./rational";
|
|
19
19
|
import { Rewriter, type RewriterOptions } from "./rewriter";
|
|
20
|
+
import { finishSimplifier } from "./dependent-expr-state";
|
|
20
21
|
|
|
21
22
|
interface Bound {
|
|
22
23
|
value: Rational;
|
|
@@ -69,8 +70,7 @@ const isPb = (manager: AstManager, first: number, second: number) => {
|
|
|
69
70
|
export const checkPbFree = (manager: AstManager, form: number) => {
|
|
70
71
|
const visited = new Set<number>();
|
|
71
72
|
const todo = [form];
|
|
72
|
-
|
|
73
|
-
const expr = todo.pop() as number;
|
|
73
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
74
74
|
if (visited.has(expr)) continue;
|
|
75
75
|
visited.add(expr);
|
|
76
76
|
if (manager.kinds[expr] === KIND_QUANTIFIER) {
|
|
@@ -104,7 +104,5 @@ export const card2bv = (manager: AstManager, goal: Goal, options: RewriterOption
|
|
|
104
104
|
}
|
|
105
105
|
rewriter.release();
|
|
106
106
|
}
|
|
107
|
-
goal
|
|
108
|
-
goal.elimRedundancies();
|
|
109
|
-
goal.depth++;
|
|
107
|
+
finishSimplifier(goal);
|
|
110
108
|
};
|
|
@@ -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 { finishSimplifier } from "./dependent-expr-state";
|
|
21
22
|
|
|
22
23
|
const SIMPLIFIED_FAMILIES = [
|
|
23
24
|
FAMILY_BASIC,
|
|
@@ -272,7 +273,5 @@ export const cofactorTermIte = (
|
|
|
272
273
|
eliminator.release();
|
|
273
274
|
}
|
|
274
275
|
}
|
|
275
|
-
goal
|
|
276
|
-
goal.elimRedundancies();
|
|
277
|
-
goal.depth++;
|
|
276
|
+
finishSimplifier(goal);
|
|
278
277
|
};
|
|
@@ -68,6 +68,7 @@ import { TheoryPolymorphism } from "./theory-polymorphism";
|
|
|
68
68
|
import { TheoryLra } from "./theory-lra";
|
|
69
69
|
import { shrink } from "./array";
|
|
70
70
|
import {
|
|
71
|
+
DEFAULT_CONFIG,
|
|
71
72
|
getSmtConfig,
|
|
72
73
|
PS_ALWAYS_FALSE,
|
|
73
74
|
PS_CACHING_CONSERVATIVE,
|
|
@@ -77,6 +78,7 @@ import {
|
|
|
77
78
|
RS_LUBY,
|
|
78
79
|
type SmtSetup,
|
|
79
80
|
} from "./smt-setup";
|
|
81
|
+
import type { KernelParams } from "./solver";
|
|
80
82
|
|
|
81
83
|
const ACTIVITY_LIMIT = 1e100;
|
|
82
84
|
const INV_ACTIVITY_LIMIT = 1e-100;
|
|
@@ -191,6 +193,8 @@ export class Context extends Internalizer {
|
|
|
191
193
|
private r1ParentGenerations = new Map<Enode, number>();
|
|
192
194
|
private erasedGenerations = new Map<Enode, number>();
|
|
193
195
|
private lastSearchFailure: SearchFailure = FAILURE_OK;
|
|
196
|
+
// As in Z3, a new search doesn't reset it.
|
|
197
|
+
reasonUnknown = "unknown";
|
|
194
198
|
private hasCaseSplit = true;
|
|
195
199
|
private incompleteTheories: Theory[] = [];
|
|
196
200
|
private modelState: ModelState = { kind: "none" };
|
|
@@ -203,7 +207,20 @@ export class Context extends Internalizer {
|
|
|
203
207
|
readonly params: SmtParams,
|
|
204
208
|
) {
|
|
205
209
|
super(manager, params.relevancyLevel > 0);
|
|
206
|
-
this.qmanager = new DefaultQuantifierManager(this
|
|
210
|
+
this.qmanager = new DefaultQuantifierManager(this);
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
// As in Z3, rereading the parameters drops the setup's tuning but for eliminate_term_ite and relevancy.
|
|
214
|
+
updateParams(params: KernelParams) {
|
|
215
|
+
this.params.isMbqi = params.isMbqi;
|
|
216
|
+
this.params.mbqiMaxIterations = params.mbqiMaxIterations;
|
|
217
|
+
this.config = {
|
|
218
|
+
...DEFAULT_CONFIG,
|
|
219
|
+
theories: this.config.theories,
|
|
220
|
+
isFindingMacros: params.isFindingMacros,
|
|
221
|
+
isEliminatingTermIte: this.config.isEliminatingTermIte,
|
|
222
|
+
};
|
|
223
|
+
this.qmanager.updateParams();
|
|
207
224
|
}
|
|
208
225
|
|
|
209
226
|
// setup_context and setup_components. The setup's theories come in its order, then setup_card's.
|
|
@@ -212,6 +229,7 @@ export class Context extends Internalizer {
|
|
|
212
229
|
isUsingStaticFeatures: boolean,
|
|
213
230
|
asserted: AssertedFormulas,
|
|
214
231
|
) {
|
|
232
|
+
if (this.isInconsistent() || asserted.isInconsistent) return false;
|
|
215
233
|
const config = getSmtConfig(
|
|
216
234
|
this.manager,
|
|
217
235
|
setup,
|
|
@@ -226,6 +244,7 @@ export class Context extends Internalizer {
|
|
|
226
244
|
if (family !== FAMILY_POLY || this.manager.hasTypeVars) this.registerFamily(family);
|
|
227
245
|
this.registerFamily(FAMILY_PB);
|
|
228
246
|
asserted.setup(config);
|
|
247
|
+
return true;
|
|
229
248
|
}
|
|
230
249
|
|
|
231
250
|
// register_plugin keeps the theory a family already has.
|
|
@@ -244,7 +263,9 @@ export class Context extends Internalizer {
|
|
|
244
263
|
}
|
|
245
264
|
|
|
246
265
|
checkCanceled() {
|
|
247
|
-
|
|
266
|
+
if (this.manager.limit.inc()) return false;
|
|
267
|
+
this.lastSearchFailure = FAILURE_CANCELED;
|
|
268
|
+
return true;
|
|
248
269
|
}
|
|
249
270
|
|
|
250
271
|
assign(literal: Literal, justification: BJustification, isDecision = false) {
|
|
@@ -1277,7 +1298,7 @@ export class Context extends Internalizer {
|
|
|
1277
1298
|
if (this.lastSearchFailure === FAILURE_QUANTIFIERS) return "(incomplete quantifiers)";
|
|
1278
1299
|
if (this.lastSearchFailure === FAILURE_THEORY)
|
|
1279
1300
|
return `(incomplete (theory${this.incompleteTheories.map((theory) => ` ${theory.name}`).join("")}))`;
|
|
1280
|
-
return
|
|
1301
|
+
return this.reasonUnknown;
|
|
1281
1302
|
}
|
|
1282
1303
|
|
|
1283
1304
|
private hasCaseSplits() {
|
|
@@ -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
|
+
};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { AstManager } from "./ast";
|
|
2
|
-
import type { Goal } from "./goal";
|
|
2
|
+
import type { Definition, Goal } from "./goal";
|
|
3
3
|
|
|
4
4
|
// The formula read last stays referenced, as m_dep, until the next read or the end of the tactic.
|
|
5
5
|
export class DependentExprState {
|
|
@@ -60,6 +60,13 @@ export class DependentExprState {
|
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
|
|
63
|
+
export const finishSimplifier = (goal: Goal, definitions: Definition[] = []) => {
|
|
64
|
+
goal.elimTrue();
|
|
65
|
+
goal.elimRedundancies();
|
|
66
|
+
goal.depth++;
|
|
67
|
+
if (definitions.length > 0 || goal.isModelsEnabled) goal.addDefinitions(definitions);
|
|
68
|
+
};
|
|
69
|
+
|
|
63
70
|
interface Simplifier {
|
|
64
71
|
reduce(): void;
|
|
65
72
|
release(): void;
|
|
@@ -73,9 +80,7 @@ export const runSimplifier = (
|
|
|
73
80
|
const state = new DependentExprState(goal.manager, goal);
|
|
74
81
|
const simplifier = create(state);
|
|
75
82
|
if (!goal.isProofsEnabled || isSupportingProofs) simplifier.reduce();
|
|
76
|
-
goal
|
|
77
|
-
goal.elimRedundancies();
|
|
78
|
-
goal.depth++;
|
|
83
|
+
finishSimplifier(goal);
|
|
79
84
|
simplifier.release();
|
|
80
85
|
state.release();
|
|
81
86
|
};
|
|
@@ -151,8 +151,7 @@ class DiffNeq {
|
|
|
151
151
|
}
|
|
152
152
|
|
|
153
153
|
private resolveConflict() {
|
|
154
|
-
|
|
155
|
-
const value = this.stack.pop() as number;
|
|
154
|
+
for (let value = this.stack.pop(); value !== undefined; value = this.stack.pop()) {
|
|
156
155
|
const next = this.chooseValue(this.stack.length, value + 1);
|
|
157
156
|
if (next !== -1) {
|
|
158
157
|
this.stack.push(next);
|