tla-ts 0.0.10-dev.d618a2d79 → 0.0.10-dev.e5c8dc315
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 +53 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +18 -4
- package/dist/index.d.ts +18 -4
- 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 +56 -56
- package/dist/prove.js +78 -78
- package/dist/run.cjs +40 -44
- package/dist/run.js +42 -46
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +97 -92
- package/dist/transfer.js +97 -92
- 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 +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +13 -11
- package/src/check-trace.ts +146 -93
- package/src/check.ts +518 -281
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +18 -4
- package/src/cli/tlc.ts +18 -12
- 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 +101 -36
- package/src/environment.ts +155 -66
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +424 -135
- package/src/exit-codes.ts +28 -14
- package/src/instances.ts +152 -25
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +675 -236
- package/src/lexer.ts +12 -2
- package/src/liveness-checker.ts +179 -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/parallel-worker.ts +8 -2
- package/src/parallel.ts +5 -0
- package/src/parser.ts +180 -149
- 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/ackermannize-bv-tactic.ts +3 -2
- 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 +171 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +66 -14
- package/src/prover/smt/solver/auf-solver.ts +23 -12
- package/src/prover/smt/solver/bit-blast-tactic.ts +28 -2
- 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/bv1-blast.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 +84 -15
- package/src/prover/smt/solver/ctx-simplify.ts +9 -4
- 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 +9 -8
- package/src/prover/smt/solver/dt2bv-tactic.ts +66 -28
- 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 +31 -28
- package/src/prover/smt/solver/eq2bv-tactic.ts +15 -6
- 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 +608 -139
- package/src/prover/smt/solver/fix-dl-var.ts +2 -3
- package/src/prover/smt/solver/fm-tactic.ts +9 -7
- 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/fpa2bv-tactic.ts +1 -1
- 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/lia2pb.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-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/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 +2 -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/normalize-bounds.ts +2 -2
- package/src/prover/smt/solver/occf.ts +1 -1
- 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/pb2bv-tactic.ts +9 -3
- 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/purify-arith.ts +51 -49
- 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/reduce-args.ts +2 -2
- 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 +75 -12
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +149 -47
- 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 +54 -25
- package/src/prover/smt/solver/sat/sat2goal.ts +75 -50
- 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 +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 +106 -13
- package/src/prover/smt/solver/smtlib-parser.ts +589 -224
- package/src/prover/smt/solver/smtlib-script.ts +718 -213
- package/src/prover/smt/solver/solve-eqs.ts +36 -37
- package/src/prover/smt/solver/solver.ts +18 -4
- package/src/prover/smt/solver/tactic.ts +389 -199
- 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 +12 -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 +15 -5
- 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 +1311 -268
- package/src/runtime.ts +21 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +5 -15
- package/src/sany/generator-def-entries.ts +123 -36
- package/src/sany/generator-definitions.ts +5 -3
- package/src/sany/generator-expressions.ts +60 -37
- package/src/sany/generator-proofs.ts +19 -12
- package/src/sany/generator.ts +12 -6
- 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 +12 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +321 -135
- 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 +666 -147
- package/src/successors.ts +50 -20
- package/src/symmetry.ts +2 -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/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 +44 -15
- 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
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { SmtCanceledError, SmtInvariantError } from "../../../errors";
|
|
1
2
|
import type { AssertedFormulas } from "./asserted-formulas";
|
|
2
3
|
import {
|
|
3
4
|
AstManager,
|
|
@@ -6,13 +7,16 @@ import {
|
|
|
6
7
|
FAMILY_BASIC,
|
|
7
8
|
FAMILY_BV,
|
|
8
9
|
FAMILY_CHAR,
|
|
10
|
+
FAMILY_DATALOG_RELATION,
|
|
9
11
|
FAMILY_DATATYPE,
|
|
12
|
+
FAMILY_FF,
|
|
10
13
|
FAMILY_FINITE_SET,
|
|
11
14
|
FAMILY_FPA,
|
|
12
15
|
FAMILY_PB,
|
|
13
16
|
FAMILY_POLY,
|
|
14
17
|
FAMILY_RECFUN,
|
|
15
18
|
FAMILY_SEQ,
|
|
19
|
+
FAMILY_SPECIAL_RELATIONS,
|
|
16
20
|
KIND_APP,
|
|
17
21
|
KIND_QUANTIFIER,
|
|
18
22
|
KIND_VAR,
|
|
@@ -65,9 +69,11 @@ import { TheoryDatatype } from "./theory-datatype";
|
|
|
65
69
|
import { TheoryFiniteSet } from "./theory-finite-set";
|
|
66
70
|
import { TheoryPb } from "./theory-pb";
|
|
67
71
|
import { TheoryPolymorphism } from "./theory-polymorphism";
|
|
72
|
+
import { TheoryWithoutTerms } from "./theory-without-terms";
|
|
68
73
|
import { TheoryLra } from "./theory-lra";
|
|
69
74
|
import { shrink } from "./array";
|
|
70
75
|
import {
|
|
76
|
+
DEFAULT_CONFIG,
|
|
71
77
|
getSmtConfig,
|
|
72
78
|
PS_ALWAYS_FALSE,
|
|
73
79
|
PS_CACHING_CONSERVATIVE,
|
|
@@ -77,6 +83,7 @@ import {
|
|
|
77
83
|
RS_LUBY,
|
|
78
84
|
type SmtSetup,
|
|
79
85
|
} from "./smt-setup";
|
|
86
|
+
import type { KernelParams } from "./solver";
|
|
80
87
|
|
|
81
88
|
const ACTIVITY_LIMIT = 1e100;
|
|
82
89
|
const INV_ACTIVITY_LIMIT = 1e-100;
|
|
@@ -129,6 +136,15 @@ const THEORY_MAKERS = new Map<number, (context: Context) => Theory>([
|
|
|
129
136
|
[FAMILY_FINITE_SET, (context) => new TheoryFiniteSet(context)],
|
|
130
137
|
[FAMILY_POLY, (context) => new TheoryPolymorphism(context)],
|
|
131
138
|
[FAMILY_PB, (context) => new TheoryPb(context)],
|
|
139
|
+
[
|
|
140
|
+
FAMILY_DATALOG_RELATION,
|
|
141
|
+
(context) => new TheoryWithoutTerms(context, FAMILY_DATALOG_RELATION, "datalog"),
|
|
142
|
+
],
|
|
143
|
+
[FAMILY_FF, (context) => new TheoryWithoutTerms(context, FAMILY_FF, "finite-field")],
|
|
144
|
+
[
|
|
145
|
+
FAMILY_SPECIAL_RELATIONS,
|
|
146
|
+
(context) => new TheoryWithoutTerms(context, FAMILY_SPECIAL_RELATIONS, "unknown"),
|
|
147
|
+
],
|
|
132
148
|
]);
|
|
133
149
|
|
|
134
150
|
// get_luby
|
|
@@ -152,6 +168,7 @@ export interface SmtParams {
|
|
|
152
168
|
isMbqi: boolean;
|
|
153
169
|
mbqiMaxIterations: number;
|
|
154
170
|
relevancyLevel: 0 | 2;
|
|
171
|
+
randomSeed?: number;
|
|
155
172
|
// The model checker's auxiliary context pretends every array operation is supported.
|
|
156
173
|
isArrayFakeSupport?: boolean;
|
|
157
174
|
}
|
|
@@ -170,6 +187,7 @@ export class Context extends Internalizer {
|
|
|
170
187
|
private scopeAuxClauseLimits: number[] = [];
|
|
171
188
|
private scopeTrailLimits: number[] = [];
|
|
172
189
|
private baseScopeLemmaLimits: number[] = [];
|
|
190
|
+
private isBaseScopeInconsistent: boolean[] = [];
|
|
173
191
|
private atomPropagationQueue: Literal[] = [];
|
|
174
192
|
private thEqQueue: number[] = [];
|
|
175
193
|
private thDiseqQueue: number[] = [];
|
|
@@ -191,6 +209,8 @@ export class Context extends Internalizer {
|
|
|
191
209
|
private r1ParentGenerations = new Map<Enode, number>();
|
|
192
210
|
private erasedGenerations = new Map<Enode, number>();
|
|
193
211
|
private lastSearchFailure: SearchFailure = FAILURE_OK;
|
|
212
|
+
// As in Z3, a new search doesn't reset it.
|
|
213
|
+
reasonUnknown = "unknown";
|
|
194
214
|
private hasCaseSplit = true;
|
|
195
215
|
private incompleteTheories: Theory[] = [];
|
|
196
216
|
private modelState: ModelState = { kind: "none" };
|
|
@@ -203,7 +223,22 @@ export class Context extends Internalizer {
|
|
|
203
223
|
readonly params: SmtParams,
|
|
204
224
|
) {
|
|
205
225
|
super(manager, params.relevancyLevel > 0);
|
|
206
|
-
this.qmanager = new DefaultQuantifierManager(this
|
|
226
|
+
this.qmanager = new DefaultQuantifierManager(this);
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
// As in Z3, rereading the parameters drops the setup's tuning but for eliminate_term_ite, eliminate_bounds and relevancy.
|
|
230
|
+
updateParams(params: KernelParams) {
|
|
231
|
+
this.params.isMbqi = params.isMbqi;
|
|
232
|
+
this.params.mbqiMaxIterations = params.mbqiMaxIterations;
|
|
233
|
+
this.params.randomSeed = params.randomSeed;
|
|
234
|
+
this.config = {
|
|
235
|
+
...DEFAULT_CONFIG,
|
|
236
|
+
theories: this.config.theories,
|
|
237
|
+
isFindingMacros: params.isFindingMacros,
|
|
238
|
+
isEliminatingTermIte: this.config.isEliminatingTermIte,
|
|
239
|
+
isEliminatingBounds: this.config.isEliminatingBounds,
|
|
240
|
+
};
|
|
241
|
+
this.qmanager.updateParams();
|
|
207
242
|
}
|
|
208
243
|
|
|
209
244
|
// setup_context and setup_components. The setup's theories come in its order, then setup_card's.
|
|
@@ -212,6 +247,7 @@ export class Context extends Internalizer {
|
|
|
212
247
|
isUsingStaticFeatures: boolean,
|
|
213
248
|
asserted: AssertedFormulas,
|
|
214
249
|
) {
|
|
250
|
+
if (this.isInconsistent() || asserted.isInconsistent) return false;
|
|
215
251
|
const config = getSmtConfig(
|
|
216
252
|
this.manager,
|
|
217
253
|
setup,
|
|
@@ -221,11 +257,13 @@ export class Context extends Internalizer {
|
|
|
221
257
|
);
|
|
222
258
|
this.setup = setup;
|
|
223
259
|
this.config = config;
|
|
260
|
+
this.randomSeed = this.params.randomSeed ?? 0;
|
|
224
261
|
if (config.relevancyLevel !== undefined) this.relevancy.isEnabled = config.relevancyLevel > 0;
|
|
225
262
|
for (const family of config.theories)
|
|
226
263
|
if (family !== FAMILY_POLY || this.manager.hasTypeVars) this.registerFamily(family);
|
|
227
264
|
this.registerFamily(FAMILY_PB);
|
|
228
265
|
asserted.setup(config);
|
|
266
|
+
return true;
|
|
229
267
|
}
|
|
230
268
|
|
|
231
269
|
// register_plugin keeps the theory a family already has.
|
|
@@ -243,8 +281,10 @@ export class Context extends Internalizer {
|
|
|
243
281
|
return family < 0 ? undefined : this.theoryByFamily[family];
|
|
244
282
|
}
|
|
245
283
|
|
|
246
|
-
checkCanceled() {
|
|
247
|
-
|
|
284
|
+
checkCanceled(cost = 1) {
|
|
285
|
+
if (this.manager.limit.inc(cost)) return false;
|
|
286
|
+
this.lastSearchFailure = FAILURE_CANCELED;
|
|
287
|
+
return true;
|
|
248
288
|
}
|
|
249
289
|
|
|
250
290
|
assign(literal: Literal, justification: BJustification, isDecision = false) {
|
|
@@ -961,11 +1001,12 @@ export class Context extends Internalizer {
|
|
|
961
1001
|
this.cacheGeneration(newLevel, visited);
|
|
962
1002
|
this.qmanager.pop(numScopes);
|
|
963
1003
|
this.fingerprints.pop(numScopes);
|
|
1004
|
+
if (newLevel >= this.baseLevel || !this.isBaseScopeInconsistent[newLevel]) this.conflict = null;
|
|
964
1005
|
if (newLevel < this.baseLevel) {
|
|
965
1006
|
this.deleteClauses(this.lemmas, this.baseScopeLemmaLimits[newLevel]);
|
|
966
1007
|
shrink(this.baseScopeLemmaLimits, newLevel);
|
|
1008
|
+
shrink(this.isBaseScopeInconsistent, newLevel);
|
|
967
1009
|
}
|
|
968
|
-
this.conflict = null;
|
|
969
1010
|
this.deleteClauses(this.auxClauses, this.scopeAuxClauseLimits[newLevel]);
|
|
970
1011
|
this.relevancy.pop(numScopes);
|
|
971
1012
|
this.unassignVars(this.scopeAssignedLimits[newLevel]);
|
|
@@ -1191,7 +1232,7 @@ export class Context extends Internalizer {
|
|
|
1191
1232
|
const theory = this.theories[this.finalCheckIndex];
|
|
1192
1233
|
const check = theory === undefined ? qmanager.finalCheckEh(true) : theory.finalCheckEh(level);
|
|
1193
1234
|
if (theory !== undefined) maxLevel = Math.max(maxLevel, theory.numFinalCheckLevels());
|
|
1194
|
-
const isCanceled = theory
|
|
1235
|
+
const isCanceled = theory !== undefined && this.checkCanceled();
|
|
1195
1236
|
if (isCanceled) failure = FAILURE_CANCELED;
|
|
1196
1237
|
else if (theory !== undefined && check === FC_GIVEUP) {
|
|
1197
1238
|
failure = FAILURE_THEORY;
|
|
@@ -1259,6 +1300,9 @@ export class Context extends Internalizer {
|
|
|
1259
1300
|
}
|
|
1260
1301
|
|
|
1261
1302
|
private mkProtoModel() {
|
|
1303
|
+
const failure = this.lastSearchFailure;
|
|
1304
|
+
if (this.hasCaseSplits() || failure === FAILURE_CANCELED || failure === FAILURE_NUM_CONFLICTS)
|
|
1305
|
+
return undefined;
|
|
1262
1306
|
if (this.modelState.kind !== "none") this.modelState.generated.model.decRef();
|
|
1263
1307
|
const generated = mkModel(this);
|
|
1264
1308
|
generated.model.incRef();
|
|
@@ -1277,7 +1321,7 @@ export class Context extends Internalizer {
|
|
|
1277
1321
|
if (this.lastSearchFailure === FAILURE_QUANTIFIERS) return "(incomplete quantifiers)";
|
|
1278
1322
|
if (this.lastSearchFailure === FAILURE_THEORY)
|
|
1279
1323
|
return `(incomplete (theory${this.incompleteTheories.map((theory) => ` ${theory.name}`).join("")}))`;
|
|
1280
|
-
return
|
|
1324
|
+
return this.reasonUnknown;
|
|
1281
1325
|
}
|
|
1282
1326
|
|
|
1283
1327
|
private hasCaseSplits() {
|
|
@@ -1301,9 +1345,12 @@ export class Context extends Internalizer {
|
|
|
1301
1345
|
}
|
|
1302
1346
|
|
|
1303
1347
|
getModel() {
|
|
1348
|
+
if (this.isInconsistent()) return undefined;
|
|
1304
1349
|
if (this.modelState.kind === "final") return this.modelState.model;
|
|
1350
|
+
if (!this.manager.limit.inc()) return undefined;
|
|
1305
1351
|
const generated =
|
|
1306
1352
|
this.modelState.kind === "proto" ? this.modelState.generated : this.mkProtoModel();
|
|
1353
|
+
if (generated === undefined) return undefined;
|
|
1307
1354
|
const model = generated.model.mkModel();
|
|
1308
1355
|
model.addRecFuns();
|
|
1309
1356
|
model.incRef();
|
|
@@ -1311,6 +1358,13 @@ export class Context extends Internalizer {
|
|
|
1311
1358
|
return model;
|
|
1312
1359
|
}
|
|
1313
1360
|
|
|
1361
|
+
getSatModel() {
|
|
1362
|
+
const model = this.getModel();
|
|
1363
|
+
if (model !== undefined) return model;
|
|
1364
|
+
if (this.manager.limit.isExhausted()) throw new SmtCanceledError();
|
|
1365
|
+
throw new SmtInvariantError("a sat answer without a model");
|
|
1366
|
+
}
|
|
1367
|
+
|
|
1314
1368
|
validateModel(model: ProtoModel) {
|
|
1315
1369
|
const manager = this.manager;
|
|
1316
1370
|
for (const literal of this.assignedLiterals) {
|
|
@@ -1340,7 +1394,10 @@ export class Context extends Internalizer {
|
|
|
1340
1394
|
)
|
|
1341
1395
|
return status;
|
|
1342
1396
|
const generated = this.mkProtoModel();
|
|
1343
|
-
if (
|
|
1397
|
+
if (
|
|
1398
|
+
generated === undefined ||
|
|
1399
|
+
qmanager.checkModel(generated.model, generated.root2value) !== CHECK_MODEL_RESTART
|
|
1400
|
+
)
|
|
1344
1401
|
return status;
|
|
1345
1402
|
this.lastSearchFailure = FAILURE_OK;
|
|
1346
1403
|
status = L_UNDEF;
|
|
@@ -1350,9 +1407,10 @@ export class Context extends Internalizer {
|
|
|
1350
1407
|
if (status === L_TRUE && qmanager.quantifiers.length === 0) return L_TRUE;
|
|
1351
1408
|
if (status === L_TRUE) {
|
|
1352
1409
|
const generated = this.mkProtoModel();
|
|
1353
|
-
const result =
|
|
1354
|
-
|
|
1355
|
-
|
|
1410
|
+
const result =
|
|
1411
|
+
generated !== undefined && qmanager.isModelBased()
|
|
1412
|
+
? qmanager.checkModel(generated.model, generated.root2value)
|
|
1413
|
+
: CHECK_MODEL_UNKNOWN;
|
|
1356
1414
|
if (result === CHECK_MODEL_SAT) return L_TRUE;
|
|
1357
1415
|
if (result === CHECK_MODEL_UNKNOWN) {
|
|
1358
1416
|
this.lastSearchFailure = FAILURE_QUANTIFIERS;
|
|
@@ -1448,6 +1506,7 @@ export class Context extends Internalizer {
|
|
|
1448
1506
|
this.popToBaseLevel();
|
|
1449
1507
|
this.pushScope();
|
|
1450
1508
|
this.baseScopeLemmaLimits.push(this.lemmas.length);
|
|
1509
|
+
this.isBaseScopeInconsistent.push(this.isInconsistent());
|
|
1451
1510
|
this.baseLevel++;
|
|
1452
1511
|
this.searchLevel++;
|
|
1453
1512
|
}
|
|
@@ -1481,15 +1540,23 @@ export class Context extends Internalizer {
|
|
|
1481
1540
|
this.asserted = asserted;
|
|
1482
1541
|
this.macros = asserted.macros;
|
|
1483
1542
|
this.hasQuantifiers = asserted.hasQuantifiers;
|
|
1484
|
-
|
|
1543
|
+
if (this.checkCanceled()) return;
|
|
1544
|
+
asserted.reduce();
|
|
1545
|
+
if (this.checkCanceled()) return;
|
|
1485
1546
|
if (asserted.isInconsistent) {
|
|
1486
1547
|
this.setConflict("axiom", null);
|
|
1487
1548
|
return;
|
|
1488
1549
|
}
|
|
1489
|
-
|
|
1490
|
-
|
|
1491
|
-
|
|
1550
|
+
const formulas = asserted.getFormulas();
|
|
1551
|
+
const size = asserted.getNumFormulas();
|
|
1552
|
+
for (let qhead = asserted.getQhead(); qhead < size && !this.isInconsistent(); qhead++) {
|
|
1553
|
+
if (this.checkCanceled()) {
|
|
1554
|
+
asserted.commit(qhead);
|
|
1555
|
+
return;
|
|
1556
|
+
}
|
|
1557
|
+
this.internalizeAssertion(formulas[qhead], 0);
|
|
1492
1558
|
}
|
|
1559
|
+
asserted.commit();
|
|
1493
1560
|
}
|
|
1494
1561
|
|
|
1495
1562
|
initAssumptions(assumptions: number[], asserted: AssertedFormulas) {
|
|
@@ -1498,7 +1565,7 @@ export class Context extends Internalizer {
|
|
|
1498
1565
|
this.unsatCore = [];
|
|
1499
1566
|
if (assumptions.length > 0) {
|
|
1500
1567
|
this.propagate();
|
|
1501
|
-
if (this.isInconsistent()) return;
|
|
1568
|
+
if (this.isInconsistent() || this.checkCanceled()) return;
|
|
1502
1569
|
this.delInactiveLemmas();
|
|
1503
1570
|
this.pushScope();
|
|
1504
1571
|
const manager = this.manager;
|
|
@@ -1598,10 +1665,12 @@ export class Context extends Internalizer {
|
|
|
1598
1665
|
}
|
|
1599
1666
|
|
|
1600
1667
|
search() {
|
|
1668
|
+
if (this.asserted?.isInconsistent && !this.isInconsistent()) this.setConflict("axiom", null);
|
|
1601
1669
|
if (this.isInconsistent()) {
|
|
1602
1670
|
this.resolveConflict();
|
|
1603
1671
|
return L_FALSE;
|
|
1604
1672
|
}
|
|
1673
|
+
if (this.checkCanceled()) return L_UNDEF;
|
|
1605
1674
|
this.resetModel();
|
|
1606
1675
|
for (const theory of this.theories) theory.initSearchEh();
|
|
1607
1676
|
this.qmanager.initSearchEh();
|
|
@@ -50,9 +50,15 @@ class CtxSimplifier {
|
|
|
50
50
|
const manager = this.manager;
|
|
51
51
|
this.depth = 0;
|
|
52
52
|
const result = this.simplify(goal.forms.items[index]);
|
|
53
|
-
|
|
53
|
+
const dependency = goal.getDependency(index);
|
|
54
|
+
if (
|
|
55
|
+
isAsserted &&
|
|
56
|
+
!manager.isTrue(result) &&
|
|
57
|
+
!manager.isFalse(result) &&
|
|
58
|
+
dependency === undefined
|
|
59
|
+
)
|
|
54
60
|
this.assertExpr(result, false);
|
|
55
|
-
goal.update(index, result);
|
|
61
|
+
goal.update(index, result, dependency);
|
|
56
62
|
manager.decRef(result);
|
|
57
63
|
}
|
|
58
64
|
|
|
@@ -74,8 +80,7 @@ class CtxSimplifier {
|
|
|
74
80
|
for (const form of goal.forms.items) {
|
|
75
81
|
this.pinned.push(form);
|
|
76
82
|
visit(form);
|
|
77
|
-
|
|
78
|
-
const expr = stack.pop() as number;
|
|
83
|
+
for (let expr = stack.pop(); expr !== undefined; expr = stack.pop()) {
|
|
79
84
|
if (manager.kinds[expr] !== KIND_APP) continue;
|
|
80
85
|
for (let index = manager.getNumArgs(expr) - 1; index >= 0; index--)
|
|
81
86
|
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,9 +1,10 @@
|
|
|
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 {
|
|
6
6
|
private held = -1;
|
|
7
|
+
qhead = 0;
|
|
7
8
|
|
|
8
9
|
constructor(
|
|
9
10
|
readonly manager: AstManager,
|
|
@@ -22,7 +23,7 @@ export class DependentExprState {
|
|
|
22
23
|
forEachIndex(visit: (index: number) => void) {
|
|
23
24
|
const goal = this.goal;
|
|
24
25
|
const end = goal.forms.size;
|
|
25
|
-
for (let index =
|
|
26
|
+
for (let index = this.qhead; index !== end;) {
|
|
26
27
|
visit(index);
|
|
27
28
|
index =
|
|
28
29
|
!this.manager.limit.inc() || goal.isInconsistent || index >= goal.forms.size
|
|
@@ -36,15 +37,18 @@ export class DependentExprState {
|
|
|
36
37
|
const manager = this.manager;
|
|
37
38
|
const goal = this.goal;
|
|
38
39
|
let rewritten = -1;
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
40
|
+
try {
|
|
41
|
+
this.forEachIndex((index) => {
|
|
42
|
+
const form = this.get(index);
|
|
43
|
+
const next = rewrite(form);
|
|
44
|
+
if (next === -1) return;
|
|
45
|
+
if (rewritten !== -1) manager.decRef(rewritten);
|
|
46
|
+
rewritten = next;
|
|
47
|
+
if (rewritten !== form) goal.update(index, rewritten, goal.getDependency(index));
|
|
48
|
+
});
|
|
49
|
+
} finally {
|
|
43
50
|
if (rewritten !== -1) manager.decRef(rewritten);
|
|
44
|
-
|
|
45
|
-
if (rewritten !== form) goal.update(index, rewritten, goal.getDependency(index));
|
|
46
|
-
});
|
|
47
|
-
if (rewritten !== -1) manager.decRef(rewritten);
|
|
51
|
+
}
|
|
48
52
|
}
|
|
49
53
|
|
|
50
54
|
hasQuantifiers() {
|
|
@@ -60,6 +64,13 @@ export class DependentExprState {
|
|
|
60
64
|
}
|
|
61
65
|
}
|
|
62
66
|
|
|
67
|
+
export const finishSimplifier = (goal: Goal, definitions: Definition[] = []) => {
|
|
68
|
+
goal.elimTrue();
|
|
69
|
+
goal.elimRedundancies();
|
|
70
|
+
goal.depth++;
|
|
71
|
+
if (goal.isModelsEnabled) goal.addDefinitions(definitions);
|
|
72
|
+
};
|
|
73
|
+
|
|
63
74
|
interface Simplifier {
|
|
64
75
|
reduce(): void;
|
|
65
76
|
release(): void;
|
|
@@ -72,10 +83,11 @@ export const runSimplifier = (
|
|
|
72
83
|
) => {
|
|
73
84
|
const state = new DependentExprState(goal.manager, goal);
|
|
74
85
|
const simplifier = create(state);
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
86
|
+
try {
|
|
87
|
+
if (!goal.isProofsEnabled || isSupportingProofs) simplifier.reduce();
|
|
88
|
+
finishSimplifier(goal);
|
|
89
|
+
} finally {
|
|
90
|
+
simplifier.release();
|
|
91
|
+
state.release();
|
|
92
|
+
}
|
|
81
93
|
};
|
|
@@ -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);
|
|
@@ -194,12 +193,14 @@ export const diffNeq = (manager: AstManager, goal: Goal, maxK: number) => {
|
|
|
194
193
|
const solver = new DiffNeq(manager, maxK);
|
|
195
194
|
solver.compile(goal);
|
|
196
195
|
if (solver.search()) {
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
196
|
+
if (goal.isModelsEnabled) {
|
|
197
|
+
const model = solver.mkModel();
|
|
198
|
+
model.incRef();
|
|
199
|
+
goal.addModelConversion((converted) => {
|
|
200
|
+
for (const [decl, value] of model.constInterps) converted.registerConst(decl, value);
|
|
201
|
+
return converted;
|
|
202
|
+
});
|
|
203
|
+
}
|
|
203
204
|
goal.reset();
|
|
204
205
|
} else goal.assert(manager.falseExpr);
|
|
205
206
|
goal.depth++;
|
|
@@ -18,7 +18,6 @@ import { mkBvApp } from "./bv-decl-plugin";
|
|
|
18
18
|
import {
|
|
19
19
|
getConstructorIndex,
|
|
20
20
|
getDatatypeConstructors,
|
|
21
|
-
getDatatypeDef,
|
|
22
21
|
getNumConstructors,
|
|
23
22
|
getRecognizerConstructor,
|
|
24
23
|
} from "./datatype-decl-plugin";
|
|
@@ -28,12 +27,15 @@ import { ObjMap } from "./hashtable";
|
|
|
28
27
|
import { RefVector } from "./ref-vector";
|
|
29
28
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
30
29
|
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
(
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
30
|
+
// Deviation from Z3: Z3 5.3.2 takes a failed datatype for an empty enumeration and crashes.
|
|
31
|
+
const isEnumSort = (manager: AstManager, sort: number) => {
|
|
32
|
+
if (!manager.isDatatypeSort(sort)) return false;
|
|
33
|
+
const constructors = getDatatypeConstructors(manager, sort);
|
|
34
|
+
return (
|
|
35
|
+
constructors.length > 0 &&
|
|
36
|
+
constructors.every((constructor) => manager.funcDecls[constructor].domain.length === 0)
|
|
37
|
+
);
|
|
38
|
+
};
|
|
37
39
|
|
|
38
40
|
const getEnumBvSize = (manager: AstManager, sort: number) => {
|
|
39
41
|
const numConstructors = getNumConstructors(manager, sort);
|
|
@@ -51,12 +53,13 @@ const constrainDomain = (manager: AstManager, bounds: RefVector, expr: number, s
|
|
|
51
53
|
bounds.push(mkBvApp(manager, OP_ULEQ, [expr, mkEnumValue(manager, domainSize - 1, sort)]));
|
|
52
54
|
};
|
|
53
55
|
|
|
54
|
-
class Enum2BvRewriter extends RewriterTpl {
|
|
56
|
+
export class Enum2BvRewriter extends RewriterTpl {
|
|
55
57
|
readonly enumIndexes: ObjMap<number>;
|
|
56
58
|
readonly enumConsts: number[] = [];
|
|
57
59
|
readonly enumBvs: number[] = [];
|
|
58
60
|
readonly enumDefs: RefVector;
|
|
59
61
|
readonly bounds: RefVector;
|
|
62
|
+
private readonly enumConstsLimits: number[] = [];
|
|
60
63
|
|
|
61
64
|
// Without fd sorts, every enumeration sort is finite-domain.
|
|
62
65
|
constructor(
|
|
@@ -181,6 +184,25 @@ class Enum2BvRewriter extends RewriterTpl {
|
|
|
181
184
|
return result;
|
|
182
185
|
}
|
|
183
186
|
|
|
187
|
+
push() {
|
|
188
|
+
this.enumConstsLimits.push(this.enumConsts.length);
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
pop(numScopes: number) {
|
|
192
|
+
const manager = this.manager;
|
|
193
|
+
if (numScopes > 0) {
|
|
194
|
+
const size = this.enumConstsLimits.length - numScopes;
|
|
195
|
+
const limit = this.enumConstsLimits[size];
|
|
196
|
+
for (let index = this.enumConsts.length - 1; index >= limit; index--)
|
|
197
|
+
this.enumIndexes.delete(this.enumConsts[index]);
|
|
198
|
+
this.enumConstsLimits.length = size;
|
|
199
|
+
for (const decl of this.enumConsts.splice(limit)) manager.decDeclRef(decl);
|
|
200
|
+
this.enumDefs.shrink(limit);
|
|
201
|
+
for (const decl of this.enumBvs.splice(limit)) manager.decDeclRef(decl);
|
|
202
|
+
}
|
|
203
|
+
this.reset();
|
|
204
|
+
}
|
|
205
|
+
|
|
184
206
|
// ~imp: the rewriter goes before the vectors.
|
|
185
207
|
release() {
|
|
186
208
|
const manager = this.manager;
|
|
@@ -228,33 +250,49 @@ export const createDt2BvTactic = (manager: AstManager) => {
|
|
|
228
250
|
else argsCannotBeFd(expr);
|
|
229
251
|
}
|
|
230
252
|
for (const sort of nonFdSorts) fdSorts.delete(sort);
|
|
231
|
-
if (fdSorts.size > 0)
|
|
253
|
+
if (fdSorts.size > 0)
|
|
254
|
+
runEnum2Bv(
|
|
255
|
+
manager,
|
|
256
|
+
goal,
|
|
257
|
+
(visit) => {
|
|
258
|
+
const size = goal.forms.size;
|
|
259
|
+
for (let index = 0; index < size && !goal.isInconsistent; index++) visit(index);
|
|
260
|
+
},
|
|
261
|
+
fdSorts,
|
|
262
|
+
);
|
|
232
263
|
goal.depth++;
|
|
233
264
|
return [goal];
|
|
234
265
|
};
|
|
235
266
|
};
|
|
236
267
|
|
|
237
|
-
export const runEnum2Bv = (
|
|
268
|
+
export const runEnum2Bv = (
|
|
269
|
+
manager: AstManager,
|
|
270
|
+
goal: Goal,
|
|
271
|
+
forEachIndex: (visit: (index: number) => void) => void,
|
|
272
|
+
fdSorts?: Set<number>,
|
|
273
|
+
) => {
|
|
238
274
|
const rewriter = new Enum2BvRewriter(manager, fdSorts);
|
|
239
275
|
let rewritten = -1;
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
276
|
+
try {
|
|
277
|
+
forEachIndex((index) => {
|
|
278
|
+
const next = rewriter.rewrite(goal.forms.items[index]);
|
|
279
|
+
release(manager, rewritten);
|
|
280
|
+
rewritten = next;
|
|
281
|
+
goal.update(index, rewritten, goal.getDependency(index));
|
|
282
|
+
});
|
|
283
|
+
const bounds = new RefVector(manager);
|
|
284
|
+
for (const bound of rewriter.bounds.items) bounds.push(bound);
|
|
285
|
+
rewriter.bounds.reset();
|
|
286
|
+
for (const bound of bounds.items) goal.assert(bound);
|
|
287
|
+
const definitions: Definition[] = [];
|
|
288
|
+
for (const entry of rewriter.enumIndexes)
|
|
289
|
+
definitions.push({ decl: rewriter.enumBvs[entry[1]], def: -1 });
|
|
290
|
+
for (const entry of rewriter.enumIndexes)
|
|
291
|
+
definitions.push({ decl: entry[0], def: rewriter.enumDefs.items[entry[1]] });
|
|
292
|
+
if (definitions.length > 0) goal.addDefinitions(definitions);
|
|
293
|
+
bounds.reset();
|
|
294
|
+
} finally {
|
|
243
295
|
release(manager, rewritten);
|
|
244
|
-
|
|
245
|
-
goal.update(index, rewritten);
|
|
296
|
+
rewriter.release();
|
|
246
297
|
}
|
|
247
|
-
const bounds = new RefVector(manager);
|
|
248
|
-
for (const bound of rewriter.bounds.items) bounds.push(bound);
|
|
249
|
-
rewriter.bounds.reset();
|
|
250
|
-
for (const bound of bounds.items) goal.assert(bound);
|
|
251
|
-
const definitions: Definition[] = [];
|
|
252
|
-
for (const entry of rewriter.enumIndexes)
|
|
253
|
-
definitions.push({ decl: rewriter.enumBvs[entry[1]], def: -1 });
|
|
254
|
-
for (const entry of rewriter.enumIndexes)
|
|
255
|
-
definitions.push({ decl: entry[0], def: rewriter.enumDefs.items[entry[1]] });
|
|
256
|
-
if (definitions.length > 0) goal.addDefinitions(definitions);
|
|
257
|
-
bounds.reset();
|
|
258
|
-
release(manager, rewritten);
|
|
259
|
-
rewriter.release();
|
|
260
298
|
};
|