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
|
@@ -41,6 +41,7 @@ import { Anum } from "./nlsat/algebraic";
|
|
|
41
41
|
export const KERNEL_ARITH_OPTIONS: ArithRewriterOptions = {
|
|
42
42
|
isSom: true,
|
|
43
43
|
isSortSums: true,
|
|
44
|
+
isArithLhs: false,
|
|
44
45
|
isArithIneqLhs: true,
|
|
45
46
|
isGcdRounding: true,
|
|
46
47
|
isAnumSimp: true,
|
|
@@ -52,6 +53,7 @@ export const KERNEL_ARITH_OPTIONS: ArithRewriterOptions = {
|
|
|
52
53
|
export const TACTIC_ARITH_OPTIONS: ArithRewriterOptions = {
|
|
53
54
|
isSom: false,
|
|
54
55
|
isSortSums: false,
|
|
56
|
+
isArithLhs: false,
|
|
55
57
|
isArithIneqLhs: false,
|
|
56
58
|
isGcdRounding: false,
|
|
57
59
|
isAnumSimp: true,
|
|
@@ -118,7 +120,8 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
118
120
|
]),
|
|
119
121
|
2,
|
|
120
122
|
);
|
|
121
|
-
if (!this.isArithTerm(left) && !this.isArithTerm(right))
|
|
123
|
+
if (!this.options.isArithLhs && !this.isArithTerm(left) && !this.isArithTerm(right))
|
|
124
|
+
return undefined;
|
|
122
125
|
return this.mkLeGeEq(left, right, KIND_EQ);
|
|
123
126
|
}
|
|
124
127
|
|
|
@@ -1259,7 +1262,12 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
1259
1262
|
sides[index] = expr;
|
|
1260
1263
|
};
|
|
1261
1264
|
const cancelled = manager.withTemporaries(
|
|
1262
|
-
() =>
|
|
1265
|
+
() =>
|
|
1266
|
+
this.cancelMonomials(
|
|
1267
|
+
originalLeft,
|
|
1268
|
+
originalRight,
|
|
1269
|
+
this.options.isArithIneqLhs || this.options.isArithLhs,
|
|
1270
|
+
),
|
|
1263
1271
|
(result) => (result === undefined ? [] : [result.lhs, result.rhs]),
|
|
1264
1272
|
);
|
|
1265
1273
|
if (cancelled !== undefined) sides.push(cancelled.lhs, cancelled.rhs);
|
|
@@ -1366,7 +1374,7 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
1366
1374
|
return this.reduce(manager.mkAnd([mkUpper(), lower]), 3);
|
|
1367
1375
|
}
|
|
1368
1376
|
const negated =
|
|
1369
|
-
this.options.isArithIneqLhs && this.manager.isNumeral(right)
|
|
1377
|
+
(this.options.isArithLhs || this.options.isArithIneqLhs) && this.manager.isNumeral(right)
|
|
1370
1378
|
? this.getNegatedPolynomial(left)
|
|
1371
1379
|
: undefined;
|
|
1372
1380
|
if (negated !== undefined) {
|
|
@@ -24,6 +24,7 @@ export class ArrayRewriter {
|
|
|
24
24
|
constructor(
|
|
25
25
|
private manager: AstManager,
|
|
26
26
|
private isSortingStore = false,
|
|
27
|
+
private isExpandingSelects = false,
|
|
27
28
|
) {}
|
|
28
29
|
|
|
29
30
|
private isOp(expr: number, op: number) {
|
|
@@ -193,7 +194,12 @@ export class ArrayRewriter {
|
|
|
193
194
|
(index, position) =>
|
|
194
195
|
manager.isValue(index) && manager.isValue(manager.getArg(array, position + 1)),
|
|
195
196
|
);
|
|
196
|
-
if (
|
|
197
|
+
if (
|
|
198
|
+
!this.isOp(base, OP_CONST_ARRAY) &&
|
|
199
|
+
!areValues &&
|
|
200
|
+
!(this.isExpandingSelects && manager.getRefCount(base) === 1)
|
|
201
|
+
)
|
|
202
|
+
return undefined;
|
|
197
203
|
const selectBase = this.mkApp(OP_SELECT, [base, ...indices]);
|
|
198
204
|
const value = manager.getArg(array, indices.length + 1);
|
|
199
205
|
const eqs = indices.map((index, position) =>
|
|
@@ -208,7 +214,11 @@ export class ArrayRewriter {
|
|
|
208
214
|
if (this.isOp(array, OP_ITE)) {
|
|
209
215
|
const thenArray = manager.getArg(array, 1);
|
|
210
216
|
const elseArray = manager.getArg(array, 2);
|
|
211
|
-
if (
|
|
217
|
+
if (
|
|
218
|
+
!this.isExpandingSelects &&
|
|
219
|
+
manager.getRefCount(thenArray) !== 1 &&
|
|
220
|
+
manager.getRefCount(elseArray) !== 1
|
|
221
|
+
)
|
|
212
222
|
return undefined;
|
|
213
223
|
const thenSelect = this.mkApp(OP_SELECT, [thenArray, ...indices]);
|
|
214
224
|
const elseSelect = this.mkApp(OP_SELECT, [elseArray, ...indices]);
|
|
@@ -14,10 +14,12 @@ import {
|
|
|
14
14
|
import { mkNot } from "./ast-util";
|
|
15
15
|
import { simplifyInjAxiom } from "./inj-axiom";
|
|
16
16
|
import { MacroManager } from "./macro-finder";
|
|
17
|
+
import { ElimBoundsRw } from "./elim-bounds";
|
|
17
18
|
import { DefinedNames, Nnf } from "./nnf";
|
|
18
19
|
import { PatternInference } from "./pattern-inference";
|
|
19
20
|
import { MaxBvSharing } from "./maximize-ac-sharing";
|
|
20
21
|
import { PullQuant } from "./pull-quant";
|
|
22
|
+
import { NgPushAppIteRw } from "./push-app-ite";
|
|
21
23
|
import { RefVector } from "./ref-vector";
|
|
22
24
|
import { KERNEL_REWRITER_OPTIONS, Rewriter } from "./rewriter";
|
|
23
25
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
@@ -68,6 +70,43 @@ export class PatternInferenceRw extends RewriterTpl {
|
|
|
68
70
|
}
|
|
69
71
|
}
|
|
70
72
|
|
|
73
|
+
// Like Z3's, it keeps the definitions it made until a pop, and each reduce asserts them all again.
|
|
74
|
+
class ElimTermIteRw extends RewriterTpl {
|
|
75
|
+
readonly definitions: RefVector;
|
|
76
|
+
private lims: number[] = [];
|
|
77
|
+
|
|
78
|
+
constructor(
|
|
79
|
+
manager: AstManager,
|
|
80
|
+
private names: DefinedNames,
|
|
81
|
+
) {
|
|
82
|
+
super(manager);
|
|
83
|
+
this.definitions = new RefVector(manager);
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
reduceApp(decl: number, args: number[], sort: number) {
|
|
87
|
+
const manager = this.manager;
|
|
88
|
+
if (decl !== OP_ITE || sort === SORT_BOOL) return -1;
|
|
89
|
+
const ite = manager.mkApp(OP_ITE, args, sort);
|
|
90
|
+
manager.incRef(ite);
|
|
91
|
+
const named = this.names.mkName(ite);
|
|
92
|
+
manager.decRef(ite);
|
|
93
|
+
if (named.definition === -1) return -1;
|
|
94
|
+
this.definitions.push(named.definition);
|
|
95
|
+
manager.decRef(named.definition);
|
|
96
|
+
manager.incRef(named.name);
|
|
97
|
+
return named.name;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
push() {
|
|
101
|
+
this.lims.push(this.definitions.size);
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
pop() {
|
|
105
|
+
this.definitions.shrink(this.lims[this.lims.length - 1]);
|
|
106
|
+
this.lims.pop();
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
|
|
71
110
|
const isGreater = (manager: AstManager, left: number, right: number): boolean => {
|
|
72
111
|
if (left === right) return false;
|
|
73
112
|
const isLeftValue = manager.isValue(left);
|
|
@@ -156,9 +195,15 @@ export class AssertedFormulas {
|
|
|
156
195
|
private isReducePending = true;
|
|
157
196
|
private isNnfCnf = true;
|
|
158
197
|
private isEq2Ineq = false;
|
|
198
|
+
private isEliminatingTermIte = false;
|
|
199
|
+
private isLiftingNonGroundIte = false;
|
|
200
|
+
private isEliminatingBounds = false;
|
|
159
201
|
private names: DefinedNames;
|
|
202
|
+
private termIteElim: ElimTermIteRw;
|
|
160
203
|
private patternInference: PatternInferenceRw;
|
|
161
204
|
private bvSharing: MaxBvSharing;
|
|
205
|
+
private ngLiftIte: NgPushAppIteRw;
|
|
206
|
+
private boundsElim: ElimBoundsRw;
|
|
162
207
|
hasQuantifiers = false;
|
|
163
208
|
readonly macros: MacroManager;
|
|
164
209
|
isInconsistent = false;
|
|
@@ -177,8 +222,11 @@ export class AssertedFormulas {
|
|
|
177
222
|
// string literals reach the seq theory as concatenations of units.
|
|
178
223
|
this.rewriter = new Rewriter(manager, { ...KERNEL_REWRITER_OPTIONS, isCoalescingChars: false });
|
|
179
224
|
this.names = new DefinedNames(manager);
|
|
225
|
+
this.termIteElim = new ElimTermIteRw(manager, this.names);
|
|
180
226
|
this.patternInference = new PatternInferenceRw(manager, new PatternInference(manager));
|
|
181
227
|
this.bvSharing = new MaxBvSharing(manager);
|
|
228
|
+
this.ngLiftIte = new NgPushAppIteRw(manager);
|
|
229
|
+
this.boundsElim = new ElimBoundsRw(manager);
|
|
182
230
|
}
|
|
183
231
|
|
|
184
232
|
push() {
|
|
@@ -196,6 +244,7 @@ export class AssertedFormulas {
|
|
|
196
244
|
this.bvSharing.popScope();
|
|
197
245
|
this.macros.popScope();
|
|
198
246
|
this.names.pop();
|
|
247
|
+
this.termIteElim.pop();
|
|
199
248
|
this.substitution.pop();
|
|
200
249
|
this.formulas.shrink(scope.numFormulas);
|
|
201
250
|
this.qhead = scope.numFormulas;
|
|
@@ -207,6 +256,7 @@ export class AssertedFormulas {
|
|
|
207
256
|
this.substitution.push();
|
|
208
257
|
this.scopes.push({ numFormulas: this.formulas.size, isInconsistent: this.isInconsistent });
|
|
209
258
|
this.names.push();
|
|
259
|
+
this.termIteElim.push();
|
|
210
260
|
this.macros.pushScope();
|
|
211
261
|
this.bvSharing.pushScope();
|
|
212
262
|
}
|
|
@@ -232,9 +282,22 @@ export class AssertedFormulas {
|
|
|
232
282
|
setup(config: SmtConfig) {
|
|
233
283
|
this.isNnfCnf = config.isNnfCnf;
|
|
234
284
|
this.isEq2Ineq = config.isEq2Ineq;
|
|
285
|
+
this.isEliminatingTermIte = config.isEliminatingTermIte;
|
|
286
|
+
this.isLiftingNonGroundIte = config.isLiftingNonGroundIte;
|
|
287
|
+
this.isEliminatingBounds = config.isEliminatingBounds;
|
|
235
288
|
this.isFindingMacros ||= config.isFindingMacros;
|
|
236
289
|
}
|
|
237
290
|
|
|
291
|
+
updateParams(config: SmtConfig) {
|
|
292
|
+
this.isNnfCnf = config.isNnfCnf;
|
|
293
|
+
this.isEq2Ineq = config.isEq2Ineq;
|
|
294
|
+
this.isEliminatingTermIte = config.isEliminatingTermIte;
|
|
295
|
+
this.isLiftingNonGroundIte = config.isLiftingNonGroundIte;
|
|
296
|
+
this.isEliminatingBounds = config.isEliminatingBounds;
|
|
297
|
+
this.isFindingMacros = config.isFindingMacros;
|
|
298
|
+
this.isReducePending = true;
|
|
299
|
+
}
|
|
300
|
+
|
|
238
301
|
getNumFormulas() {
|
|
239
302
|
return this.formulas.size;
|
|
240
303
|
}
|
|
@@ -243,55 +306,51 @@ export class AssertedFormulas {
|
|
|
243
306
|
return this.formulas.items;
|
|
244
307
|
}
|
|
245
308
|
|
|
246
|
-
|
|
309
|
+
getQhead() {
|
|
310
|
+
return this.qhead;
|
|
311
|
+
}
|
|
312
|
+
|
|
313
|
+
commit(qhead = this.formulas.size) {
|
|
314
|
+
const committed = this.formulas.items.slice(this.qhead, qhead);
|
|
315
|
+
this.macros.markForbidden(committed);
|
|
316
|
+
for (const formula of committed) this.substitution.update(formula);
|
|
317
|
+
this.qhead = qhead;
|
|
318
|
+
}
|
|
319
|
+
|
|
247
320
|
reduce() {
|
|
248
|
-
if (this.qhead === this.formulas.size) return
|
|
249
|
-
if (!this.
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
if (this.isFindingMacros) this.macros.markForbidden(result);
|
|
253
|
-
for (const formula of result) this.substitution.update(formula);
|
|
254
|
-
this.qhead = this.formulas.size;
|
|
255
|
-
return result;
|
|
256
|
-
}
|
|
257
|
-
|
|
258
|
-
private reduceCore() {
|
|
259
|
-
if (this.macros.hasMacros()) this.findMacros();
|
|
321
|
+
if (this.isInconsistent || this.isCanceled() || this.qhead === this.formulas.size) return;
|
|
322
|
+
if (!this.hasQuantifiers && !this.isPreprocessing) return;
|
|
323
|
+
const isFindingMacros = this.isFindingMacros && this.hasQuantifiers;
|
|
324
|
+
if (this.macros.hasMacros()) this.invoke(isFindingMacros, () => this.findMacros());
|
|
260
325
|
this.setEliminateAnd(false);
|
|
261
|
-
this.propagateValues();
|
|
262
|
-
if (this.
|
|
263
|
-
this.
|
|
264
|
-
if (this.isInconsistent) return;
|
|
265
|
-
if (this.isNnfCnf || this.hasQuantifiers) {
|
|
266
|
-
this.isReducePending = true;
|
|
267
|
-
this.nnfCnf();
|
|
268
|
-
if (this.isInconsistent) return;
|
|
269
|
-
}
|
|
326
|
+
if (!this.invoke(true, () => this.propagateValues())) return;
|
|
327
|
+
if (!this.invoke(isFindingMacros, () => this.findMacros())) return;
|
|
328
|
+
if (!this.invoke(this.isNnfCnf || this.hasQuantifiers, () => this.nnfCnf())) return;
|
|
270
329
|
this.setEliminateAnd(true);
|
|
271
|
-
this.reduceAsserted();
|
|
272
|
-
if (this.
|
|
273
|
-
if (this.
|
|
274
|
-
|
|
275
|
-
if (this.
|
|
276
|
-
this.
|
|
277
|
-
|
|
278
|
-
if (
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
)
|
|
282
|
-
this.isReducePending = true;
|
|
283
|
-
if (this.isInconsistent) return;
|
|
284
|
-
if (this.simplifyFormulas((formula) => this.bvSharing.rewrite(formula)))
|
|
285
|
-
this.isReducePending = true;
|
|
286
|
-
if (this.isInconsistent) return;
|
|
287
|
-
this.reduceAsserted();
|
|
288
|
-
if (this.isInconsistent) return;
|
|
289
|
-
this.isReducePending = true;
|
|
290
|
-
this.flattenClauses();
|
|
291
|
-
if (this.isInconsistent) return;
|
|
330
|
+
if (!this.invoke(true, () => this.reduceAsserted())) return;
|
|
331
|
+
if (!this.invoke(this.isLiftingNonGroundIte, () => this.liftNonGroundIte())) return;
|
|
332
|
+
if (!this.invoke(this.isEliminatingTermIte, () => this.elimTermIte())) return;
|
|
333
|
+
if (!this.invoke(this.hasQuantifiers, () => this.refineInjAxioms())) return;
|
|
334
|
+
if (!this.invoke(isFindingMacros, () => this.findMacros())) return;
|
|
335
|
+
if (!this.invoke(this.isEliminatingBounds && this.hasQuantifiers, () => this.elimBounds()))
|
|
336
|
+
return;
|
|
337
|
+
if (!this.invoke(this.hasQuantifiers, () => this.inferPatterns())) return;
|
|
338
|
+
if (!this.invoke(true, () => this.maximizeBvSharing())) return;
|
|
339
|
+
if (!this.invoke(true, () => this.reduceAsserted())) return;
|
|
340
|
+
if (!this.invoke(true, () => this.flattenClauses())) return;
|
|
292
341
|
this.flushCache();
|
|
293
342
|
}
|
|
294
343
|
|
|
344
|
+
private isCanceled() {
|
|
345
|
+
return !this.manager.limit.inc();
|
|
346
|
+
}
|
|
347
|
+
|
|
348
|
+
private invoke(isApplying: boolean, step: () => void) {
|
|
349
|
+
if (!isApplying) return true;
|
|
350
|
+
step();
|
|
351
|
+
return !this.isInconsistent && !this.isCanceled();
|
|
352
|
+
}
|
|
353
|
+
|
|
295
354
|
private pushAssertion(expr: number, result: RefVector) {
|
|
296
355
|
const manager = this.manager;
|
|
297
356
|
if (this.isInconsistent || manager.isTrue(expr)) return;
|
|
@@ -330,8 +389,43 @@ export class AssertedFormulas {
|
|
|
330
389
|
return formula;
|
|
331
390
|
}
|
|
332
391
|
|
|
392
|
+
private elimTermIte() {
|
|
393
|
+
const elim = this.termIteElim;
|
|
394
|
+
if (!this.simplifyFormulas((formula) => elim.rewrite(formula))) return;
|
|
395
|
+
if (elim.definitions.size > 0) this.isReducePending = true;
|
|
396
|
+
for (const definition of elim.definitions.items) this.formulas.push(definition);
|
|
397
|
+
this.flushCache();
|
|
398
|
+
this.reduceAsserted();
|
|
399
|
+
elim.reset();
|
|
400
|
+
}
|
|
401
|
+
|
|
402
|
+
private simplifyAndReduce(simplify: (formula: number) => number) {
|
|
403
|
+
if (!this.simplifyFormulas(simplify)) return;
|
|
404
|
+
this.flushCache();
|
|
405
|
+
this.reduceAsserted();
|
|
406
|
+
}
|
|
407
|
+
|
|
408
|
+
private liftNonGroundIte() {
|
|
409
|
+
this.simplifyAndReduce((formula) => this.ngLiftIte.rewrite(formula));
|
|
410
|
+
}
|
|
411
|
+
|
|
412
|
+
private refineInjAxioms() {
|
|
413
|
+
this.simplifyFormulas((formula) => this.refineInjAxiom(formula));
|
|
414
|
+
}
|
|
415
|
+
|
|
416
|
+
private elimBounds() {
|
|
417
|
+
this.simplifyAndReduce((formula) => this.boundsElim.rewrite(formula));
|
|
418
|
+
}
|
|
419
|
+
|
|
420
|
+
private inferPatterns() {
|
|
421
|
+
this.simplifyFormulas((formula) => this.patternInference.rewrite(formula));
|
|
422
|
+
}
|
|
423
|
+
|
|
424
|
+
private maximizeBvSharing() {
|
|
425
|
+
if (this.simplifyFormulas((formula) => this.bvSharing.rewrite(formula))) this.reduceAsserted();
|
|
426
|
+
}
|
|
427
|
+
|
|
333
428
|
private findMacros() {
|
|
334
|
-
if (!this.isFindingMacros || !this.hasQuantifiers) return;
|
|
335
429
|
this.isReducePending = true;
|
|
336
430
|
this.swapFormulas(this.macros.find(this.formulas.items.slice(this.qhead)));
|
|
337
431
|
this.flushCache();
|
|
@@ -360,19 +454,22 @@ export class AssertedFormulas {
|
|
|
360
454
|
private simplifyFormulas(simplify: (formula: number) => number) {
|
|
361
455
|
const manager = this.manager;
|
|
362
456
|
const formulas = new RefVector(manager);
|
|
363
|
-
let isChanged = false;
|
|
364
457
|
for (let index = this.qhead; index < this.formulas.size; index++) {
|
|
365
458
|
const formula = this.formulas.items[index];
|
|
366
459
|
const result = simplify(formula);
|
|
367
460
|
if (result === formula) formulas.push(formula);
|
|
368
461
|
else {
|
|
369
462
|
this.pushAssertion(result, formulas);
|
|
370
|
-
|
|
463
|
+
this.isReducePending = true;
|
|
371
464
|
}
|
|
372
465
|
manager.decRef(result);
|
|
466
|
+
if (this.isCanceled()) {
|
|
467
|
+
formulas.reset();
|
|
468
|
+
return false;
|
|
469
|
+
}
|
|
373
470
|
}
|
|
374
471
|
this.swapFormulas(formulas);
|
|
375
|
-
return
|
|
472
|
+
return true;
|
|
376
473
|
}
|
|
377
474
|
|
|
378
475
|
private reduceAsserted() {
|
|
@@ -410,28 +507,42 @@ export class AssertedFormulas {
|
|
|
410
507
|
}
|
|
411
508
|
|
|
412
509
|
private nnfCnf() {
|
|
510
|
+
this.isReducePending = true;
|
|
413
511
|
const manager = this.manager;
|
|
414
512
|
const nnf = new Nnf(manager, this.names);
|
|
415
513
|
const formulas = new RefVector(manager);
|
|
416
514
|
const todo = new RefVector(manager);
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
515
|
+
const isFinished = (() => {
|
|
516
|
+
for (let index = this.qhead; index < this.formulas.size; index++) {
|
|
517
|
+
todo.reset();
|
|
518
|
+
let result = nnf.apply(this.formulas.items[index], todo);
|
|
519
|
+
todo.push(result);
|
|
520
|
+
if (this.isCanceled()) {
|
|
521
|
+
manager.decRef(result);
|
|
522
|
+
return false;
|
|
523
|
+
}
|
|
524
|
+
for (let position = 0; position < todo.size; position++) {
|
|
525
|
+
const rewritten = this.rewriter.rewrite(todo.items[position]);
|
|
526
|
+
manager.decRef(result);
|
|
527
|
+
result = rewritten;
|
|
528
|
+
if (this.isCanceled()) {
|
|
529
|
+
manager.decRef(result);
|
|
530
|
+
return false;
|
|
531
|
+
}
|
|
532
|
+
this.pushAssertion(result, formulas);
|
|
533
|
+
}
|
|
423
534
|
manager.decRef(result);
|
|
424
|
-
result = rewritten;
|
|
425
|
-
this.pushAssertion(result, formulas);
|
|
426
535
|
}
|
|
427
|
-
|
|
428
|
-
}
|
|
429
|
-
this.swapFormulas(formulas);
|
|
536
|
+
return true;
|
|
537
|
+
})();
|
|
538
|
+
if (isFinished) this.swapFormulas(formulas);
|
|
430
539
|
todo.reset();
|
|
540
|
+
formulas.reset();
|
|
431
541
|
nnf.release();
|
|
432
542
|
}
|
|
433
543
|
|
|
434
544
|
private flattenClauses() {
|
|
545
|
+
this.isReducePending = true;
|
|
435
546
|
const manager = this.manager;
|
|
436
547
|
const mkNegation = (expr: number) =>
|
|
437
548
|
manager.isNot(expr) ? manager.getArg(expr, 0) : manager.mkApp(OP_NOT, [expr], SORT_BOOL);
|
|
@@ -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);
|
|
@@ -983,9 +1007,11 @@ export class AstManager {
|
|
|
983
1007
|
withoutTemporaries<T>(body: () => T) {
|
|
984
1008
|
const outer = this.temporariesMark;
|
|
985
1009
|
this.temporariesMark = -1;
|
|
986
|
-
|
|
987
|
-
|
|
988
|
-
|
|
1010
|
+
try {
|
|
1011
|
+
return body();
|
|
1012
|
+
} finally {
|
|
1013
|
+
this.temporariesMark = outer;
|
|
1014
|
+
}
|
|
989
1015
|
}
|
|
990
1016
|
|
|
991
1017
|
releaseLater(expr: number) {
|
|
@@ -1290,7 +1316,7 @@ export class AstManager {
|
|
|
1290
1316
|
return this.sortNames.length - 1;
|
|
1291
1317
|
}
|
|
1292
1318
|
|
|
1293
|
-
// Z3 makes the Char
|
|
1319
|
+
// Z3 makes the Char and String sorts at startup, so they take no small id.
|
|
1294
1320
|
mkCharSort() {
|
|
1295
1321
|
if (this.charSort === -1)
|
|
1296
1322
|
this.charSort = this.addSort(
|
|
@@ -1315,8 +1341,18 @@ export class AstManager {
|
|
|
1315
1341
|
return this.stringSort;
|
|
1316
1342
|
}
|
|
1317
1343
|
|
|
1344
|
+
initSeqPlugin() {
|
|
1345
|
+
if (this.isSeqPluginInitialized) return;
|
|
1346
|
+
this.isSeqPluginInitialized = true;
|
|
1347
|
+
const element = this.mkTypeParameter(0);
|
|
1348
|
+
this.mkReSort(this.mkSeqSort(element));
|
|
1349
|
+
this.mkReSort(this.mkStringSort());
|
|
1350
|
+
this.mkArraySort([element, SORT_BOOL]);
|
|
1351
|
+
}
|
|
1352
|
+
|
|
1318
1353
|
mkSeqSort(element: number) {
|
|
1319
1354
|
if (element === this.mkCharSort()) return this.mkStringSort();
|
|
1355
|
+
this.initSeqPlugin();
|
|
1320
1356
|
const key = `s${element}`;
|
|
1321
1357
|
const existing = this.seqSorts.get(key);
|
|
1322
1358
|
if (existing !== undefined) return existing;
|
|
@@ -1335,6 +1371,7 @@ export class AstManager {
|
|
|
1335
1371
|
}
|
|
1336
1372
|
|
|
1337
1373
|
mkReSort(seq: number) {
|
|
1374
|
+
this.initSeqPlugin();
|
|
1338
1375
|
const isReglan = seq === this.mkStringSort();
|
|
1339
1376
|
if (isReglan && this.reglanSort !== -1) return this.reglanSort;
|
|
1340
1377
|
const key = `r${seq}`;
|
|
@@ -1349,11 +1386,9 @@ export class AstManager {
|
|
|
1349
1386
|
getInfoHash(Z3_SEQ_FAMILY, Z3_RE_SORT, [this.sortHashes[seq]]),
|
|
1350
1387
|
),
|
|
1351
1388
|
);
|
|
1389
|
+
this.mkSmallId();
|
|
1352
1390
|
if (isReglan) this.reglanSort = sort;
|
|
1353
|
-
else
|
|
1354
|
-
this.mkSmallId();
|
|
1355
|
-
this.seqSorts.set(key, sort);
|
|
1356
|
-
}
|
|
1391
|
+
else this.seqSorts.set(key, sort);
|
|
1357
1392
|
return sort;
|
|
1358
1393
|
}
|
|
1359
1394
|
|
|
@@ -1732,7 +1767,7 @@ export class AstManager {
|
|
|
1732
1767
|
throw new SmtInvariantError(`the operator ${op} has no Z3 declaration`);
|
|
1733
1768
|
const argSort = op === OP_ITE ? this.sorts[args[1]] : this.sorts[args[0]];
|
|
1734
1769
|
const arity = builtin[2] === -1 ? args.length : builtin[2];
|
|
1735
|
-
const domain = Array.from({ length: arity }, (
|
|
1770
|
+
const domain = Array.from({ length: arity }, (_value, index) =>
|
|
1736
1771
|
op === OP_PATTERN
|
|
1737
1772
|
? this.sorts[args[index]]
|
|
1738
1773
|
: op === OP_ITE && index === 0
|
|
@@ -1873,6 +1908,20 @@ export class AstManager {
|
|
|
1873
1908
|
return decl;
|
|
1874
1909
|
}
|
|
1875
1910
|
|
|
1911
|
+
mkPbAuxBool() {
|
|
1912
|
+
const decl = this.addDecl(
|
|
1913
|
+
this.mkFreshVarName("pb"),
|
|
1914
|
+
FAMILY_PB,
|
|
1915
|
+
OP_PB_AUX_BOOL,
|
|
1916
|
+
[],
|
|
1917
|
+
SORT_BOOL,
|
|
1918
|
+
[],
|
|
1919
|
+
getInfoHash(Z3_PB_FAMILY, OP_PB_AUX_BOOL - PB_OP_BASE, []),
|
|
1920
|
+
);
|
|
1921
|
+
this.declRefCounts[decl] = 0;
|
|
1922
|
+
return this.mkApp(decl, [], SORT_BOOL);
|
|
1923
|
+
}
|
|
1924
|
+
|
|
1876
1925
|
mkFreshVarName(prefix: string | null) {
|
|
1877
1926
|
return `${prefix ?? "var"}!${this.mkFreshId()}`;
|
|
1878
1927
|
}
|
|
@@ -2051,7 +2100,7 @@ export class AstManager {
|
|
|
2051
2100
|
}
|
|
2052
2101
|
|
|
2053
2102
|
get am() {
|
|
2054
|
-
this.algebraicManager ??= new AlgebraicManager();
|
|
2103
|
+
this.algebraicManager ??= new AlgebraicManager(this.limit);
|
|
2055
2104
|
return this.algebraicManager;
|
|
2056
2105
|
}
|
|
2057
2106
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SmtInvariantError } from "../../../errors";
|
|
2
|
-
import { OP_ITE, OP_LT, SORT_BOOL, SORT_INT, isArithSort, type AstManager } from "./ast";
|
|
2
|
+
import { KIND_APP, OP_ITE, OP_LT, SORT_BOOL, SORT_INT, isArithSort, type AstManager } from "./ast";
|
|
3
3
|
import { combineHash } from "./hash";
|
|
4
4
|
import { ObjHashtable, ObjMap } from "./hashtable";
|
|
5
5
|
import { FuncInterp, type ProtoModel } from "./proto-model";
|
|
@@ -245,14 +245,30 @@ export class AufSolver {
|
|
|
245
245
|
|
|
246
246
|
private cleanupInstantiationSets() {
|
|
247
247
|
const manager = this.manager;
|
|
248
|
+
const containsArray = (expr: number) => {
|
|
249
|
+
const visited = new Set<number>();
|
|
250
|
+
const todo = [expr];
|
|
251
|
+
for (let term = todo.pop(); term !== undefined; term = todo.pop()) {
|
|
252
|
+
if (visited.has(term)) continue;
|
|
253
|
+
visited.add(term);
|
|
254
|
+
if (manager.isArraySort(manager.sorts[term])) return true;
|
|
255
|
+
manager.pushArgs(term, todo);
|
|
256
|
+
}
|
|
257
|
+
return false;
|
|
258
|
+
};
|
|
259
|
+
const shouldCleanup = (value: number | null) =>
|
|
260
|
+
value === null ||
|
|
261
|
+
(!manager.isValue(value) &&
|
|
262
|
+
!manager.isArraySort(manager.sorts[value]) &&
|
|
263
|
+
(manager.kinds[value] !== KIND_APP ||
|
|
264
|
+
manager.getNumArgs(value) === 0 ||
|
|
265
|
+
!containsArray(value)));
|
|
248
266
|
for (const node of this.nodes) {
|
|
249
267
|
if (!node.isRoot()) continue;
|
|
250
268
|
const set = node.getInstantiationSet();
|
|
251
269
|
const toDelete: number[] = [];
|
|
252
|
-
for (const term of set.elems.keys())
|
|
253
|
-
|
|
254
|
-
if (value === null || !manager.isUniqueValue(value)) toDelete.push(term);
|
|
255
|
-
}
|
|
270
|
+
for (const term of set.elems.keys())
|
|
271
|
+
if (shouldCleanup(this.eval(term, true))) toDelete.push(term);
|
|
256
272
|
for (const term of toDelete) set.remove(term);
|
|
257
273
|
this.resetEvalCache();
|
|
258
274
|
}
|
|
@@ -285,18 +301,13 @@ export class AufSolver {
|
|
|
285
301
|
return result;
|
|
286
302
|
}
|
|
287
303
|
|
|
288
|
-
private areDistinct(first: number, second: number) {
|
|
289
|
-
const manager = this.manager;
|
|
290
|
-
return first !== second && manager.isUniqueValue(first) && manager.isUniqueValue(second);
|
|
291
|
-
}
|
|
292
|
-
|
|
293
304
|
private pickInstanceDiffExceptions(node: Node, exceptionValues: number[]) {
|
|
294
305
|
let result: number | null = null;
|
|
295
306
|
let resultGeneration = Number.POSITIVE_INFINITY;
|
|
296
307
|
for (const entry of node.getInstantiationSet().elems) {
|
|
297
308
|
const value = this.eval(entry[0], true);
|
|
298
309
|
if (value === null) return result;
|
|
299
|
-
const isFound = exceptionValues.some((other) => !this.areDistinct(value, other));
|
|
310
|
+
const isFound = exceptionValues.some((other) => !this.manager.areDistinct(value, other));
|
|
300
311
|
if (!isFound && (result === null || entry[1] < resultGeneration)) {
|
|
301
312
|
result = entry[0];
|
|
302
313
|
resultGeneration = entry[1];
|
|
@@ -331,7 +342,7 @@ export class AufSolver {
|
|
|
331
342
|
if (kValue === null) return false;
|
|
332
343
|
for (const exception of exceptions) {
|
|
333
344
|
const value = this.eval(exception, true);
|
|
334
|
-
if (value !== null && !this.areDistinct(kValue, value))
|
|
345
|
+
if (value !== null && !this.manager.areDistinct(kValue, value))
|
|
335
346
|
this.newConstraints.push(this.manager.mkNot(this.manager.mkEq(k, exception)));
|
|
336
347
|
}
|
|
337
348
|
return true;
|