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,16 +1,31 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { SmtCanceledError, SmtTacticError } from "../../../../errors";
|
|
2
2
|
import { type AstManager, OP_AND, OP_EQ, OP_IMPLIES, OP_NOT, OP_OR, SORT_BOOL } from "../ast";
|
|
3
|
+
import { mkNot } from "../ast-util";
|
|
3
4
|
import { BitBlasterRewriter } from "../bit-blast-tactic";
|
|
4
|
-
import { Goal } from "../goal";
|
|
5
|
+
import { Goal, mkDependencyLeaf } from "../goal";
|
|
5
6
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
6
7
|
import { ProtoModel } from "../proto-model";
|
|
7
8
|
import { RefVector } from "../ref-vector";
|
|
9
|
+
import {
|
|
10
|
+
DEFAULT_PRINT_OPTIONS,
|
|
11
|
+
formatSort,
|
|
12
|
+
getQuotedName,
|
|
13
|
+
mkSeq1,
|
|
14
|
+
mkSeq5,
|
|
15
|
+
mkText,
|
|
16
|
+
renderFormat,
|
|
17
|
+
} from "../smt2-printer";
|
|
8
18
|
import type { ThSolverFactory } from "../euf/euf-solver";
|
|
9
|
-
import {
|
|
19
|
+
import {
|
|
20
|
+
applyDefinitions,
|
|
21
|
+
convertModel,
|
|
22
|
+
mkIncSatEufPreprocess,
|
|
23
|
+
mkIncSatPreprocess,
|
|
24
|
+
} from "../tactic";
|
|
10
25
|
import type { SatParams } from "./config";
|
|
11
26
|
import { Goal2Sat } from "./goal2sat";
|
|
12
27
|
import { getConsequences } from "./consequences";
|
|
13
|
-
import { isLiteral, sat2goal } from "./sat2goal";
|
|
28
|
+
import { isLiteral, Sat2GoalConverter, sat2goal } from "./sat2goal";
|
|
14
29
|
import { Solver } from "./solver";
|
|
15
30
|
|
|
16
31
|
const BIT_BLAST_PARAMS = {
|
|
@@ -24,6 +39,8 @@ interface Scope {
|
|
|
24
39
|
readonly converters: Goal["converters"];
|
|
25
40
|
readonly fmlsSize: number;
|
|
26
41
|
readonly fmlsHead: number;
|
|
42
|
+
readonly namesSize: number;
|
|
43
|
+
readonly hasUninterpreted: boolean;
|
|
27
44
|
}
|
|
28
45
|
|
|
29
46
|
export class IncSatSolver {
|
|
@@ -31,6 +48,7 @@ export class IncSatSolver {
|
|
|
31
48
|
private readonly goal2sat: Goal2Sat;
|
|
32
49
|
private readonly fmls: RefVector;
|
|
33
50
|
private fmlsHead = 0;
|
|
51
|
+
private readonly names: RefVector;
|
|
34
52
|
private isCnf = true;
|
|
35
53
|
private readonly core: RefVector;
|
|
36
54
|
private dep2asm = new Map<number, number>();
|
|
@@ -38,10 +56,12 @@ export class IncSatSolver {
|
|
|
38
56
|
private bitBlaster: BitBlasterRewriter | undefined;
|
|
39
57
|
// m_mcs.back(), the model converters of the preprocessed goals.
|
|
40
58
|
private readonly converters: Goal;
|
|
59
|
+
private readonly satConverter: Sat2GoalConverter;
|
|
41
60
|
private isInternalizedConverted = false;
|
|
42
61
|
private readonly internalized: RefVector;
|
|
43
62
|
private hasUninterpreted = false;
|
|
44
63
|
private models: ProtoModel[] = [];
|
|
64
|
+
private subgoals: Goal[] = [];
|
|
45
65
|
private scopes: Scope[] = [];
|
|
46
66
|
reasonUnknown = "no reason given";
|
|
47
67
|
wasUnknown = false;
|
|
@@ -62,8 +82,10 @@ export class IncSatSolver {
|
|
|
62
82
|
);
|
|
63
83
|
if (mkThSolver !== null) this.goal2sat.ensureEuf();
|
|
64
84
|
this.fmls = new RefVector(manager);
|
|
85
|
+
this.names = new RefVector(manager);
|
|
65
86
|
this.core = new RefVector(manager);
|
|
66
87
|
this.converters = new Goal(manager);
|
|
88
|
+
this.satConverter = new Sat2GoalConverter(manager);
|
|
67
89
|
this.internalized = new RefVector(manager);
|
|
68
90
|
}
|
|
69
91
|
|
|
@@ -87,21 +109,44 @@ export class IncSatSolver {
|
|
|
87
109
|
this.fmls.push(expr);
|
|
88
110
|
}
|
|
89
111
|
|
|
90
|
-
|
|
112
|
+
assertNamed(expr: number, name: number) {
|
|
113
|
+
const manager = this.manager;
|
|
114
|
+
this.names.push(name);
|
|
115
|
+
if (this.isCnf && isLiteral(manager, expr) && isLiteral(manager, name))
|
|
116
|
+
return this.assertExpr(manager.mkApp(OP_OR, [mkNot(manager, name), expr], SORT_BOOL));
|
|
117
|
+
if (
|
|
118
|
+
this.isCnf &&
|
|
119
|
+
manager.getOp(expr) === OP_OR &&
|
|
120
|
+
this.isClause(expr) &&
|
|
121
|
+
isLiteral(manager, name)
|
|
122
|
+
)
|
|
123
|
+
return this.assertExpr(
|
|
124
|
+
manager.mkApp(OP_OR, [mkNot(manager, name), ...manager.getArgs(expr)], SORT_BOOL),
|
|
125
|
+
);
|
|
126
|
+
this.isCnf = false;
|
|
127
|
+
this.assertExpr(manager.mkApp(OP_IMPLIES, [name, expr], SORT_BOOL));
|
|
128
|
+
}
|
|
129
|
+
|
|
91
130
|
push() {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
131
|
+
try {
|
|
132
|
+
this.internalizeFormulas();
|
|
133
|
+
} finally {
|
|
134
|
+
this.goal2sat.push();
|
|
135
|
+
this.solver.userPush();
|
|
136
|
+
this.bitBlaster?.push();
|
|
137
|
+
this.scopes.push({
|
|
138
|
+
converters: this.converters.converters,
|
|
139
|
+
fmlsSize: this.fmls.size,
|
|
140
|
+
fmlsHead: this.fmlsHead,
|
|
141
|
+
namesSize: this.names.size,
|
|
142
|
+
hasUninterpreted: this.hasUninterpreted,
|
|
143
|
+
});
|
|
144
|
+
}
|
|
101
145
|
}
|
|
102
146
|
|
|
103
147
|
pop(numScopes: number) {
|
|
104
148
|
const count = Math.min(numScopes, this.scopes.length);
|
|
149
|
+
this.bitBlaster?.pop(count);
|
|
105
150
|
this.goal2sat.pop(count);
|
|
106
151
|
this.solver.userPop(count);
|
|
107
152
|
for (let index = 0; index < count; index++) {
|
|
@@ -109,15 +154,33 @@ export class IncSatSolver {
|
|
|
109
154
|
this.converters.converters = scope.converters;
|
|
110
155
|
this.fmlsHead = scope.fmlsHead;
|
|
111
156
|
this.fmls.shrink(scope.fmlsSize);
|
|
157
|
+
this.names.shrink(scope.namesSize);
|
|
158
|
+
this.hasUninterpreted = scope.hasUninterpreted;
|
|
112
159
|
}
|
|
113
160
|
}
|
|
114
161
|
|
|
162
|
+
private getBitBlaster() {
|
|
163
|
+
const bitBlaster = (this.bitBlaster ??= new BitBlasterRewriter(this.manager, BIT_BLAST_PARAMS));
|
|
164
|
+
while (bitBlaster.getNumScopes() < this.scopes.length) bitBlaster.push();
|
|
165
|
+
return bitBlaster;
|
|
166
|
+
}
|
|
167
|
+
|
|
115
168
|
private checkUninterpreted() {
|
|
116
169
|
if (this.goal2sat.unhandledFuns.length === 0) return L_TRUE;
|
|
117
170
|
this.hasUninterpreted = true;
|
|
118
171
|
const manager = this.manager;
|
|
119
|
-
const
|
|
120
|
-
|
|
172
|
+
const funs = this.goal2sat.unhandledFuns.map((fun) => {
|
|
173
|
+
const declaration = mkSeq1(
|
|
174
|
+
[
|
|
175
|
+
mkText(getQuotedName(manager.funcDecls[fun.decl].name)),
|
|
176
|
+
mkSeq5(fun.domain.map((sort) => formatSort(manager, sort))),
|
|
177
|
+
formatSort(manager, fun.range),
|
|
178
|
+
],
|
|
179
|
+
"declare-fun",
|
|
180
|
+
);
|
|
181
|
+
return `${renderFormat(declaration, DEFAULT_PRINT_OPTIONS)}\n`;
|
|
182
|
+
});
|
|
183
|
+
this.reasonUnknown = `(sat.giveup interpreted functions sent to SAT solver ${funs.join("")})`;
|
|
121
184
|
return L_UNDEF;
|
|
122
185
|
}
|
|
123
186
|
|
|
@@ -131,7 +194,8 @@ export class IncSatSolver {
|
|
|
131
194
|
private internalizeGoal(goal: Goal) {
|
|
132
195
|
this.solver.popToBaseLevel();
|
|
133
196
|
if (this.solver.isInconsistent) return L_FALSE;
|
|
134
|
-
|
|
197
|
+
this.resetSubgoals();
|
|
198
|
+
const bitBlaster = this.getBitBlaster();
|
|
135
199
|
const subgoals = (() => {
|
|
136
200
|
if (this.isCnf) return [goal];
|
|
137
201
|
try {
|
|
@@ -144,15 +208,19 @@ export class IncSatSolver {
|
|
|
144
208
|
return goals;
|
|
145
209
|
} catch (error) {
|
|
146
210
|
this.releaseBitBlaster();
|
|
147
|
-
if (!(error instanceof SmtTacticError)) throw error;
|
|
148
|
-
|
|
211
|
+
if (!(error instanceof SmtTacticError || error instanceof SmtCanceledError)) throw error;
|
|
212
|
+
// The tactics of the preprocessing report a limit that stops their rewriters as a tactic_exception.
|
|
213
|
+
this.reasonUnknown =
|
|
214
|
+
error instanceof SmtCanceledError ? this.manager.limit.getCancelMessage() : error.message;
|
|
149
215
|
return undefined;
|
|
150
216
|
}
|
|
151
217
|
})();
|
|
218
|
+
this.subgoals = subgoals ?? [];
|
|
219
|
+
if (!this.subgoals.includes(goal)) goal.reset();
|
|
152
220
|
if (subgoals?.length !== 1) return L_UNDEF;
|
|
153
221
|
const subgoal = subgoals[0];
|
|
154
222
|
this.converters.converters = [...this.converters.converters, ...subgoal.converters];
|
|
155
|
-
this.goal2sat.
|
|
223
|
+
this.goal2sat.runGoal(subgoal, this.dep2asm);
|
|
156
224
|
return this.checkUninterpreted();
|
|
157
225
|
}
|
|
158
226
|
|
|
@@ -171,15 +239,27 @@ export class IncSatSolver {
|
|
|
171
239
|
}
|
|
172
240
|
|
|
173
241
|
private internalizeAssumptions(assumptions: readonly number[]) {
|
|
242
|
+
const manager = this.manager;
|
|
243
|
+
const all = [...assumptions, ...this.names.items];
|
|
174
244
|
this.asms = [];
|
|
245
|
+
if (all.length === 0) return L_TRUE;
|
|
246
|
+
this.isCnf &&= all.every((assumption) => isLiteral(manager, assumption));
|
|
247
|
+
if (this.isCnf) this.goal2sat.assumptions(all, this.dep2asm);
|
|
248
|
+
else {
|
|
249
|
+
const goal = new Goal(manager);
|
|
250
|
+
goal.isCoresEnabled = true;
|
|
251
|
+
for (const assumption of all) goal.assert(assumption, mkDependencyLeaf(assumption));
|
|
252
|
+
const result = this.internalizeGoal(goal);
|
|
253
|
+
if (result !== L_TRUE) return result;
|
|
254
|
+
}
|
|
175
255
|
const seen = new Set<number>();
|
|
176
|
-
for (const assumption of
|
|
177
|
-
const lit = this.
|
|
178
|
-
|
|
179
|
-
if (seen.has(lit)) continue;
|
|
256
|
+
for (const assumption of all) {
|
|
257
|
+
const lit = this.dep2asm.get(assumption);
|
|
258
|
+
if (lit === undefined || seen.has(lit)) continue;
|
|
180
259
|
seen.add(lit);
|
|
181
260
|
this.asms.push(lit);
|
|
182
261
|
}
|
|
262
|
+
return L_TRUE;
|
|
183
263
|
}
|
|
184
264
|
|
|
185
265
|
check(assumptions: readonly number[] = []) {
|
|
@@ -203,10 +283,20 @@ export class IncSatSolver {
|
|
|
203
283
|
this.dep2asm = new Map();
|
|
204
284
|
const internalized = this.internalizeFormulas();
|
|
205
285
|
if (internalized !== L_TRUE) return internalized;
|
|
206
|
-
this.internalizeAssumptions(literals);
|
|
286
|
+
const internalizedAssumptions = this.internalizeAssumptions(literals);
|
|
287
|
+
if (internalizedAssumptions !== L_TRUE) return internalizedAssumptions;
|
|
207
288
|
this.reasonUnknown = "no reason given";
|
|
208
289
|
this.isInternalizedConverted = false;
|
|
209
|
-
const result =
|
|
290
|
+
const result = (() => {
|
|
291
|
+
try {
|
|
292
|
+
return this.solver.check(this.asms);
|
|
293
|
+
} catch (error) {
|
|
294
|
+
if (!(error instanceof SmtCanceledError)) throw error;
|
|
295
|
+
// check_sat_core counts a step to see whether the limit stopped the search.
|
|
296
|
+
manager.limit.inc();
|
|
297
|
+
return L_UNDEF;
|
|
298
|
+
}
|
|
299
|
+
})();
|
|
210
300
|
if (result === L_TRUE && this.hasUninterpreted) {
|
|
211
301
|
this.reasonUnknown = "(sat.giveup has-uninterpreted)";
|
|
212
302
|
return L_UNDEF;
|
|
@@ -239,20 +329,19 @@ export class IncSatSolver {
|
|
|
239
329
|
|
|
240
330
|
getConsequences(assumptions: readonly number[], vars: readonly number[]) {
|
|
241
331
|
const manager = this.manager;
|
|
242
|
-
this.
|
|
332
|
+
this.getBitBlaster();
|
|
243
333
|
this.dep2asm = new Map();
|
|
244
334
|
this.solver.popToBaseLevel();
|
|
245
335
|
const consequences: number[] = [];
|
|
246
336
|
const internalized = this.internalizeFormulas();
|
|
247
337
|
if (internalized !== L_TRUE) return { result: internalized, consequences };
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
this.internalizeAssumptions(assumptions);
|
|
251
|
-
const found = getConsequences(
|
|
252
|
-
this.solver,
|
|
253
|
-
this.asms,
|
|
254
|
-
vars.flatMap((expr) => this.internalizeVar(expr).filter((boolVar) => boolVar !== undefined)),
|
|
338
|
+
const boolVars = vars.flatMap((expr) =>
|
|
339
|
+
this.internalizeVar(expr).filter((boolVar) => boolVar !== undefined),
|
|
255
340
|
);
|
|
341
|
+
const internalizedAssumptions = this.internalizeAssumptions(assumptions);
|
|
342
|
+
if (internalizedAssumptions !== L_TRUE)
|
|
343
|
+
return { result: internalizedAssumptions, consequences };
|
|
344
|
+
const found = getConsequences(this.solver, this.asms, boolVars);
|
|
256
345
|
if (found.result === L_FALSE && this.asms.length > 0) this.extractCore(new Map());
|
|
257
346
|
if (found.result === L_FALSE) return { result: found.result, consequences };
|
|
258
347
|
const boolVar2conseq = new Map<number, number[]>();
|
|
@@ -300,25 +389,27 @@ export class IncSatSolver {
|
|
|
300
389
|
return this.core.items;
|
|
301
390
|
}
|
|
302
391
|
|
|
303
|
-
|
|
392
|
+
mkModel() {
|
|
304
393
|
const manager = this.manager;
|
|
305
394
|
if (!this.solver.isModelCurrent || this.fmls.size > this.fmlsHead) return null;
|
|
306
395
|
const euf = this.goal2sat.euf;
|
|
307
|
-
|
|
308
|
-
const model = euf === null ? new ProtoModel(manager) : new ProtoModel(manager).mkModel();
|
|
396
|
+
const model = new ProtoModel(manager).mkModel();
|
|
309
397
|
for (const [expr, boolVar] of this.goal2sat.atoms) {
|
|
310
398
|
if (!manager.isUninterpretedConst(expr)) continue;
|
|
311
399
|
const value = this.solver.model[boolVar];
|
|
312
400
|
if (value === L_TRUE) model.registerConst(manager.decls[expr], manager.trueExpr);
|
|
313
401
|
else if (value === L_FALSE) model.registerConst(manager.decls[expr], manager.falseExpr);
|
|
314
402
|
}
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
this.
|
|
321
|
-
return
|
|
403
|
+
if (this.satConverter.entries.length > 0) applyDefinitions(this.satConverter.entries, model);
|
|
404
|
+
return convertModel(this.converters, euf === null ? model : euf.updateModel(model));
|
|
405
|
+
}
|
|
406
|
+
|
|
407
|
+
getModel() {
|
|
408
|
+
const model = this.mkModel();
|
|
409
|
+
if (model === null) return null;
|
|
410
|
+
model.incRef();
|
|
411
|
+
this.models.push(model);
|
|
412
|
+
return model;
|
|
322
413
|
}
|
|
323
414
|
|
|
324
415
|
findMutexes(vars: readonly number[]) {
|
|
@@ -346,10 +437,10 @@ export class IncSatSolver {
|
|
|
346
437
|
if (this.fmlsHead !== this.fmls.size) return this.fmls.items;
|
|
347
438
|
if (this.isInternalizedConverted) return this.internalized.items;
|
|
348
439
|
const goal = new Goal(this.manager);
|
|
349
|
-
sat2goal(this.manager, this.solver, this.goal2sat.atoms, goal);
|
|
440
|
+
sat2goal(this.manager, this.solver, this.goal2sat.atoms, goal, this.satConverter);
|
|
350
441
|
this.internalized.reset();
|
|
351
442
|
for (const form of goal.forms.items) this.internalized.push(form);
|
|
352
|
-
|
|
443
|
+
goal.reset();
|
|
353
444
|
this.isInternalizedConverted = true;
|
|
354
445
|
return this.internalized.items;
|
|
355
446
|
}
|
|
@@ -358,16 +449,27 @@ export class IncSatSolver {
|
|
|
358
449
|
// asserted formulas are internalized.
|
|
359
450
|
getConverters(): Goal["converters"] {
|
|
360
451
|
this.getAssertions();
|
|
361
|
-
return this.isInternalizedConverted
|
|
452
|
+
return this.isInternalizedConverted
|
|
453
|
+
? [...this.converters.converters, { definitions: this.satConverter.copyEntries() }]
|
|
454
|
+
: [];
|
|
455
|
+
}
|
|
456
|
+
|
|
457
|
+
private resetSubgoals() {
|
|
458
|
+
for (const subgoal of this.subgoals) subgoal.reset();
|
|
459
|
+
this.subgoals = [];
|
|
362
460
|
}
|
|
363
461
|
|
|
364
462
|
release() {
|
|
365
463
|
for (const model of this.models) model.decRef();
|
|
366
464
|
this.models = [];
|
|
465
|
+
this.resetSubgoals();
|
|
367
466
|
this.fmls.reset();
|
|
467
|
+
this.names.reset();
|
|
368
468
|
this.core.reset();
|
|
369
469
|
this.internalized.reset();
|
|
470
|
+
this.satConverter.release();
|
|
370
471
|
this.releaseBitBlaster();
|
|
472
|
+
this.goal2sat.release();
|
|
371
473
|
}
|
|
372
474
|
|
|
373
475
|
private releaseBitBlaster() {
|
|
@@ -33,6 +33,13 @@ export abstract class Constraint {
|
|
|
33
33
|
return this.lits.length;
|
|
34
34
|
}
|
|
35
35
|
|
|
36
|
+
getMaxVar() {
|
|
37
|
+
let maxVar = this.lit === NULL_LITERAL ? 0 : this.lit >> 1;
|
|
38
|
+
for (let index = 0; index < this.lits.length; index++)
|
|
39
|
+
maxVar = Math.max(maxVar, this.lits[index] >> 1);
|
|
40
|
+
return maxVar;
|
|
41
|
+
}
|
|
42
|
+
|
|
36
43
|
getCoeff(_index: number) {
|
|
37
44
|
return 1;
|
|
38
45
|
}
|
|
@@ -832,6 +832,24 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
832
832
|
this.numPropagationsSincePop = 0;
|
|
833
833
|
}
|
|
834
834
|
|
|
835
|
+
gcVars(numVars: number) {
|
|
836
|
+
this.gcConstraintVars(numVars, this.constraints);
|
|
837
|
+
this.gcConstraintVars(numVars, this.learned);
|
|
838
|
+
}
|
|
839
|
+
|
|
840
|
+
private gcConstraintVars(numVars: number, constraints: Constraint[]) {
|
|
841
|
+
let next = 0;
|
|
842
|
+
for (let index = 0; index < constraints.length; index++) {
|
|
843
|
+
const constraint = constraints[index];
|
|
844
|
+
if (constraint.getMaxVar() >= numVars) {
|
|
845
|
+
constraint.clearWatch(this);
|
|
846
|
+
constraint.nullifyTrackingLiteral(this);
|
|
847
|
+
this.deallocate(constraint);
|
|
848
|
+
} else constraints[next++] = constraint;
|
|
849
|
+
}
|
|
850
|
+
constraints.length = next;
|
|
851
|
+
}
|
|
852
|
+
|
|
835
853
|
popReinit() {
|
|
836
854
|
const toReinit = this.constraintToReinit;
|
|
837
855
|
let size = this.constraintToReinitLastSize;
|
|
@@ -1443,7 +1461,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1443
1461
|
private convertPbWlits(expr: number): WLits {
|
|
1444
1462
|
const manager = this.manager;
|
|
1445
1463
|
const lits = this.convertPbArgs(expr);
|
|
1446
|
-
const coeffs = lits.map((
|
|
1464
|
+
const coeffs = lits.map((_value, index) =>
|
|
1447
1465
|
this.checkUnsigned(getPbCoeff(manager, manager.decls[expr], index)),
|
|
1448
1466
|
);
|
|
1449
1467
|
return { coeffs, lits };
|
|
@@ -1470,7 +1488,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1470
1488
|
k = k.add(Rational.of(BigInt(wlits.coeffs[index])));
|
|
1471
1489
|
}
|
|
1472
1490
|
const bound = this.checkUnsigned(k);
|
|
1473
|
-
if (isRoot) {
|
|
1491
|
+
if (isRoot && this.solver.numUserScopes === 0) {
|
|
1474
1492
|
this.addRootPbGe(wlits, bound, isSign);
|
|
1475
1493
|
return NULL_LITERAL;
|
|
1476
1494
|
}
|
|
@@ -1482,7 +1500,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1482
1500
|
private convertPbGe(expr: number, isRoot: boolean, isSign: boolean) {
|
|
1483
1501
|
const bound = this.checkUnsigned(getPbK(this.manager, this.manager.decls[expr]));
|
|
1484
1502
|
const wlits = this.convertPbWlits(expr);
|
|
1485
|
-
if (isRoot) {
|
|
1503
|
+
if (isRoot && this.solver.numUserScopes === 0) {
|
|
1486
1504
|
this.addRootPbGe(wlits, bound, isSign);
|
|
1487
1505
|
return NULL_LITERAL;
|
|
1488
1506
|
}
|
|
@@ -1495,7 +1513,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1495
1513
|
const solver = this.solver;
|
|
1496
1514
|
let k = getPbK(this.manager, this.manager.decls[expr]);
|
|
1497
1515
|
const wlits = this.convertPbWlits(expr);
|
|
1498
|
-
const isBaseAssert = isRoot && !isSign;
|
|
1516
|
+
const isBaseAssert = isRoot && !isSign && solver.numUserScopes === 0;
|
|
1499
1517
|
const lit1 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true);
|
|
1500
1518
|
const lit2 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true);
|
|
1501
1519
|
this.addPbGe(lit1, wlits, Number(BigInt.asUintN(32, k.num)), false);
|
|
@@ -1528,7 +1546,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1528
1546
|
private convertAtLeastK(expr: number, k: Rational, isRoot: boolean, isSign: boolean) {
|
|
1529
1547
|
const lits = this.convertPbArgs(expr);
|
|
1530
1548
|
let bound = k.compare(Rational.of(BigInt(lits.length))) > 0 ? lits.length + 1 : Number(k.num);
|
|
1531
|
-
if (isRoot) {
|
|
1549
|
+
if (isRoot && this.solver.numUserScopes === 0) {
|
|
1532
1550
|
if (isSign) {
|
|
1533
1551
|
for (let index = 0; index < lits.length; index++) lits[index] ^= 1;
|
|
1534
1552
|
bound = lits.length + 1 - bound;
|
|
@@ -1547,7 +1565,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1547
1565
|
for (let index = 0; index < lits.length; index++) lits[index] ^= 1;
|
|
1548
1566
|
const bound1 = k.compare(Rational.of(BigInt(lits.length))) >= 0 ? lits.length : Number(k.num);
|
|
1549
1567
|
let bound = lits.length - bound1;
|
|
1550
|
-
if (isRoot) {
|
|
1568
|
+
if (isRoot && this.solver.numUserScopes === 0) {
|
|
1551
1569
|
if (isSign) {
|
|
1552
1570
|
for (let index = 0; index < lits.length; index++) lits[index] ^= 1;
|
|
1553
1571
|
bound = lits.length + 1 - bound;
|
|
@@ -1564,7 +1582,8 @@ export class PbSolver implements SatExtension, ConstraintHost {
|
|
|
1564
1582
|
private convertEqK(expr: number, k: Rational, isRoot: boolean, isSign: boolean) {
|
|
1565
1583
|
const solver = this.solver;
|
|
1566
1584
|
const lits = this.convertPbArgs(expr);
|
|
1567
|
-
|
|
1585
|
+
// Deviation from Z3: convert_eq_k asserts at the base level in a user scope too, so the constraint outlives the pop.
|
|
1586
|
+
const isBaseAssert = isRoot && !isSign && solver.numUserScopes === 0;
|
|
1568
1587
|
const lit1 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true);
|
|
1569
1588
|
const lit2 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true);
|
|
1570
1589
|
const bound = k.compare(Rational.of(BigInt(lits.length))) > 0 ? lits.length + 1 : Number(k.num);
|
|
@@ -1,12 +1,13 @@
|
|
|
1
|
-
import { SmtTacticError } from "../../../../errors";
|
|
1
|
+
import { SmtCanceledError, SmtTacticError } from "../../../../errors";
|
|
2
2
|
import type { AstManager } from "../ast";
|
|
3
3
|
import type { ThSolverFactory } from "../euf/euf-solver";
|
|
4
|
-
import { OVER, type Goal } from "../goal";
|
|
5
|
-
import {
|
|
4
|
+
import { joinDependencies, mkDependencyLeaf, OVER, type Dependency, type Goal } from "../goal";
|
|
5
|
+
import { ObjMap } from "../hashtable";
|
|
6
|
+
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
6
7
|
import { ProtoModel } from "../proto-model";
|
|
7
8
|
import type { SatParams } from "./config";
|
|
8
9
|
import { Goal2Sat } from "./goal2sat";
|
|
9
|
-
import { sat2goal } from "./sat2goal";
|
|
10
|
+
import { Sat2GoalConverter, sat2goal } from "./sat2goal";
|
|
10
11
|
import { Solver } from "./solver";
|
|
11
12
|
|
|
12
13
|
// With a theory factory, the sat solver runs the euf solver of sat.euf as its extension.
|
|
@@ -17,27 +18,55 @@ export const createSatTactic =
|
|
|
17
18
|
goal.elimRedundancies();
|
|
18
19
|
const solver = new Solver(params, manager.limit);
|
|
19
20
|
const goal2sat = new Goal2Sat(manager, solver, params.get("ite_extra") !== false, mkThSolver);
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
21
|
+
try {
|
|
22
|
+
const dep2asm = new ObjMap<number>((expr) => manager.hashes[expr]);
|
|
23
|
+
goal2sat.runGoal(goal, dep2asm);
|
|
24
|
+
goal.reset();
|
|
25
|
+
const result = (() => {
|
|
26
|
+
try {
|
|
27
|
+
return solver.check([...dep2asm.values()]);
|
|
28
|
+
} catch (error) {
|
|
29
|
+
if (error instanceof SmtCanceledError) throw new SmtTacticError("canceled");
|
|
30
|
+
throw error;
|
|
31
|
+
}
|
|
32
|
+
})();
|
|
33
|
+
if (result === L_UNDEF) goal.reasonUnknown = solver.reasonUnknown;
|
|
34
|
+
const unhandledFuns = goal2sat.euf?.unhandledFunctions ?? goal2sat.unhandledFuns;
|
|
35
|
+
if (result === L_FALSE) {
|
|
36
|
+
const asm2dep = new Map<number, number>();
|
|
37
|
+
for (const [dep, lit] of dep2asm) asm2dep.set(lit, dep);
|
|
38
|
+
goal.assert(
|
|
39
|
+
manager.falseExpr,
|
|
40
|
+
goal.isCoresEnabled
|
|
41
|
+
? solver.core.reduce<Dependency | undefined>(
|
|
42
|
+
(core, lit) => joinDependencies(core, mkDependencyLeaf(asm2dep.get(lit) as number)),
|
|
43
|
+
undefined,
|
|
44
|
+
)
|
|
45
|
+
: undefined,
|
|
46
|
+
);
|
|
47
|
+
} else if (result === L_TRUE && unhandledFuns.length === 0) {
|
|
48
|
+
if (goal.isModelsEnabled) {
|
|
49
|
+
const model = new ProtoModel(manager).mkModel();
|
|
50
|
+
for (const [expr, boolVar] of goal2sat.atoms) {
|
|
51
|
+
if (!manager.isUninterpretedConst(expr)) continue;
|
|
52
|
+
const value = solver.model[boolVar];
|
|
53
|
+
if (value === L_TRUE) model.registerConst(manager.decls[expr], manager.trueExpr);
|
|
54
|
+
else if (value === L_FALSE) model.registerConst(manager.decls[expr], manager.falseExpr);
|
|
55
|
+
}
|
|
56
|
+
const euf = goal2sat.euf;
|
|
57
|
+
goal.model = euf?.updateModel(model) ?? model;
|
|
58
|
+
euf?.validateModel(goal.model);
|
|
59
|
+
}
|
|
60
|
+
} else {
|
|
61
|
+
solver.popToBaseLevel();
|
|
62
|
+
const converter = new Sat2GoalConverter(manager);
|
|
63
|
+
sat2goal(manager, solver, goal2sat.atoms, goal, converter);
|
|
64
|
+
if (goal.isModelsEnabled) goal.addDefinitions(converter.entries);
|
|
65
|
+
if (goal.isCoresEnabled || unhandledFuns.length > 0) goal.updatePrecision(OVER);
|
|
32
66
|
}
|
|
33
|
-
|
|
34
|
-
goal
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
solver.popToBaseLevel();
|
|
38
|
-
sat2goal(manager, solver, goal2sat.atoms, goal);
|
|
39
|
-
if (unhandledFuns.length > 0) goal.updatePrecision(OVER);
|
|
67
|
+
goal.depth++;
|
|
68
|
+
return [goal];
|
|
69
|
+
} finally {
|
|
70
|
+
goal2sat.release();
|
|
40
71
|
}
|
|
41
|
-
goal.depth++;
|
|
42
|
-
return [goal];
|
|
43
72
|
};
|