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
|
@@ -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,6 +69,7 @@ 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 {
|
|
@@ -131,6 +136,15 @@ const THEORY_MAKERS = new Map<number, (context: Context) => Theory>([
|
|
|
131
136
|
[FAMILY_FINITE_SET, (context) => new TheoryFiniteSet(context)],
|
|
132
137
|
[FAMILY_POLY, (context) => new TheoryPolymorphism(context)],
|
|
133
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
|
+
],
|
|
134
148
|
]);
|
|
135
149
|
|
|
136
150
|
// get_luby
|
|
@@ -154,6 +168,7 @@ export interface SmtParams {
|
|
|
154
168
|
isMbqi: boolean;
|
|
155
169
|
mbqiMaxIterations: number;
|
|
156
170
|
relevancyLevel: 0 | 2;
|
|
171
|
+
randomSeed?: number;
|
|
157
172
|
// The model checker's auxiliary context pretends every array operation is supported.
|
|
158
173
|
isArrayFakeSupport?: boolean;
|
|
159
174
|
}
|
|
@@ -172,6 +187,7 @@ export class Context extends Internalizer {
|
|
|
172
187
|
private scopeAuxClauseLimits: number[] = [];
|
|
173
188
|
private scopeTrailLimits: number[] = [];
|
|
174
189
|
private baseScopeLemmaLimits: number[] = [];
|
|
190
|
+
private isBaseScopeInconsistent: boolean[] = [];
|
|
175
191
|
private atomPropagationQueue: Literal[] = [];
|
|
176
192
|
private thEqQueue: number[] = [];
|
|
177
193
|
private thDiseqQueue: number[] = [];
|
|
@@ -210,14 +226,17 @@ export class Context extends Internalizer {
|
|
|
210
226
|
this.qmanager = new DefaultQuantifierManager(this);
|
|
211
227
|
}
|
|
212
228
|
|
|
213
|
-
// As in Z3,
|
|
229
|
+
// As in Z3, rereading the parameters drops the setup's tuning but for eliminate_term_ite, eliminate_bounds and relevancy.
|
|
214
230
|
updateParams(params: KernelParams) {
|
|
215
231
|
this.params.isMbqi = params.isMbqi;
|
|
216
232
|
this.params.mbqiMaxIterations = params.mbqiMaxIterations;
|
|
233
|
+
this.params.randomSeed = params.randomSeed;
|
|
217
234
|
this.config = {
|
|
218
235
|
...DEFAULT_CONFIG,
|
|
219
236
|
theories: this.config.theories,
|
|
220
237
|
isFindingMacros: params.isFindingMacros,
|
|
238
|
+
isEliminatingTermIte: this.config.isEliminatingTermIte,
|
|
239
|
+
isEliminatingBounds: this.config.isEliminatingBounds,
|
|
221
240
|
};
|
|
222
241
|
this.qmanager.updateParams();
|
|
223
242
|
}
|
|
@@ -228,6 +247,7 @@ export class Context extends Internalizer {
|
|
|
228
247
|
isUsingStaticFeatures: boolean,
|
|
229
248
|
asserted: AssertedFormulas,
|
|
230
249
|
) {
|
|
250
|
+
if (this.isInconsistent() || asserted.isInconsistent) return false;
|
|
231
251
|
const config = getSmtConfig(
|
|
232
252
|
this.manager,
|
|
233
253
|
setup,
|
|
@@ -237,11 +257,13 @@ export class Context extends Internalizer {
|
|
|
237
257
|
);
|
|
238
258
|
this.setup = setup;
|
|
239
259
|
this.config = config;
|
|
260
|
+
this.randomSeed = this.params.randomSeed ?? 0;
|
|
240
261
|
if (config.relevancyLevel !== undefined) this.relevancy.isEnabled = config.relevancyLevel > 0;
|
|
241
262
|
for (const family of config.theories)
|
|
242
263
|
if (family !== FAMILY_POLY || this.manager.hasTypeVars) this.registerFamily(family);
|
|
243
264
|
this.registerFamily(FAMILY_PB);
|
|
244
265
|
asserted.setup(config);
|
|
266
|
+
return true;
|
|
245
267
|
}
|
|
246
268
|
|
|
247
269
|
// register_plugin keeps the theory a family already has.
|
|
@@ -259,8 +281,8 @@ export class Context extends Internalizer {
|
|
|
259
281
|
return family < 0 ? undefined : this.theoryByFamily[family];
|
|
260
282
|
}
|
|
261
283
|
|
|
262
|
-
checkCanceled() {
|
|
263
|
-
if (this.manager.limit.inc()) return false;
|
|
284
|
+
checkCanceled(cost = 1) {
|
|
285
|
+
if (this.manager.limit.inc(cost)) return false;
|
|
264
286
|
this.lastSearchFailure = FAILURE_CANCELED;
|
|
265
287
|
return true;
|
|
266
288
|
}
|
|
@@ -979,11 +1001,12 @@ export class Context extends Internalizer {
|
|
|
979
1001
|
this.cacheGeneration(newLevel, visited);
|
|
980
1002
|
this.qmanager.pop(numScopes);
|
|
981
1003
|
this.fingerprints.pop(numScopes);
|
|
1004
|
+
if (newLevel >= this.baseLevel || !this.isBaseScopeInconsistent[newLevel]) this.conflict = null;
|
|
982
1005
|
if (newLevel < this.baseLevel) {
|
|
983
1006
|
this.deleteClauses(this.lemmas, this.baseScopeLemmaLimits[newLevel]);
|
|
984
1007
|
shrink(this.baseScopeLemmaLimits, newLevel);
|
|
1008
|
+
shrink(this.isBaseScopeInconsistent, newLevel);
|
|
985
1009
|
}
|
|
986
|
-
this.conflict = null;
|
|
987
1010
|
this.deleteClauses(this.auxClauses, this.scopeAuxClauseLimits[newLevel]);
|
|
988
1011
|
this.relevancy.pop(numScopes);
|
|
989
1012
|
this.unassignVars(this.scopeAssignedLimits[newLevel]);
|
|
@@ -1209,7 +1232,7 @@ export class Context extends Internalizer {
|
|
|
1209
1232
|
const theory = this.theories[this.finalCheckIndex];
|
|
1210
1233
|
const check = theory === undefined ? qmanager.finalCheckEh(true) : theory.finalCheckEh(level);
|
|
1211
1234
|
if (theory !== undefined) maxLevel = Math.max(maxLevel, theory.numFinalCheckLevels());
|
|
1212
|
-
const isCanceled = theory
|
|
1235
|
+
const isCanceled = theory !== undefined && this.checkCanceled();
|
|
1213
1236
|
if (isCanceled) failure = FAILURE_CANCELED;
|
|
1214
1237
|
else if (theory !== undefined && check === FC_GIVEUP) {
|
|
1215
1238
|
failure = FAILURE_THEORY;
|
|
@@ -1277,6 +1300,9 @@ export class Context extends Internalizer {
|
|
|
1277
1300
|
}
|
|
1278
1301
|
|
|
1279
1302
|
private mkProtoModel() {
|
|
1303
|
+
const failure = this.lastSearchFailure;
|
|
1304
|
+
if (this.hasCaseSplits() || failure === FAILURE_CANCELED || failure === FAILURE_NUM_CONFLICTS)
|
|
1305
|
+
return undefined;
|
|
1280
1306
|
if (this.modelState.kind !== "none") this.modelState.generated.model.decRef();
|
|
1281
1307
|
const generated = mkModel(this);
|
|
1282
1308
|
generated.model.incRef();
|
|
@@ -1319,9 +1345,12 @@ export class Context extends Internalizer {
|
|
|
1319
1345
|
}
|
|
1320
1346
|
|
|
1321
1347
|
getModel() {
|
|
1348
|
+
if (this.isInconsistent()) return undefined;
|
|
1322
1349
|
if (this.modelState.kind === "final") return this.modelState.model;
|
|
1350
|
+
if (!this.manager.limit.inc()) return undefined;
|
|
1323
1351
|
const generated =
|
|
1324
1352
|
this.modelState.kind === "proto" ? this.modelState.generated : this.mkProtoModel();
|
|
1353
|
+
if (generated === undefined) return undefined;
|
|
1325
1354
|
const model = generated.model.mkModel();
|
|
1326
1355
|
model.addRecFuns();
|
|
1327
1356
|
model.incRef();
|
|
@@ -1329,6 +1358,13 @@ export class Context extends Internalizer {
|
|
|
1329
1358
|
return model;
|
|
1330
1359
|
}
|
|
1331
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
|
+
|
|
1332
1368
|
validateModel(model: ProtoModel) {
|
|
1333
1369
|
const manager = this.manager;
|
|
1334
1370
|
for (const literal of this.assignedLiterals) {
|
|
@@ -1358,7 +1394,10 @@ export class Context extends Internalizer {
|
|
|
1358
1394
|
)
|
|
1359
1395
|
return status;
|
|
1360
1396
|
const generated = this.mkProtoModel();
|
|
1361
|
-
if (
|
|
1397
|
+
if (
|
|
1398
|
+
generated === undefined ||
|
|
1399
|
+
qmanager.checkModel(generated.model, generated.root2value) !== CHECK_MODEL_RESTART
|
|
1400
|
+
)
|
|
1362
1401
|
return status;
|
|
1363
1402
|
this.lastSearchFailure = FAILURE_OK;
|
|
1364
1403
|
status = L_UNDEF;
|
|
@@ -1368,9 +1407,10 @@ export class Context extends Internalizer {
|
|
|
1368
1407
|
if (status === L_TRUE && qmanager.quantifiers.length === 0) return L_TRUE;
|
|
1369
1408
|
if (status === L_TRUE) {
|
|
1370
1409
|
const generated = this.mkProtoModel();
|
|
1371
|
-
const result =
|
|
1372
|
-
|
|
1373
|
-
|
|
1410
|
+
const result =
|
|
1411
|
+
generated !== undefined && qmanager.isModelBased()
|
|
1412
|
+
? qmanager.checkModel(generated.model, generated.root2value)
|
|
1413
|
+
: CHECK_MODEL_UNKNOWN;
|
|
1374
1414
|
if (result === CHECK_MODEL_SAT) return L_TRUE;
|
|
1375
1415
|
if (result === CHECK_MODEL_UNKNOWN) {
|
|
1376
1416
|
this.lastSearchFailure = FAILURE_QUANTIFIERS;
|
|
@@ -1466,6 +1506,7 @@ export class Context extends Internalizer {
|
|
|
1466
1506
|
this.popToBaseLevel();
|
|
1467
1507
|
this.pushScope();
|
|
1468
1508
|
this.baseScopeLemmaLimits.push(this.lemmas.length);
|
|
1509
|
+
this.isBaseScopeInconsistent.push(this.isInconsistent());
|
|
1469
1510
|
this.baseLevel++;
|
|
1470
1511
|
this.searchLevel++;
|
|
1471
1512
|
}
|
|
@@ -1499,15 +1540,23 @@ export class Context extends Internalizer {
|
|
|
1499
1540
|
this.asserted = asserted;
|
|
1500
1541
|
this.macros = asserted.macros;
|
|
1501
1542
|
this.hasQuantifiers = asserted.hasQuantifiers;
|
|
1502
|
-
|
|
1543
|
+
if (this.checkCanceled()) return;
|
|
1544
|
+
asserted.reduce();
|
|
1545
|
+
if (this.checkCanceled()) return;
|
|
1503
1546
|
if (asserted.isInconsistent) {
|
|
1504
1547
|
this.setConflict("axiom", null);
|
|
1505
1548
|
return;
|
|
1506
1549
|
}
|
|
1507
|
-
|
|
1508
|
-
|
|
1509
|
-
|
|
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);
|
|
1510
1558
|
}
|
|
1559
|
+
asserted.commit();
|
|
1511
1560
|
}
|
|
1512
1561
|
|
|
1513
1562
|
initAssumptions(assumptions: number[], asserted: AssertedFormulas) {
|
|
@@ -1516,7 +1565,7 @@ export class Context extends Internalizer {
|
|
|
1516
1565
|
this.unsatCore = [];
|
|
1517
1566
|
if (assumptions.length > 0) {
|
|
1518
1567
|
this.propagate();
|
|
1519
|
-
if (this.isInconsistent()) return;
|
|
1568
|
+
if (this.isInconsistent() || this.checkCanceled()) return;
|
|
1520
1569
|
this.delInactiveLemmas();
|
|
1521
1570
|
this.pushScope();
|
|
1522
1571
|
const manager = this.manager;
|
|
@@ -1616,10 +1665,12 @@ export class Context extends Internalizer {
|
|
|
1616
1665
|
}
|
|
1617
1666
|
|
|
1618
1667
|
search() {
|
|
1668
|
+
if (this.asserted?.isInconsistent && !this.isInconsistent()) this.setConflict("axiom", null);
|
|
1619
1669
|
if (this.isInconsistent()) {
|
|
1620
1670
|
this.resolveConflict();
|
|
1621
1671
|
return L_FALSE;
|
|
1622
1672
|
}
|
|
1673
|
+
if (this.checkCanceled()) return L_UNDEF;
|
|
1623
1674
|
this.resetModel();
|
|
1624
1675
|
for (const theory of this.theories) theory.initSearchEh();
|
|
1625
1676
|
this.qmanager.initSearchEh();
|
|
@@ -74,8 +74,7 @@ class CtxSimplifier {
|
|
|
74
74
|
for (const form of goal.forms.items) {
|
|
75
75
|
this.pinned.push(form);
|
|
76
76
|
visit(form);
|
|
77
|
-
|
|
78
|
-
const expr = stack.pop() as number;
|
|
77
|
+
for (let expr = stack.pop(); expr !== undefined; expr = stack.pop()) {
|
|
79
78
|
if (manager.kinds[expr] !== KIND_APP) continue;
|
|
80
79
|
for (let index = manager.getNumArgs(expr) - 1; index >= 0; index--)
|
|
81
80
|
visit(manager.getArg(expr, index));
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { SmtInvariantError } from "../../../errors";
|
|
1
|
+
import { SmtDefaultError, SmtInvariantError } from "../../../errors";
|
|
2
2
|
import {
|
|
3
3
|
type AstManager,
|
|
4
4
|
OP_DT_ACCESSOR,
|
|
@@ -327,7 +327,7 @@ const computeSizeFunctions = (manager: AstManager, names: string[]) => {
|
|
|
327
327
|
}
|
|
328
328
|
};
|
|
329
329
|
|
|
330
|
-
const
|
|
330
|
+
export const resetDatatypePlugin = (manager: AstManager) => {
|
|
331
331
|
manager.datatypeConstructors = [];
|
|
332
332
|
manager.constructorAccessors = [];
|
|
333
333
|
manager.constructorRecognizers = [];
|
|
@@ -337,7 +337,7 @@ const resetDeclarations = (manager: AstManager) => {
|
|
|
337
337
|
|
|
338
338
|
export const removeDatatype = (manager: AstManager, name: string) => {
|
|
339
339
|
manager.datatypeDefs.delete(name);
|
|
340
|
-
|
|
340
|
+
resetDatatypePlugin(manager);
|
|
341
341
|
};
|
|
342
342
|
|
|
343
343
|
export const mkDatatypeDef = (
|
|
@@ -357,7 +357,7 @@ export const mkDatatypeDef = (
|
|
|
357
357
|
|
|
358
358
|
export const mkDatatypes = (manager: AstManager, defs: DatatypeDef[]): number[] | string => {
|
|
359
359
|
for (const def of defs) {
|
|
360
|
-
if (manager.datatypeDefs.has(def.name))
|
|
360
|
+
if (manager.datatypeDefs.has(def.name)) resetDatatypePlugin(manager);
|
|
361
361
|
manager.datatypeDefs.set(def.name, def);
|
|
362
362
|
}
|
|
363
363
|
const sorts = defs.map((def) => instantiateDef(manager, def, []));
|
|
@@ -415,7 +415,12 @@ export const instantiateAccessor = (
|
|
|
415
415
|
export const getDatatypeConstructors = (manager: AstManager, sort: number) => {
|
|
416
416
|
const existing = manager.datatypeConstructors[sort];
|
|
417
417
|
if (existing !== undefined) return existing;
|
|
418
|
-
const def =
|
|
418
|
+
const def = getDatatypeDef(manager, sort);
|
|
419
|
+
if (def === undefined) {
|
|
420
|
+
// Z3 caches the empty list before it raises, so a later call gets no constructors.
|
|
421
|
+
manager.datatypeConstructors[sort] = [];
|
|
422
|
+
throw new SmtDefaultError("datatype constructors have not been created");
|
|
423
|
+
}
|
|
419
424
|
const parameters = manager.getSortParameters(sort);
|
|
420
425
|
const constructors = def.constructors.map((constructor, index) =>
|
|
421
426
|
manager.mkDatatypeDecl(
|
|
@@ -568,5 +573,8 @@ const getNonRecConstructorCore = (
|
|
|
568
573
|
return result === -1 ? { constructor: -1, depth: 0 } : remember(result, minDepth);
|
|
569
574
|
};
|
|
570
575
|
|
|
571
|
-
export const getNonRecConstructor = (manager: AstManager, sort: number) =>
|
|
572
|
-
getNonRecConstructorCore(manager, sort, [sort]).constructor;
|
|
576
|
+
export const getNonRecConstructor = (manager: AstManager, sort: number) => {
|
|
577
|
+
const constructor = getNonRecConstructorCore(manager, sort, [sort]).constructor;
|
|
578
|
+
if (constructor === -1) throw new SmtDefaultError("constructor not available");
|
|
579
|
+
return constructor;
|
|
580
|
+
};
|
|
@@ -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);
|
|
@@ -51,12 +51,13 @@ const constrainDomain = (manager: AstManager, bounds: RefVector, expr: number, s
|
|
|
51
51
|
bounds.push(mkBvApp(manager, OP_ULEQ, [expr, mkEnumValue(manager, domainSize - 1, sort)]));
|
|
52
52
|
};
|
|
53
53
|
|
|
54
|
-
class Enum2BvRewriter extends RewriterTpl {
|
|
54
|
+
export class Enum2BvRewriter extends RewriterTpl {
|
|
55
55
|
readonly enumIndexes: ObjMap<number>;
|
|
56
56
|
readonly enumConsts: number[] = [];
|
|
57
57
|
readonly enumBvs: number[] = [];
|
|
58
58
|
readonly enumDefs: RefVector;
|
|
59
59
|
readonly bounds: RefVector;
|
|
60
|
+
private readonly enumConstsLimits: number[] = [];
|
|
60
61
|
|
|
61
62
|
// Without fd sorts, every enumeration sort is finite-domain.
|
|
62
63
|
constructor(
|
|
@@ -181,6 +182,25 @@ class Enum2BvRewriter extends RewriterTpl {
|
|
|
181
182
|
return result;
|
|
182
183
|
}
|
|
183
184
|
|
|
185
|
+
push() {
|
|
186
|
+
this.enumConstsLimits.push(this.enumConsts.length);
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
pop(numScopes: number) {
|
|
190
|
+
const manager = this.manager;
|
|
191
|
+
if (numScopes > 0) {
|
|
192
|
+
const size = this.enumConstsLimits.length - numScopes;
|
|
193
|
+
const limit = this.enumConstsLimits[size];
|
|
194
|
+
for (let index = this.enumConsts.length - 1; index >= limit; index--)
|
|
195
|
+
this.enumIndexes.delete(this.enumConsts[index]);
|
|
196
|
+
this.enumConstsLimits.length = size;
|
|
197
|
+
for (const decl of this.enumConsts.splice(limit)) manager.decDeclRef(decl);
|
|
198
|
+
this.enumDefs.shrink(limit);
|
|
199
|
+
for (const decl of this.enumBvs.splice(limit)) manager.decDeclRef(decl);
|
|
200
|
+
}
|
|
201
|
+
this.reset();
|
|
202
|
+
}
|
|
203
|
+
|
|
184
204
|
// ~imp: the rewriter goes before the vectors.
|
|
185
205
|
release() {
|
|
186
206
|
const manager = this.manager;
|
|
@@ -228,33 +248,49 @@ export const createDt2BvTactic = (manager: AstManager) => {
|
|
|
228
248
|
else argsCannotBeFd(expr);
|
|
229
249
|
}
|
|
230
250
|
for (const sort of nonFdSorts) fdSorts.delete(sort);
|
|
231
|
-
if (fdSorts.size > 0)
|
|
251
|
+
if (fdSorts.size > 0)
|
|
252
|
+
runEnum2Bv(
|
|
253
|
+
manager,
|
|
254
|
+
goal,
|
|
255
|
+
(visit) => {
|
|
256
|
+
const size = goal.forms.size;
|
|
257
|
+
for (let index = 0; index < size && !goal.isInconsistent; index++) visit(index);
|
|
258
|
+
},
|
|
259
|
+
fdSorts,
|
|
260
|
+
);
|
|
232
261
|
goal.depth++;
|
|
233
262
|
return [goal];
|
|
234
263
|
};
|
|
235
264
|
};
|
|
236
265
|
|
|
237
|
-
export const runEnum2Bv = (
|
|
266
|
+
export const runEnum2Bv = (
|
|
267
|
+
manager: AstManager,
|
|
268
|
+
goal: Goal,
|
|
269
|
+
forEachIndex: (visit: (index: number) => void) => void,
|
|
270
|
+
fdSorts?: Set<number>,
|
|
271
|
+
) => {
|
|
238
272
|
const rewriter = new Enum2BvRewriter(manager, fdSorts);
|
|
239
273
|
let rewritten = -1;
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
274
|
+
try {
|
|
275
|
+
forEachIndex((index) => {
|
|
276
|
+
const next = rewriter.rewrite(goal.forms.items[index]);
|
|
277
|
+
release(manager, rewritten);
|
|
278
|
+
rewritten = next;
|
|
279
|
+
goal.update(index, rewritten);
|
|
280
|
+
});
|
|
281
|
+
const bounds = new RefVector(manager);
|
|
282
|
+
for (const bound of rewriter.bounds.items) bounds.push(bound);
|
|
283
|
+
rewriter.bounds.reset();
|
|
284
|
+
for (const bound of bounds.items) goal.assert(bound);
|
|
285
|
+
const definitions: Definition[] = [];
|
|
286
|
+
for (const entry of rewriter.enumIndexes)
|
|
287
|
+
definitions.push({ decl: rewriter.enumBvs[entry[1]], def: -1 });
|
|
288
|
+
for (const entry of rewriter.enumIndexes)
|
|
289
|
+
definitions.push({ decl: entry[0], def: rewriter.enumDefs.items[entry[1]] });
|
|
290
|
+
if (definitions.length > 0) goal.addDefinitions(definitions);
|
|
291
|
+
bounds.reset();
|
|
292
|
+
} finally {
|
|
243
293
|
release(manager, rewritten);
|
|
244
|
-
|
|
245
|
-
goal.update(index, rewritten);
|
|
294
|
+
rewriter.release();
|
|
246
295
|
}
|
|
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
296
|
};
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
import {
|
|
2
|
+
type AstManager,
|
|
3
|
+
KIND_VAR,
|
|
4
|
+
OP_ADD,
|
|
5
|
+
OP_GE,
|
|
6
|
+
OP_LE,
|
|
7
|
+
OP_MUL,
|
|
8
|
+
OP_NOT,
|
|
9
|
+
OP_OR,
|
|
10
|
+
QUANTIFIER_FORALL,
|
|
11
|
+
} from "./ast";
|
|
12
|
+
import { Rational } from "./rational";
|
|
13
|
+
import { RewriterTpl } from "./rewriter-tpl";
|
|
14
|
+
import { collectUsedVars, elimUnusedVars } from "./var-subst";
|
|
15
|
+
|
|
16
|
+
interface Bound {
|
|
17
|
+
lower: number;
|
|
18
|
+
upper: number;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
const getBound = (manager: AstManager, atom: number): Bound | undefined => {
|
|
22
|
+
const isNegated = manager.getOp(atom) === OP_NOT;
|
|
23
|
+
const inequality = isNegated ? manager.getArg(atom, 0) : atom;
|
|
24
|
+
const op = manager.getOp(inequality);
|
|
25
|
+
if ((op !== OP_LE && op !== OP_GE) || !manager.isNumeral(manager.getArg(inequality, 1)))
|
|
26
|
+
return undefined;
|
|
27
|
+
const isLe = (op === OP_LE) !== isNegated;
|
|
28
|
+
const term = manager.getArg(inequality, 0);
|
|
29
|
+
const bound = { lower: -1, upper: -1 };
|
|
30
|
+
if (manager.kinds[term] === KIND_VAR) bound.upper = term;
|
|
31
|
+
else if (manager.getOp(term) === OP_ADD && manager.getNumArgs(term) === 2) {
|
|
32
|
+
const first = manager.getArg(term, 0);
|
|
33
|
+
if (manager.kinds[first] === KIND_VAR) bound.upper = first;
|
|
34
|
+
else if (!manager.isGroundApp(first)) return undefined;
|
|
35
|
+
const second = manager.getArg(term, 1);
|
|
36
|
+
if (
|
|
37
|
+
manager.getOp(second) !== OP_MUL ||
|
|
38
|
+
!manager.isNumeral(manager.getArg(second, 0)) ||
|
|
39
|
+
!manager.getRationalValue(manager.getArg(second, 0)).equals(Rational.minusOne)
|
|
40
|
+
)
|
|
41
|
+
return undefined;
|
|
42
|
+
const negated = manager.getArg(second, 1);
|
|
43
|
+
if (manager.kinds[negated] === KIND_VAR) bound.lower = negated;
|
|
44
|
+
else if (!manager.isGroundApp(negated)) return undefined;
|
|
45
|
+
} else return undefined;
|
|
46
|
+
return isLe ? bound : { lower: bound.upper, upper: bound.lower };
|
|
47
|
+
};
|
|
48
|
+
|
|
49
|
+
export class ElimBoundsRw extends RewriterTpl {
|
|
50
|
+
reduceQuantifier(expr: number, body: number) {
|
|
51
|
+
const manager = this.manager;
|
|
52
|
+
const data = manager.getQuantifier(expr);
|
|
53
|
+
if (data.kind !== QUANTIFIER_FORALL) return -1;
|
|
54
|
+
const numVars = data.sorts.length;
|
|
55
|
+
const atoms = manager.getOp(body) === OP_OR ? manager.getArgs(body) : [body];
|
|
56
|
+
const isUsed = Array.from({ length: numVars }, () => false);
|
|
57
|
+
for (const atom of atoms)
|
|
58
|
+
if (getBound(manager, atom) === undefined)
|
|
59
|
+
for (const [index, isVarUsed] of collectUsedVars(manager, atom, numVars).entries())
|
|
60
|
+
if (isVarUsed) isUsed[index] = true;
|
|
61
|
+
if (isUsed.every((isVarUsed) => isVarUsed)) return -1;
|
|
62
|
+
const isCandidate = (variable: number) =>
|
|
63
|
+
variable !== -1 && manager.values[variable] < numVars && !isUsed[manager.values[variable]];
|
|
64
|
+
const lowers = new Set<number>();
|
|
65
|
+
const uppers = new Set<number>();
|
|
66
|
+
for (const atom of atoms) {
|
|
67
|
+
const bound = getBound(manager, atom);
|
|
68
|
+
if (bound === undefined) continue;
|
|
69
|
+
if (isCandidate(bound.lower)) lowers.add(bound.lower);
|
|
70
|
+
if (isCandidate(bound.upper)) uppers.add(bound.upper);
|
|
71
|
+
}
|
|
72
|
+
const candidates = new Set(
|
|
73
|
+
[...lowers, ...uppers].filter((variable) => !lowers.has(variable) || !uppers.has(variable)),
|
|
74
|
+
);
|
|
75
|
+
if (candidates.size === 0) return -1;
|
|
76
|
+
const kept = atoms.filter((atom) => {
|
|
77
|
+
const bound = getBound(manager, atom);
|
|
78
|
+
return bound === undefined || (!candidates.has(bound.lower) && !candidates.has(bound.upper));
|
|
79
|
+
});
|
|
80
|
+
if (kept.length === atoms.length) return -1;
|
|
81
|
+
if (kept.length === 0) {
|
|
82
|
+
manager.incRef(manager.falseExpr);
|
|
83
|
+
return manager.falseExpr;
|
|
84
|
+
}
|
|
85
|
+
return manager.withTemporaries(() =>
|
|
86
|
+
elimUnusedVars(manager, manager.mkQuantifier({ ...data, body: manager.mkOr(kept) })),
|
|
87
|
+
);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { type AstManager, OP_ITE, SORT_BOOL } from "./ast";
|
|
2
|
+
import type { Definition, Goal } from "./goal";
|
|
3
|
+
import { DefinedNames } from "./nnf";
|
|
4
|
+
import { RewriterTpl } from "./rewriter-tpl";
|
|
5
|
+
|
|
6
|
+
class ElimTermIteRw extends RewriterTpl {
|
|
7
|
+
readonly hidden: Definition[] = [];
|
|
8
|
+
|
|
9
|
+
constructor(
|
|
10
|
+
manager: AstManager,
|
|
11
|
+
private names: DefinedNames,
|
|
12
|
+
private goal: Goal,
|
|
13
|
+
) {
|
|
14
|
+
super(manager);
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
reduceApp(decl: number, args: number[], sort: number) {
|
|
18
|
+
const manager = this.manager;
|
|
19
|
+
if (decl !== OP_ITE || sort === SORT_BOOL) return -1;
|
|
20
|
+
const ite = manager.mkApp(OP_ITE, args, sort);
|
|
21
|
+
manager.incRef(ite);
|
|
22
|
+
const named = this.names.mkName(ite);
|
|
23
|
+
if (named.definition !== -1) {
|
|
24
|
+
this.goal.assert(named.definition);
|
|
25
|
+
if (this.goal.isModelsEnabled) this.hidden.push({ decl: manager.decls[named.name], def: -1 });
|
|
26
|
+
}
|
|
27
|
+
manager.incRef(named.name);
|
|
28
|
+
if (named.definition !== -1) manager.decRef(named.definition);
|
|
29
|
+
manager.decRef(ite);
|
|
30
|
+
return named.name;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
export const runElimTermIte = (manager: AstManager) => (goal: Goal) => {
|
|
35
|
+
const names = new DefinedNames(manager, null);
|
|
36
|
+
const rewriter = new ElimTermIteRw(manager, names, goal);
|
|
37
|
+
const size = goal.forms.size;
|
|
38
|
+
for (let index = 0; index < size && !goal.isInconsistent; index++) {
|
|
39
|
+
const result = rewriter.rewrite(goal.forms.items[index]);
|
|
40
|
+
goal.update(index, result, goal.getDependency(index));
|
|
41
|
+
manager.decRef(result);
|
|
42
|
+
}
|
|
43
|
+
if (rewriter.hidden.length > 0) goal.addDefinitions(rewriter.hidden);
|
|
44
|
+
goal.depth++;
|
|
45
|
+
names.release();
|
|
46
|
+
rewriter.release();
|
|
47
|
+
return [goal];
|
|
48
|
+
};
|