tla-ts 0.0.10-dev.37a75eb5b → 0.0.10-dev.45c0eaef5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +33 -33
- package/dist/deciders.js +53 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +17 -3
- package/dist/index.d.ts +17 -3
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +55 -55
- package/dist/prove.js +78 -78
- package/dist/run.cjs +40 -42
- package/dist/run.js +42 -44
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +96 -91
- package/dist/transfer.js +95 -90
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +31 -3
- package/src/bags.ts +12 -10
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +13 -11
- package/src/check-trace.ts +146 -93
- package/src/check.ts +418 -246
- package/src/cli/tlc-output.ts +17 -2
- package/src/cli/tlc.ts +5 -4
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +23 -10
- package/src/coverage.ts +255 -18
- package/src/dependencies.ts +68 -15
- package/src/dfid.ts +93 -35
- package/src/environment.ts +106 -39
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +415 -132
- package/src/exit-codes.ts +28 -15
- package/src/instances.ts +135 -11
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +674 -236
- package/src/lexer.ts +12 -2
- package/src/liveness-checker.ts +161 -60
- package/src/liveness.ts +55 -10
- package/src/obligations/index.ts +1 -1
- package/src/obligations/normalize.ts +1 -4
- package/src/obligations/printer.ts +5 -5
- package/src/obligations/source.ts +2 -0
- package/src/parser.ts +110 -111
- package/src/prover/isabelle/isar/attrib.ts +4 -4
- package/src/prover/isabelle/isar/rule-cases.ts +8 -6
- package/src/prover/isabelle/provers/clasimp.ts +1 -1
- package/src/prover/isabelle/provers/hypsubst.ts +2 -2
- package/src/prover/isabelle/pure/rewriter.ts +3 -3
- package/src/prover/isabelle/pure/term.ts +3 -3
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/smt/rewrite.ts +2 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/arith-rewriter.ts +11 -3
- package/src/prover/smt/solver/array-rewriter.ts +12 -2
- package/src/prover/smt/solver/asserted-formulas.ts +164 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +65 -13
- package/src/prover/smt/solver/auf-solver.ts +23 -12
- package/src/prover/smt/solver/bit-blast-tactic.ts +27 -1
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-simplifier.ts +11 -13
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
- package/src/prover/smt/solver/bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/card2bv.ts +35 -18
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
- package/src/prover/smt/solver/context.ts +65 -14
- package/src/prover/smt/solver/ctx-simplify.ts +1 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
- package/src/prover/smt/solver/dependent-expr-state.ts +28 -16
- package/src/prover/smt/solver/diff-neq.ts +1 -2
- package/src/prover/smt/solver/dt2bv-tactic.ts +57 -21
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +5 -8
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/egraph.ts +3 -9
- package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
- package/src/prover/smt/solver/euf/mam.ts +1 -5
- package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
- package/src/prover/smt/solver/euf/th-solver.ts +0 -7
- package/src/prover/smt/solver/fd-solver.ts +608 -141
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
- package/src/prover/smt/solver/goal.ts +4 -3
- package/src/prover/smt/solver/hashtable.ts +4 -0
- package/src/prover/smt/solver/internalizer.ts +1 -1
- package/src/prover/smt/solver/logic-tactics.ts +15 -5
- package/src/prover/smt/solver/lp/core-solver.ts +12 -8
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -2
- package/src/prover/smt/solver/lp/nla-grobner.ts +2 -2
- package/src/prover/smt/solver/lp/pdd.ts +2 -3
- package/src/prover/smt/solver/lp/union-find.ts +1 -1
- package/src/prover/smt/solver/mam-compiler.ts +1 -1
- package/src/prover/smt/solver/maxcore.ts +2 -1
- package/src/prover/smt/solver/maxsmt-base.ts +1 -0
- package/src/prover/smt/solver/model-based-opt.ts +1 -1
- package/src/prover/smt/solver/model-checker.ts +1 -1
- package/src/prover/smt/solver/model-evaluator.ts +2 -0
- package/src/prover/smt/solver/model-generator.ts +85 -43
- package/src/prover/smt/solver/mpf.ts +2 -4
- package/src/prover/smt/solver/mus.ts +2 -3
- package/src/prover/smt/solver/muz/dl-context.ts +14 -42
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
- package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
- package/src/prover/smt/solver/muz/hnf.ts +2 -2
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -2
- package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -1
- package/src/prover/smt/solver/nlqsat.ts +1 -1
- package/src/prover/smt/solver/nlsat/algebraic.ts +4 -5
- package/src/prover/smt/solver/nlsat/levelwise.ts +0 -4
- package/src/prover/smt/solver/nlsat/polynomial.ts +1 -36
- package/src/prover/smt/solver/nlsat/upolynomial.ts +1 -1
- package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
- package/src/prover/smt/solver/nnf.ts +6 -2
- package/src/prover/smt/solver/opt-context.ts +16 -7
- package/src/prover/smt/solver/opt-pareto.ts +19 -0
- package/src/prover/smt/solver/opt-preprocess.ts +1 -1
- package/src/prover/smt/solver/opt-solver.ts +4 -3
- package/src/prover/smt/solver/optsmt.ts +1 -1
- package/src/prover/smt/solver/parallel-tactic.ts +1 -1
- package/src/prover/smt/solver/pb-rewriter.ts +1 -4
- package/src/prover/smt/solver/poly-rewriter.ts +75 -18
- package/src/prover/smt/solver/probes.ts +88 -23
- package/src/prover/smt/solver/proto-model.ts +8 -8
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
- package/src/prover/smt/solver/qe-lite.ts +2 -2
- package/src/prover/smt/solver/qe.ts +3 -2
- package/src/prover/smt/solver/qsat.ts +23 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
- package/src/prover/smt/solver/rewriter.ts +31 -25
- package/src/prover/smt/solver/rlimit.ts +7 -3
- package/src/prover/smt/solver/sat/config.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +65 -12
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +129 -43
- package/src/prover/smt/solver/sat/model-converter.ts +1 -1
- package/src/prover/smt/solver/sat/pb-constraint.ts +7 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +26 -7
- package/src/prover/smt/solver/sat/sat-tactic.ts +15 -6
- package/src/prover/smt/solver/sat/sat2goal.ts +72 -48
- package/src/prover/smt/solver/sat/simplifier.ts +1 -1
- package/src/prover/smt/solver/sat/solver.ts +27 -47
- package/src/prover/smt/solver/seq-axioms.ts +20 -35
- package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
- package/src/prover/smt/solver/seq-derive.ts +1 -1
- package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
- package/src/prover/smt/solver/seq-monadic.ts +7 -5
- package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
- package/src/prover/smt/solver/seq-re-util.ts +1 -1
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
- package/src/prover/smt/solver/seq-regex-live.ts +2 -2
- package/src/prover/smt/solver/seq-rewriter.ts +31 -29
- package/src/prover/smt/solver/seq-skolem.ts +0 -23
- package/src/prover/smt/solver/seq-view-witness.ts +4 -4
- package/src/prover/smt/solver/smt-consequences.ts +1 -1
- package/src/prover/smt/solver/smt-kernel.ts +40 -6
- package/src/prover/smt/solver/smt-setup.ts +106 -13
- package/src/prover/smt/solver/smtlib-parser.ts +579 -214
- package/src/prover/smt/solver/smtlib-script.ts +600 -170
- package/src/prover/smt/solver/solve-eqs.ts +36 -37
- package/src/prover/smt/solver/solver.ts +18 -3
- package/src/prover/smt/solver/tactic.ts +342 -196
- package/src/prover/smt/solver/theory-bv.ts +13 -3
- package/src/prover/smt/solver/theory-fpa.ts +1 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
- package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
- package/src/prover/smt/solver/theory-lra-state.ts +1 -1
- package/src/prover/smt/solver/theory-lra.ts +1 -1
- package/src/prover/smt/solver/theory-pb.ts +24 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
- package/src/prover/smt/solver/theory-seq-state.ts +2 -21
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +1 -0
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/index-table.ts +5 -2
- package/src/prover/zenon/isar-case.ts +1 -1
- package/src/prover/zenon/isar.ts +2 -2
- package/src/prover/zenon/phrase.ts +1 -1
- package/src/resolve.ts +1226 -246
- package/src/runtime.ts +19 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +4 -2
- package/src/sany/generator-def-entries.ts +123 -36
- package/src/sany/generator-definitions.ts +4 -2
- package/src/sany/generator-expressions.ts +51 -20
- package/src/sany/generator-proofs.ts +17 -11
- package/src/sany/generator.ts +11 -5
- package/src/sany/lexer.ts +15 -7
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +283 -126
- package/src/simulate.ts +247 -185
- package/src/spec-description.ts +15 -7
- package/src/standard-definitions.ts +1 -0
- package/src/standard-modules.ts +56 -22
- package/src/subexpressions.ts +563 -139
- package/src/successors.ts +50 -20
- package/src/symmetry.ts +2 -1
- package/src/tlc/jar-data.ts +1 -3
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/random.ts +2 -1
- package/src/tlc/replay.ts +147 -46
- package/src/tlc/tlc-operators.ts +10 -8
- package/src/tlc/tlcext-operators.ts +26 -10
- package/src/tlc/trace-spec.ts +9 -22
- package/src/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +52 -31
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +150 -79
|
@@ -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;
|
|
@@ -204,9 +253,12 @@ export class AssertedFormulas {
|
|
|
204
253
|
|
|
205
254
|
private forcePush() {
|
|
206
255
|
for (; this.numLazyScopes > 0; this.numLazyScopes--) {
|
|
256
|
+
this.reduce();
|
|
257
|
+
this.commit();
|
|
207
258
|
this.substitution.push();
|
|
208
259
|
this.scopes.push({ numFormulas: this.formulas.size, isInconsistent: this.isInconsistent });
|
|
209
260
|
this.names.push();
|
|
261
|
+
this.termIteElim.push();
|
|
210
262
|
this.macros.pushScope();
|
|
211
263
|
this.bvSharing.pushScope();
|
|
212
264
|
}
|
|
@@ -232,12 +284,18 @@ export class AssertedFormulas {
|
|
|
232
284
|
setup(config: SmtConfig) {
|
|
233
285
|
this.isNnfCnf = config.isNnfCnf;
|
|
234
286
|
this.isEq2Ineq = config.isEq2Ineq;
|
|
287
|
+
this.isEliminatingTermIte = config.isEliminatingTermIte;
|
|
288
|
+
this.isLiftingNonGroundIte = config.isLiftingNonGroundIte;
|
|
289
|
+
this.isEliminatingBounds = config.isEliminatingBounds;
|
|
235
290
|
this.isFindingMacros ||= config.isFindingMacros;
|
|
236
291
|
}
|
|
237
292
|
|
|
238
293
|
updateParams(config: SmtConfig) {
|
|
239
294
|
this.isNnfCnf = config.isNnfCnf;
|
|
240
295
|
this.isEq2Ineq = config.isEq2Ineq;
|
|
296
|
+
this.isEliminatingTermIte = config.isEliminatingTermIte;
|
|
297
|
+
this.isLiftingNonGroundIte = config.isLiftingNonGroundIte;
|
|
298
|
+
this.isEliminatingBounds = config.isEliminatingBounds;
|
|
241
299
|
this.isFindingMacros = config.isFindingMacros;
|
|
242
300
|
this.isReducePending = true;
|
|
243
301
|
}
|
|
@@ -250,55 +308,51 @@ export class AssertedFormulas {
|
|
|
250
308
|
return this.formulas.items;
|
|
251
309
|
}
|
|
252
310
|
|
|
253
|
-
|
|
311
|
+
getQhead() {
|
|
312
|
+
return this.qhead;
|
|
313
|
+
}
|
|
314
|
+
|
|
315
|
+
commit(qhead = this.formulas.size) {
|
|
316
|
+
const committed = this.formulas.items.slice(this.qhead, qhead);
|
|
317
|
+
this.macros.markForbidden(committed);
|
|
318
|
+
for (const formula of committed) this.substitution.update(formula);
|
|
319
|
+
this.qhead = qhead;
|
|
320
|
+
}
|
|
321
|
+
|
|
254
322
|
reduce() {
|
|
255
|
-
if (this.qhead === this.formulas.size) return
|
|
256
|
-
if (!this.
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
this.macros.markForbidden(result);
|
|
260
|
-
for (const formula of result) this.substitution.update(formula);
|
|
261
|
-
this.qhead = this.formulas.size;
|
|
262
|
-
return result;
|
|
263
|
-
}
|
|
264
|
-
|
|
265
|
-
private reduceCore() {
|
|
266
|
-
if (this.macros.hasMacros()) this.findMacros();
|
|
323
|
+
if (this.isInconsistent || this.isCanceled() || this.qhead === this.formulas.size) return;
|
|
324
|
+
if (!this.hasQuantifiers && !this.isPreprocessing) return;
|
|
325
|
+
const isFindingMacros = this.isFindingMacros && this.hasQuantifiers;
|
|
326
|
+
if (this.macros.hasMacros()) this.invoke(isFindingMacros, () => this.findMacros());
|
|
267
327
|
this.setEliminateAnd(false);
|
|
268
|
-
this.propagateValues();
|
|
269
|
-
if (this.
|
|
270
|
-
this.
|
|
271
|
-
if (this.isInconsistent) return;
|
|
272
|
-
if (this.isNnfCnf || this.hasQuantifiers) {
|
|
273
|
-
this.isReducePending = true;
|
|
274
|
-
this.nnfCnf();
|
|
275
|
-
if (this.isInconsistent) return;
|
|
276
|
-
}
|
|
328
|
+
if (!this.invoke(true, () => this.propagateValues())) return;
|
|
329
|
+
if (!this.invoke(isFindingMacros, () => this.findMacros())) return;
|
|
330
|
+
if (!this.invoke(this.isNnfCnf || this.hasQuantifiers, () => this.nnfCnf())) return;
|
|
277
331
|
this.setEliminateAnd(true);
|
|
278
|
-
this.reduceAsserted();
|
|
279
|
-
if (this.
|
|
280
|
-
if (this.
|
|
281
|
-
|
|
282
|
-
if (this.
|
|
283
|
-
this.
|
|
284
|
-
|
|
285
|
-
if (
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
)
|
|
289
|
-
this.isReducePending = true;
|
|
290
|
-
if (this.isInconsistent) return;
|
|
291
|
-
if (this.simplifyFormulas((formula) => this.bvSharing.rewrite(formula)))
|
|
292
|
-
this.isReducePending = true;
|
|
293
|
-
if (this.isInconsistent) return;
|
|
294
|
-
this.reduceAsserted();
|
|
295
|
-
if (this.isInconsistent) return;
|
|
296
|
-
this.isReducePending = true;
|
|
297
|
-
this.flattenClauses();
|
|
298
|
-
if (this.isInconsistent) return;
|
|
332
|
+
if (!this.invoke(true, () => this.reduceAsserted())) return;
|
|
333
|
+
if (!this.invoke(this.isLiftingNonGroundIte, () => this.liftNonGroundIte())) return;
|
|
334
|
+
if (!this.invoke(this.isEliminatingTermIte, () => this.elimTermIte())) return;
|
|
335
|
+
if (!this.invoke(this.hasQuantifiers, () => this.refineInjAxioms())) return;
|
|
336
|
+
if (!this.invoke(isFindingMacros, () => this.findMacros())) return;
|
|
337
|
+
if (!this.invoke(this.isEliminatingBounds && this.hasQuantifiers, () => this.elimBounds()))
|
|
338
|
+
return;
|
|
339
|
+
if (!this.invoke(this.hasQuantifiers, () => this.inferPatterns())) return;
|
|
340
|
+
if (!this.invoke(true, () => this.maximizeBvSharing())) return;
|
|
341
|
+
if (!this.invoke(true, () => this.reduceAsserted())) return;
|
|
342
|
+
if (!this.invoke(true, () => this.flattenClauses())) return;
|
|
299
343
|
this.flushCache();
|
|
300
344
|
}
|
|
301
345
|
|
|
346
|
+
private isCanceled() {
|
|
347
|
+
return !this.manager.limit.inc();
|
|
348
|
+
}
|
|
349
|
+
|
|
350
|
+
private invoke(isApplying: boolean, step: () => void) {
|
|
351
|
+
if (!isApplying) return true;
|
|
352
|
+
step();
|
|
353
|
+
return !this.isInconsistent && !this.isCanceled();
|
|
354
|
+
}
|
|
355
|
+
|
|
302
356
|
private pushAssertion(expr: number, result: RefVector) {
|
|
303
357
|
const manager = this.manager;
|
|
304
358
|
if (this.isInconsistent || manager.isTrue(expr)) return;
|
|
@@ -337,8 +391,43 @@ export class AssertedFormulas {
|
|
|
337
391
|
return formula;
|
|
338
392
|
}
|
|
339
393
|
|
|
394
|
+
private elimTermIte() {
|
|
395
|
+
const elim = this.termIteElim;
|
|
396
|
+
if (!this.simplifyFormulas((formula) => elim.rewrite(formula))) return;
|
|
397
|
+
if (elim.definitions.size > 0) this.isReducePending = true;
|
|
398
|
+
for (const definition of elim.definitions.items) this.formulas.push(definition);
|
|
399
|
+
this.flushCache();
|
|
400
|
+
this.reduceAsserted();
|
|
401
|
+
elim.reset();
|
|
402
|
+
}
|
|
403
|
+
|
|
404
|
+
private simplifyAndReduce(simplify: (formula: number) => number) {
|
|
405
|
+
if (!this.simplifyFormulas(simplify)) return;
|
|
406
|
+
this.flushCache();
|
|
407
|
+
this.reduceAsserted();
|
|
408
|
+
}
|
|
409
|
+
|
|
410
|
+
private liftNonGroundIte() {
|
|
411
|
+
this.simplifyAndReduce((formula) => this.ngLiftIte.rewrite(formula));
|
|
412
|
+
}
|
|
413
|
+
|
|
414
|
+
private refineInjAxioms() {
|
|
415
|
+
this.simplifyFormulas((formula) => this.refineInjAxiom(formula));
|
|
416
|
+
}
|
|
417
|
+
|
|
418
|
+
private elimBounds() {
|
|
419
|
+
this.simplifyAndReduce((formula) => this.boundsElim.rewrite(formula));
|
|
420
|
+
}
|
|
421
|
+
|
|
422
|
+
private inferPatterns() {
|
|
423
|
+
this.simplifyFormulas((formula) => this.patternInference.rewrite(formula));
|
|
424
|
+
}
|
|
425
|
+
|
|
426
|
+
private maximizeBvSharing() {
|
|
427
|
+
if (this.simplifyFormulas((formula) => this.bvSharing.rewrite(formula))) this.reduceAsserted();
|
|
428
|
+
}
|
|
429
|
+
|
|
340
430
|
private findMacros() {
|
|
341
|
-
if (!this.isFindingMacros || !this.hasQuantifiers) return;
|
|
342
431
|
this.isReducePending = true;
|
|
343
432
|
this.swapFormulas(this.macros.find(this.formulas.items.slice(this.qhead)));
|
|
344
433
|
this.flushCache();
|
|
@@ -367,19 +456,22 @@ export class AssertedFormulas {
|
|
|
367
456
|
private simplifyFormulas(simplify: (formula: number) => number) {
|
|
368
457
|
const manager = this.manager;
|
|
369
458
|
const formulas = new RefVector(manager);
|
|
370
|
-
let isChanged = false;
|
|
371
459
|
for (let index = this.qhead; index < this.formulas.size; index++) {
|
|
372
460
|
const formula = this.formulas.items[index];
|
|
373
461
|
const result = simplify(formula);
|
|
374
462
|
if (result === formula) formulas.push(formula);
|
|
375
463
|
else {
|
|
376
464
|
this.pushAssertion(result, formulas);
|
|
377
|
-
|
|
465
|
+
this.isReducePending = true;
|
|
378
466
|
}
|
|
379
467
|
manager.decRef(result);
|
|
468
|
+
if (this.isCanceled()) {
|
|
469
|
+
formulas.reset();
|
|
470
|
+
return false;
|
|
471
|
+
}
|
|
380
472
|
}
|
|
381
473
|
this.swapFormulas(formulas);
|
|
382
|
-
return
|
|
474
|
+
return true;
|
|
383
475
|
}
|
|
384
476
|
|
|
385
477
|
private reduceAsserted() {
|
|
@@ -417,28 +509,42 @@ export class AssertedFormulas {
|
|
|
417
509
|
}
|
|
418
510
|
|
|
419
511
|
private nnfCnf() {
|
|
512
|
+
this.isReducePending = true;
|
|
420
513
|
const manager = this.manager;
|
|
421
514
|
const nnf = new Nnf(manager, this.names);
|
|
422
515
|
const formulas = new RefVector(manager);
|
|
423
516
|
const todo = new RefVector(manager);
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
517
|
+
const isFinished = (() => {
|
|
518
|
+
for (let index = this.qhead; index < this.formulas.size; index++) {
|
|
519
|
+
todo.reset();
|
|
520
|
+
let result = nnf.apply(this.formulas.items[index], todo);
|
|
521
|
+
todo.push(result);
|
|
522
|
+
if (this.isCanceled()) {
|
|
523
|
+
manager.decRef(result);
|
|
524
|
+
return false;
|
|
525
|
+
}
|
|
526
|
+
for (let position = 0; position < todo.size; position++) {
|
|
527
|
+
const rewritten = this.rewriter.rewrite(todo.items[position]);
|
|
528
|
+
manager.decRef(result);
|
|
529
|
+
result = rewritten;
|
|
530
|
+
if (this.isCanceled()) {
|
|
531
|
+
manager.decRef(result);
|
|
532
|
+
return false;
|
|
533
|
+
}
|
|
534
|
+
this.pushAssertion(result, formulas);
|
|
535
|
+
}
|
|
430
536
|
manager.decRef(result);
|
|
431
|
-
result = rewritten;
|
|
432
|
-
this.pushAssertion(result, formulas);
|
|
433
537
|
}
|
|
434
|
-
|
|
435
|
-
}
|
|
436
|
-
this.swapFormulas(formulas);
|
|
538
|
+
return true;
|
|
539
|
+
})();
|
|
540
|
+
if (isFinished) this.swapFormulas(formulas);
|
|
437
541
|
todo.reset();
|
|
542
|
+
formulas.reset();
|
|
438
543
|
nnf.release();
|
|
439
544
|
}
|
|
440
545
|
|
|
441
546
|
private flattenClauses() {
|
|
547
|
+
this.isReducePending = true;
|
|
442
548
|
const manager = this.manager;
|
|
443
549
|
const mkNegation = (expr: number) =>
|
|
444
550
|
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;
|
|
@@ -36,6 +36,9 @@ export const FAMILY_LABEL = 11;
|
|
|
36
36
|
export const FAMILY_PB = 12;
|
|
37
37
|
export const FAMILY_RECFUN = 13;
|
|
38
38
|
export const FAMILY_POLY = 14;
|
|
39
|
+
export const FAMILY_DATALOG_RELATION = 15;
|
|
40
|
+
export const FAMILY_FF = 16;
|
|
41
|
+
export const FAMILY_SPECIAL_RELATIONS = 17;
|
|
39
42
|
|
|
40
43
|
export const OP_TRUE = 0;
|
|
41
44
|
export const OP_FALSE = 1;
|
|
@@ -298,7 +301,6 @@ export const OP_INTERNAL_STRING_STRIDOF = SEQ_OP_BASE + 64;
|
|
|
298
301
|
export const OP_INTERNAL_STRING_POWER = SEQ_OP_BASE + 65;
|
|
299
302
|
export const OP_INTERNAL_REGEXP_EMPTY = SEQ_OP_BASE + 66;
|
|
300
303
|
export const OP_INTERNAL_REGEXP_FULL_CHAR = SEQ_OP_BASE + 67;
|
|
301
|
-
export const OP_RE_IS_NULLABLE = SEQ_OP_BASE + 68;
|
|
302
304
|
export const OP_SEQ_SKOLEM = SEQ_OP_BASE + 69;
|
|
303
305
|
const CHAR_OP_BASE = 600;
|
|
304
306
|
export const OP_CHAR_CONST = CHAR_OP_BASE;
|
|
@@ -316,6 +318,7 @@ export const OP_AT_LEAST_K = PB_OP_BASE + 1;
|
|
|
316
318
|
export const OP_PB_LE = PB_OP_BASE + 2;
|
|
317
319
|
export const OP_PB_GE = PB_OP_BASE + 3;
|
|
318
320
|
export const OP_PB_EQ = PB_OP_BASE + 4;
|
|
321
|
+
export const OP_PB_AUX_BOOL = PB_OP_BASE + 5;
|
|
319
322
|
const RECFUN_OP_BASE = 900;
|
|
320
323
|
export const OP_FUN_DEFINED = RECFUN_OP_BASE;
|
|
321
324
|
export const OP_FUN_CASE_PRED = RECFUN_OP_BASE + 1;
|
|
@@ -611,7 +614,10 @@ const hasOwnDeclHash = (family: number) =>
|
|
|
611
614
|
family === FAMILY_RECFUN;
|
|
612
615
|
|
|
613
616
|
// The declarations that Z3 makes once and counts references to, rather than on each use.
|
|
614
|
-
const
|
|
617
|
+
const isDeclared = (funcDecl: FuncDecl) =>
|
|
618
|
+
funcDecl.family === FAMILY_USER ||
|
|
619
|
+
funcDecl.family === FAMILY_RECFUN ||
|
|
620
|
+
funcDecl.op === OP_PB_AUX_BOOL;
|
|
615
621
|
|
|
616
622
|
export class AstManager {
|
|
617
623
|
private numNodes = 0;
|
|
@@ -674,6 +680,7 @@ export class AstManager {
|
|
|
674
680
|
private charSort = -1;
|
|
675
681
|
private stringSort = -1;
|
|
676
682
|
private reglanSort = -1;
|
|
683
|
+
private isSeqPluginInitialized = false;
|
|
677
684
|
private seqSorts = new Map<string, number>();
|
|
678
685
|
private seqDecls = new Map<string, number>();
|
|
679
686
|
private stringValues: number[][] = [];
|
|
@@ -739,6 +746,17 @@ export class AstManager {
|
|
|
739
746
|
smallId: Z3_SMALL_IDS.get(builtin[2]) ?? -1,
|
|
740
747
|
parameters: [],
|
|
741
748
|
});
|
|
749
|
+
// Each has one signature in Z3, and a model's tables hash its declaration as a user's.
|
|
750
|
+
for (const entry of Z3_BUILTINS)
|
|
751
|
+
if (entry[0] === OP_DIV0 || entry[0] === OP_IDIV0 || entry[0] === OP_MOD0) {
|
|
752
|
+
const range = this.funcDecls[entry[0]].range;
|
|
753
|
+
this.declHashes[entry[0]] = this.getFuncDeclHash(
|
|
754
|
+
entry[1][0],
|
|
755
|
+
[range, range],
|
|
756
|
+
range,
|
|
757
|
+
getInfoHash(Z3_ARITH_FAMILY, entry[1][1], []),
|
|
758
|
+
);
|
|
759
|
+
}
|
|
742
760
|
this.trueExpr = this.mkApp(OP_TRUE, [], SORT_BOOL);
|
|
743
761
|
this.falseExpr = this.mkApp(OP_FALSE, [], SORT_BOOL);
|
|
744
762
|
this.incRef(this.trueExpr);
|
|
@@ -799,6 +817,15 @@ export class AstManager {
|
|
|
799
817
|
this.declRefCounts[decl] = 1;
|
|
800
818
|
this.mkSmallId();
|
|
801
819
|
this.macros.set(decl, expr);
|
|
820
|
+
return decl;
|
|
821
|
+
}
|
|
822
|
+
|
|
823
|
+
eraseRecFunDef(decl: number) {
|
|
824
|
+
this.macros.delete(decl);
|
|
825
|
+
const def = this.recFunDefs.get(decl);
|
|
826
|
+
if (def === undefined) return;
|
|
827
|
+
for (const recFunCase of def.cases) this.recFunCases.delete(recFunCase.pred);
|
|
828
|
+
this.recFunDefs.delete(decl);
|
|
802
829
|
}
|
|
803
830
|
|
|
804
831
|
// recfun::def: the declaration of a defined function, which the definition holds.
|
|
@@ -881,7 +908,7 @@ export class AstManager {
|
|
|
881
908
|
|
|
882
909
|
private holdDecl(expr: number) {
|
|
883
910
|
const decl = this.decls[expr];
|
|
884
|
-
if (
|
|
911
|
+
if (isDeclared(this.funcDecls[decl])) {
|
|
885
912
|
this.incDeclRef(decl);
|
|
886
913
|
return;
|
|
887
914
|
}
|
|
@@ -900,7 +927,7 @@ export class AstManager {
|
|
|
900
927
|
|
|
901
928
|
private releaseDecl(expr: number) {
|
|
902
929
|
const decl = this.decls[expr];
|
|
903
|
-
if (
|
|
930
|
+
if (isDeclared(this.funcDecls[decl])) {
|
|
904
931
|
this.declRefCounts[decl]--;
|
|
905
932
|
if (this.declRefCounts[decl] > 0) return -1;
|
|
906
933
|
this.deletedDecls.add(decl);
|
|
@@ -983,9 +1010,11 @@ export class AstManager {
|
|
|
983
1010
|
withoutTemporaries<T>(body: () => T) {
|
|
984
1011
|
const outer = this.temporariesMark;
|
|
985
1012
|
this.temporariesMark = -1;
|
|
986
|
-
|
|
987
|
-
|
|
988
|
-
|
|
1013
|
+
try {
|
|
1014
|
+
return body();
|
|
1015
|
+
} finally {
|
|
1016
|
+
this.temporariesMark = outer;
|
|
1017
|
+
}
|
|
989
1018
|
}
|
|
990
1019
|
|
|
991
1020
|
releaseLater(expr: number) {
|
|
@@ -1290,7 +1319,7 @@ export class AstManager {
|
|
|
1290
1319
|
return this.sortNames.length - 1;
|
|
1291
1320
|
}
|
|
1292
1321
|
|
|
1293
|
-
// Z3 makes the Char
|
|
1322
|
+
// Z3 makes the Char and String sorts at startup, so they take no small id.
|
|
1294
1323
|
mkCharSort() {
|
|
1295
1324
|
if (this.charSort === -1)
|
|
1296
1325
|
this.charSort = this.addSort(
|
|
@@ -1315,8 +1344,18 @@ export class AstManager {
|
|
|
1315
1344
|
return this.stringSort;
|
|
1316
1345
|
}
|
|
1317
1346
|
|
|
1347
|
+
initSeqPlugin() {
|
|
1348
|
+
if (this.isSeqPluginInitialized) return;
|
|
1349
|
+
this.isSeqPluginInitialized = true;
|
|
1350
|
+
const element = this.mkTypeParameter(0);
|
|
1351
|
+
this.mkReSort(this.mkSeqSort(element));
|
|
1352
|
+
this.mkReSort(this.mkStringSort());
|
|
1353
|
+
this.mkArraySort([element, SORT_BOOL]);
|
|
1354
|
+
}
|
|
1355
|
+
|
|
1318
1356
|
mkSeqSort(element: number) {
|
|
1319
1357
|
if (element === this.mkCharSort()) return this.mkStringSort();
|
|
1358
|
+
this.initSeqPlugin();
|
|
1320
1359
|
const key = `s${element}`;
|
|
1321
1360
|
const existing = this.seqSorts.get(key);
|
|
1322
1361
|
if (existing !== undefined) return existing;
|
|
@@ -1335,6 +1374,7 @@ export class AstManager {
|
|
|
1335
1374
|
}
|
|
1336
1375
|
|
|
1337
1376
|
mkReSort(seq: number) {
|
|
1377
|
+
this.initSeqPlugin();
|
|
1338
1378
|
const isReglan = seq === this.mkStringSort();
|
|
1339
1379
|
if (isReglan && this.reglanSort !== -1) return this.reglanSort;
|
|
1340
1380
|
const key = `r${seq}`;
|
|
@@ -1349,11 +1389,9 @@ export class AstManager {
|
|
|
1349
1389
|
getInfoHash(Z3_SEQ_FAMILY, Z3_RE_SORT, [this.sortHashes[seq]]),
|
|
1350
1390
|
),
|
|
1351
1391
|
);
|
|
1392
|
+
this.mkSmallId();
|
|
1352
1393
|
if (isReglan) this.reglanSort = sort;
|
|
1353
|
-
else
|
|
1354
|
-
this.mkSmallId();
|
|
1355
|
-
this.seqSorts.set(key, sort);
|
|
1356
|
-
}
|
|
1394
|
+
else this.seqSorts.set(key, sort);
|
|
1357
1395
|
return sort;
|
|
1358
1396
|
}
|
|
1359
1397
|
|
|
@@ -1732,7 +1770,7 @@ export class AstManager {
|
|
|
1732
1770
|
throw new SmtInvariantError(`the operator ${op} has no Z3 declaration`);
|
|
1733
1771
|
const argSort = op === OP_ITE ? this.sorts[args[1]] : this.sorts[args[0]];
|
|
1734
1772
|
const arity = builtin[2] === -1 ? args.length : builtin[2];
|
|
1735
|
-
const domain = Array.from({ length: arity }, (
|
|
1773
|
+
const domain = Array.from({ length: arity }, (_value, index) =>
|
|
1736
1774
|
op === OP_PATTERN
|
|
1737
1775
|
? this.sorts[args[index]]
|
|
1738
1776
|
: op === OP_ITE && index === 0
|
|
@@ -1873,6 +1911,20 @@ export class AstManager {
|
|
|
1873
1911
|
return decl;
|
|
1874
1912
|
}
|
|
1875
1913
|
|
|
1914
|
+
mkPbAuxBool() {
|
|
1915
|
+
const decl = this.addDecl(
|
|
1916
|
+
this.mkFreshVarName("pb"),
|
|
1917
|
+
FAMILY_PB,
|
|
1918
|
+
OP_PB_AUX_BOOL,
|
|
1919
|
+
[],
|
|
1920
|
+
SORT_BOOL,
|
|
1921
|
+
[],
|
|
1922
|
+
getInfoHash(Z3_PB_FAMILY, OP_PB_AUX_BOOL - PB_OP_BASE, []),
|
|
1923
|
+
);
|
|
1924
|
+
this.declRefCounts[decl] = 0;
|
|
1925
|
+
return this.mkApp(decl, [], SORT_BOOL);
|
|
1926
|
+
}
|
|
1927
|
+
|
|
1876
1928
|
mkFreshVarName(prefix: string | null) {
|
|
1877
1929
|
return `${prefix ?? "var"}!${this.mkFreshId()}`;
|
|
1878
1930
|
}
|