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
|
@@ -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
|
+
};
|
|
@@ -59,8 +59,7 @@ export const collectUnconstrained = (manager: AstManager, goal: Goal) => {
|
|
|
59
59
|
const repeated = new Set<number>();
|
|
60
60
|
for (const form of goal.forms.items) {
|
|
61
61
|
const todo = [form];
|
|
62
|
-
|
|
63
|
-
const expr = todo.pop() as number;
|
|
62
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
64
63
|
const isConst = manager.kinds[expr] === KIND_APP && manager.isUninterpretedConst(expr);
|
|
65
64
|
if (visited.has(expr)) {
|
|
66
65
|
if (isConst) repeated.add(expr);
|
|
@@ -82,8 +81,7 @@ export const disableQuantified = (manager: AstManager, goal: Goal, bodies: RefVe
|
|
|
82
81
|
const disabled = new Set<number>();
|
|
83
82
|
const visited = new Set<number>();
|
|
84
83
|
const todo = [...goal.forms.items];
|
|
85
|
-
|
|
86
|
-
const expr = todo.pop() as number;
|
|
84
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
87
85
|
if (visited.has(expr)) continue;
|
|
88
86
|
visited.add(expr);
|
|
89
87
|
if (manager.kinds[expr] === KIND_QUANTIFIER) {
|
|
@@ -92,8 +90,7 @@ export const disableQuantified = (manager: AstManager, goal: Goal, bodies: RefVe
|
|
|
92
90
|
if (disabled.has(body)) continue;
|
|
93
91
|
bodies.push(body);
|
|
94
92
|
const marks = [body];
|
|
95
|
-
|
|
96
|
-
const marked = marks.pop() as number;
|
|
93
|
+
for (let marked = marks.pop(); marked !== undefined; marked = marks.pop()) {
|
|
97
94
|
if (disabled.has(marked)) continue;
|
|
98
95
|
disabled.add(marked);
|
|
99
96
|
if (manager.kinds[marked] === KIND_APP) manager.pushArgs(marked, marks);
|
|
@@ -113,6 +110,7 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
113
110
|
constructor(
|
|
114
111
|
manager: AstManager,
|
|
115
112
|
private isProofsEnabled: boolean,
|
|
113
|
+
private isProducingModels: boolean,
|
|
116
114
|
) {
|
|
117
115
|
super(manager);
|
|
118
116
|
this.terms = new RefVector(manager);
|
|
@@ -133,13 +131,14 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
133
131
|
const cached = this.cache.get(key);
|
|
134
132
|
if (cached !== undefined) return { fresh: cached, isNew: false };
|
|
135
133
|
const fresh = this.pin(manager.mkFreshConst(null, sort));
|
|
136
|
-
this.entries.push({ decl: manager.decls[fresh], def: -1 });
|
|
134
|
+
if (this.isProducingModels) this.entries.push({ decl: manager.decls[fresh], def: -1 });
|
|
137
135
|
this.cache.set(key, fresh);
|
|
138
136
|
return { fresh, isNew: true };
|
|
139
137
|
}
|
|
140
138
|
|
|
141
139
|
private addDef(variable: number, def: number) {
|
|
142
|
-
|
|
140
|
+
if (this.isProducingModels)
|
|
141
|
+
this.entries.push({ decl: this.manager.decls[variable], def: this.pin(def) });
|
|
143
142
|
}
|
|
144
143
|
|
|
145
144
|
private addDefs(args: number[], fresh: number, identity: number) {
|
|
@@ -207,6 +206,7 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
207
206
|
if (!this.isFullyInterp(sort)) return -1;
|
|
208
207
|
const size = manager.getSortSize(sort);
|
|
209
208
|
if (size !== SORT_SIZE_INFINITE && size !== SORT_SIZE_VERY_BIG && size <= 1n) return -1;
|
|
209
|
+
if (!this.isProducingModels) return this.mkFreshFor(decl, args, SORT_BOOL).fresh;
|
|
210
210
|
const diff = this.mkDiff(term);
|
|
211
211
|
if (diff === -1) return -1;
|
|
212
212
|
const found = this.mkFreshFor(decl, args, SORT_BOOL);
|
|
@@ -234,7 +234,8 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
234
234
|
case OP_NOT: {
|
|
235
235
|
if (!this.isUncnstr(args[0])) return -1;
|
|
236
236
|
const found = this.mkFreshFor(decl, args, sort);
|
|
237
|
-
if (found.isNew
|
|
237
|
+
if (found.isNew && this.isProducingModels)
|
|
238
|
+
this.addDef(args[0], manager.mkApp(OP_NOT, [found.fresh], SORT_BOOL));
|
|
238
239
|
return found.fresh;
|
|
239
240
|
}
|
|
240
241
|
case OP_AND:
|
|
@@ -243,7 +244,7 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
243
244
|
const found = this.mkFreshFor(decl, args, sort);
|
|
244
245
|
const identity =
|
|
245
246
|
manager.funcDecls[decl].op === OP_AND ? manager.trueExpr : manager.falseExpr;
|
|
246
|
-
if (found.isNew) this.addDefs(args, found.fresh, identity);
|
|
247
|
+
if (found.isNew && this.isProducingModels) this.addDefs(args, found.fresh, identity);
|
|
247
248
|
return found.fresh;
|
|
248
249
|
}
|
|
249
250
|
case OP_EQ:
|
|
@@ -258,8 +259,8 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
258
259
|
const index = args.findIndex((arg) => this.isUncnstr(arg));
|
|
259
260
|
if (index === -1) return -1;
|
|
260
261
|
const found = this.mkFreshFor(decl, args, sort);
|
|
261
|
-
if (!found.isNew) return found.fresh;
|
|
262
|
-
const rest = args.filter((
|
|
262
|
+
if (!found.isNew || !this.isProducingModels) return found.fresh;
|
|
263
|
+
const rest = args.filter((_value, other) => other !== index);
|
|
263
264
|
const restExpr =
|
|
264
265
|
rest.length === 0
|
|
265
266
|
? -1
|
|
@@ -288,7 +289,7 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
288
289
|
const variable = isFirst ? first : second;
|
|
289
290
|
const term = isFirst ? second : first;
|
|
290
291
|
const found = this.mkFreshFor(decl, args, SORT_BOOL);
|
|
291
|
-
if (!found.isNew) return found.fresh;
|
|
292
|
+
if (!found.isNew || !this.isProducingModels) return found.fresh;
|
|
292
293
|
const argSort = manager.sorts[first];
|
|
293
294
|
const step = this.mkNumeral(isLe ? Rational.one : Rational.minusOne, argSort);
|
|
294
295
|
const next = this.pin(manager.mkApp(OP_ADD, [term, step], argSort));
|
|
@@ -298,7 +299,7 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
298
299
|
if (op !== OP_MUL) return -1;
|
|
299
300
|
if (args.every((arg) => this.isUncnstr(arg))) {
|
|
300
301
|
const found = this.mkFreshFor(decl, args, sort);
|
|
301
|
-
if (found.isNew)
|
|
302
|
+
if (found.isNew && this.isProducingModels)
|
|
302
303
|
this.addDefs(args, found.fresh, this.mkNumeral(Rational.one, manager.sorts[args[0]]));
|
|
303
304
|
return found.fresh;
|
|
304
305
|
}
|
|
@@ -312,7 +313,7 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
312
313
|
const value = manager.getRationalValue(args[0]);
|
|
313
314
|
if (value.isZero()) return -1;
|
|
314
315
|
const found = this.mkFreshFor(decl, args, sort);
|
|
315
|
-
if (found.isNew)
|
|
316
|
+
if (found.isNew && this.isProducingModels)
|
|
316
317
|
this.addDef(
|
|
317
318
|
args[1],
|
|
318
319
|
manager.mkApp(
|
|
@@ -343,7 +344,7 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
343
344
|
const found = this.mkFreshFor(decl, args, SORT_BOOL);
|
|
344
345
|
const isBound = this.pin(manager.mkEq(term, this.pin(manager.mkBvNumeral(bound, width))));
|
|
345
346
|
const result = this.pin(manager.mkOr([found.fresh, isBound]));
|
|
346
|
-
if (found.isNew) {
|
|
347
|
+
if (found.isNew && this.isProducingModels) {
|
|
347
348
|
const one = this.pin(manager.mkBvNumeral(1n, width));
|
|
348
349
|
const next = this.pin(mkBvApp(manager, isFirst ? OP_BADD : OP_BSUB, [term, one]));
|
|
349
350
|
this.addDef(variable, manager.mkApp(OP_ITE, [result, term, next], manager.sorts[term]));
|
|
@@ -362,7 +363,7 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
362
363
|
const width = manager.getBvSize(manager.sorts[args[0]]);
|
|
363
364
|
if (isAllUncnstr) {
|
|
364
365
|
const found = this.mkFreshFor(decl, args, sort);
|
|
365
|
-
if (found.isNew)
|
|
366
|
+
if (found.isNew && this.isProducingModels)
|
|
366
367
|
this.addDefs(args, found.fresh, this.pin(manager.mkBvNumeral(1n, width)));
|
|
367
368
|
return found.fresh;
|
|
368
369
|
}
|
|
@@ -371,7 +372,7 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
371
372
|
const inverse = getMultInverse(manager.getBvNumeralValue(args[0]), width);
|
|
372
373
|
if (inverse === undefined) return -1;
|
|
373
374
|
const found = this.mkFreshFor(decl, args, sort);
|
|
374
|
-
if (found.isNew)
|
|
375
|
+
if (found.isNew && this.isProducingModels)
|
|
375
376
|
this.addDef(
|
|
376
377
|
args[1],
|
|
377
378
|
mkBvApp(manager, OP_BMUL, [this.pin(manager.mkBvNumeral(inverse, width)), found.fresh]),
|
|
@@ -384,7 +385,7 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
384
385
|
case OP_BUDIV_I: {
|
|
385
386
|
if (!isAllUncnstr) return -1;
|
|
386
387
|
const found = this.mkFreshFor(decl, args, sort);
|
|
387
|
-
if (found.isNew) {
|
|
388
|
+
if (found.isNew && this.isProducingModels) {
|
|
388
389
|
this.addDef(args[0], found.fresh);
|
|
389
390
|
this.addDef(args[1], manager.mkBvNumeral(1n, manager.getBvSize(manager.sorts[args[0]])));
|
|
390
391
|
}
|
|
@@ -396,7 +397,7 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
396
397
|
case OP_CONCAT: {
|
|
397
398
|
if (!isAllUncnstr) return -1;
|
|
398
399
|
const found = this.mkFreshFor(decl, args, sort);
|
|
399
|
-
if (!found.isNew) return found.fresh;
|
|
400
|
+
if (!found.isNew || !this.isProducingModels) return found.fresh;
|
|
400
401
|
let low = 0;
|
|
401
402
|
for (let index = args.length - 1; index >= 0; index--) {
|
|
402
403
|
const width = manager.getBvSize(manager.sorts[args[index]]);
|
|
@@ -412,7 +413,7 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
412
413
|
const arg = args[0];
|
|
413
414
|
if (!this.isUncnstr(arg)) return -1;
|
|
414
415
|
const found = this.mkFreshFor(decl, args, sort);
|
|
415
|
-
if (!found.isNew) return found.fresh;
|
|
416
|
+
if (!found.isNew || !this.isProducingModels) return found.fresh;
|
|
416
417
|
const [high, low] = manager.funcDecls[decl].parameters;
|
|
417
418
|
const width = manager.getBvSize(manager.sorts[arg]);
|
|
418
419
|
if (width === high - low + 1) {
|
|
@@ -430,13 +431,14 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
430
431
|
case OP_BNOT: {
|
|
431
432
|
if (!this.isUncnstr(args[0])) return -1;
|
|
432
433
|
const found = this.mkFreshFor(decl, args, sort);
|
|
433
|
-
if (found.isNew
|
|
434
|
+
if (found.isNew && this.isProducingModels)
|
|
435
|
+
this.addDef(args[0], manager.mkApp(decl, [found.fresh], sort));
|
|
434
436
|
return found.fresh;
|
|
435
437
|
}
|
|
436
438
|
case OP_BOR: {
|
|
437
439
|
if (!isAllUncnstr) return -1;
|
|
438
440
|
const found = this.mkFreshFor(decl, args, sort);
|
|
439
|
-
if (found.isNew)
|
|
441
|
+
if (found.isNew && this.isProducingModels)
|
|
440
442
|
this.addDefs(
|
|
441
443
|
args,
|
|
442
444
|
found.fresh,
|
|
@@ -454,7 +456,7 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
454
456
|
const op = manager.funcDecls[decl].op;
|
|
455
457
|
if (op === OP_SELECT && this.isUncnstr(args[0])) {
|
|
456
458
|
const found = this.mkFreshFor(decl, args, sort);
|
|
457
|
-
if (found.isNew)
|
|
459
|
+
if (found.isNew && this.isProducingModels)
|
|
458
460
|
this.addDef(
|
|
459
461
|
args[0],
|
|
460
462
|
mkArrayApp(manager, OP_CONST_ARRAY, [found.fresh], [manager.sorts[args[0]]]),
|
|
@@ -464,7 +466,7 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
464
466
|
if (op !== OP_STORE || !this.isUncnstr(args[0]) || !this.isUncnstr(args[args.length - 1]))
|
|
465
467
|
return -1;
|
|
466
468
|
const found = this.mkFreshFor(decl, args, sort);
|
|
467
|
-
if (found.isNew) {
|
|
469
|
+
if (found.isNew && this.isProducingModels) {
|
|
468
470
|
this.addDef(args[args.length - 1], mkArrayApp(manager, OP_SELECT, args.slice(0, -1)));
|
|
469
471
|
this.addDef(args[0], found.fresh);
|
|
470
472
|
}
|
|
@@ -475,6 +477,7 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
475
477
|
private processDatatype(decl: number, args: number[], sort: number) {
|
|
476
478
|
const manager = this.manager;
|
|
477
479
|
if (manager.funcDecls[decl].op !== OP_DT_ACCESSOR || !this.isUncnstr(args[0])) return -1;
|
|
480
|
+
if (!this.isProducingModels) return this.mkFreshFor(decl, args, sort).fresh;
|
|
478
481
|
const constructor = getAccessorConstructor(manager, decl);
|
|
479
482
|
const domain = manager.funcDecls[constructor].domain;
|
|
480
483
|
if (!domain.every((argSort) => this.isFullyInterp(argSort))) return -1;
|
|
@@ -513,7 +516,7 @@ export const elimUncnstr = (manager: AstManager, goal: Goal, bodies: RefVector)
|
|
|
513
516
|
const vars = collectUnconstrained(manager, goal);
|
|
514
517
|
const disabled = disableQuantified(manager, goal, bodies);
|
|
515
518
|
if (vars.size === 0 || manager.hasRecDefs) return;
|
|
516
|
-
const rewriter = new UncnstrRewriter(manager, goal.isProofsEnabled);
|
|
519
|
+
const rewriter = new UncnstrRewriter(manager, goal.isProofsEnabled, goal.isModelsEnabled);
|
|
517
520
|
rewriter.vars = vars;
|
|
518
521
|
rewriter.disabled = disabled;
|
|
519
522
|
let isModified = true;
|
|
@@ -525,7 +528,7 @@ export const elimUncnstr = (manager: AstManager, goal: Goal, bodies: RefVector)
|
|
|
525
528
|
const rewritten = rewriter.rewrite(form);
|
|
526
529
|
if (rewritten !== form) {
|
|
527
530
|
isModified = true;
|
|
528
|
-
goal.update(index, rewritten);
|
|
531
|
+
goal.update(index, rewritten, goal.dependencies[index]);
|
|
529
532
|
}
|
|
530
533
|
manager.decRef(rewritten);
|
|
531
534
|
}
|
|
@@ -538,7 +541,7 @@ export const elimUncnstr = (manager: AstManager, goal: Goal, bodies: RefVector)
|
|
|
538
541
|
rewriter.vars = collectUnconstrained(manager, goal);
|
|
539
542
|
start = rewriter.vars.size === 0 ? size : 0;
|
|
540
543
|
}
|
|
541
|
-
goal.addDefinitions(rewriter.entries);
|
|
544
|
+
if (goal.isModelsEnabled) goal.addDefinitions(rewriter.entries);
|
|
542
545
|
rewriter.release();
|
|
543
546
|
rewriter.terms.reset();
|
|
544
547
|
goal.depth++;
|
|
@@ -11,6 +11,7 @@ import {
|
|
|
11
11
|
import { BoundManager } from "./bound-manager";
|
|
12
12
|
import { mkBvApp } from "./bv-decl-plugin";
|
|
13
13
|
import type { Goal } from "./goal";
|
|
14
|
+
import { ObjMap } from "./hashtable";
|
|
14
15
|
import { FuncInterp, ProtoModel } from "./proto-model";
|
|
15
16
|
import { Rational } from "./rational";
|
|
16
17
|
import { RefVector } from "./ref-vector";
|
|
@@ -88,11 +89,12 @@ export const createEq2BvTactic = (manager: AstManager) => (goal: Goal) => {
|
|
|
88
89
|
const bounds = new BoundManager(manager);
|
|
89
90
|
const trail = new RefVector(manager);
|
|
90
91
|
const fd = new Map<number, number>();
|
|
91
|
-
const max = new
|
|
92
|
+
const max = new ObjMap<Rational>((expr) => manager.hashes[expr]);
|
|
92
93
|
const nonFd = new Set<number>();
|
|
93
94
|
const hasEq = new Set<number>();
|
|
94
95
|
const converter: BvModelConverter = { bvToInt: new Map(), vars: [], values: [] };
|
|
95
|
-
for (
|
|
96
|
+
for (let index = 0; index < goal.forms.size; index++)
|
|
97
|
+
bounds.add(goal.forms.items[index], goal.getDependency(index));
|
|
96
98
|
if (bounds.isInconsistent() || goal.isProofsEnabled) {
|
|
97
99
|
goal.depth++;
|
|
98
100
|
return [goal];
|
|
@@ -147,7 +149,7 @@ export const createEq2BvTactic = (manager: AstManager) => (goal: Goal) => {
|
|
|
147
149
|
}
|
|
148
150
|
};
|
|
149
151
|
for (const form of goal.forms.items) collectFd(form);
|
|
150
|
-
for (const variable of max.keys())
|
|
152
|
+
for (const variable of [...max.keys()].filter((key) => nonFd.has(key))) max.delete(variable);
|
|
151
153
|
for (const [variable, maximum] of max) {
|
|
152
154
|
const upper = bounds.uppers.get(variable);
|
|
153
155
|
const lower = bounds.lowers.get(variable);
|
|
@@ -192,19 +194,26 @@ export const createEq2BvTactic = (manager: AstManager) => (goal: Goal) => {
|
|
|
192
194
|
continue;
|
|
193
195
|
}
|
|
194
196
|
const rewritten = rewriter.rewrite(form);
|
|
195
|
-
if (rewritten !== form) goal.update(index, rewritten);
|
|
197
|
+
if (rewritten !== form) goal.update(index, rewritten, goal.getDependency(index));
|
|
196
198
|
manager.decRef(rewritten);
|
|
197
199
|
}
|
|
198
200
|
rewriter.release();
|
|
201
|
+
// Deviation from Z3: Z3 5.3.2 frees the bound dependencies above, then reads them and crashes.
|
|
199
202
|
for (const variable of max.keys()) {
|
|
200
203
|
const bv = fd.get(variable) as number;
|
|
201
204
|
const width = manager.getBvSize(manager.sorts[bv]);
|
|
202
205
|
const lower = bounds.lowers.get(variable);
|
|
203
206
|
const upper = bounds.uppers.get(variable);
|
|
204
207
|
if (lower !== undefined && !lower.value.isNegative())
|
|
205
|
-
goal.assert(
|
|
208
|
+
goal.assert(
|
|
209
|
+
mkBvApp(manager, OP_ULEQ, [manager.mkBvNumeral(lower.value.num, width), bv]),
|
|
210
|
+
bounds.lowerDependencies.get(variable),
|
|
211
|
+
);
|
|
206
212
|
if (upper !== undefined && !upper.value.isNegative())
|
|
207
|
-
goal.assert(
|
|
213
|
+
goal.assert(
|
|
214
|
+
mkBvApp(manager, OP_ULEQ, [bv, manager.mkBvNumeral(upper.value.num, width)]),
|
|
215
|
+
bounds.upperDependencies.get(variable),
|
|
216
|
+
);
|
|
208
217
|
}
|
|
209
218
|
for (const decl of converter.vars) manager.incDeclRef(decl);
|
|
210
219
|
for (const entry of converter.bvToInt) {
|
|
@@ -71,7 +71,7 @@ import { type Enode, NULL_THEORY_VAR } from "./egraph";
|
|
|
71
71
|
import type { EufSolver } from "./euf-solver";
|
|
72
72
|
import { ThSolver } from "./th-solver";
|
|
73
73
|
|
|
74
|
-
|
|
74
|
+
interface ZeroOneBit {
|
|
75
75
|
readonly owner: number;
|
|
76
76
|
readonly index: number;
|
|
77
77
|
readonly isTrue: boolean;
|
|
@@ -23,8 +23,8 @@ export const NULL_THEORY_VAR = -1;
|
|
|
23
23
|
export const NULL_BOOL_VAR = -1;
|
|
24
24
|
|
|
25
25
|
const J_AXIOM = 0;
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
const J_CONGRUENCE = 1;
|
|
27
|
+
const J_EXTERNAL = 2;
|
|
28
28
|
|
|
29
29
|
export interface Justification {
|
|
30
30
|
readonly kind: number;
|
|
@@ -32,7 +32,7 @@ export interface Justification {
|
|
|
32
32
|
readonly external: number;
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
-
|
|
35
|
+
const AXIOM: Justification = {
|
|
36
36
|
kind: J_AXIOM,
|
|
37
37
|
isCommutative: false,
|
|
38
38
|
external: 0,
|
|
@@ -490,8 +490,7 @@ export class Egraph {
|
|
|
490
490
|
}
|
|
491
491
|
const rootVar = root.getThVar(id);
|
|
492
492
|
node.replaceThVar(thVar, id);
|
|
493
|
-
// Deviation from Z3: the undo gives the node back its own variable
|
|
494
|
-
// which later equates the wrong terms.
|
|
493
|
+
// Deviation from Z3: the undo gives the node back its own variable, where Z3 gives it the root's and later equates the wrong terms.
|
|
495
494
|
this.updates.push({
|
|
496
495
|
tag: U_REPLACE_TH_VAR,
|
|
497
496
|
r1: node,
|
|
@@ -523,12 +522,6 @@ export class Egraph {
|
|
|
523
522
|
this.push(U_TOGGLE_CGC, node);
|
|
524
523
|
}
|
|
525
524
|
|
|
526
|
-
setRelevant(node: Enode) {
|
|
527
|
-
if (node.isRelevant) return;
|
|
528
|
-
node.isRelevant = true;
|
|
529
|
-
this.push(U_SET_RELEVANT, node);
|
|
530
|
-
}
|
|
531
|
-
|
|
532
525
|
private toggleCgcEnabled(node: Enode, isBacktracking: boolean) {
|
|
533
526
|
const isEnabled = !node.isCgcEnabled;
|
|
534
527
|
node.isCgcEnabled = isEnabled;
|
|
@@ -465,8 +465,7 @@ export class EufSolver implements SatExtension {
|
|
|
465
465
|
let generation = 0;
|
|
466
466
|
const visited = new Set<number>();
|
|
467
467
|
const todo = [expr];
|
|
468
|
-
|
|
469
|
-
const current = todo.pop() as number;
|
|
468
|
+
for (let current = todo.pop(); current !== undefined; current = todo.pop()) {
|
|
470
469
|
if (visited.has(current)) continue;
|
|
471
470
|
visited.add(current);
|
|
472
471
|
const node = this.egraph.find(current);
|
|
@@ -42,7 +42,7 @@ import { type Egraph, type Enode, getClass } from "./egraph";
|
|
|
42
42
|
import type { TrailStack } from "./th-solver";
|
|
43
43
|
|
|
44
44
|
// euf::mam_solver: the solver whose trail undoes the matcher.
|
|
45
|
-
|
|
45
|
+
interface MamSolver {
|
|
46
46
|
readonly manager: AstManager;
|
|
47
47
|
readonly egraph: Egraph;
|
|
48
48
|
readonly trail: TrailStack;
|
|
@@ -590,10 +590,6 @@ export class Mam implements LabelHasher<Enode> {
|
|
|
590
590
|
return this.ctx.egraph.find(expr) ?? null;
|
|
591
591
|
}
|
|
592
592
|
|
|
593
|
-
canPropagate() {
|
|
594
|
-
return this.toMatch.length > 0 || this.newPatterns.length > 0;
|
|
595
|
-
}
|
|
596
|
-
|
|
597
593
|
private setLbls(root: Enode, isParent: boolean, hash: number) {
|
|
598
594
|
const low = isParent ? root.plbls : root.lbls;
|
|
599
595
|
const high = isParent ? root.plblsHigh : root.lblsHigh;
|
|
@@ -493,8 +493,7 @@ export class Ematch {
|
|
|
493
493
|
const manager = this.ctx.manager;
|
|
494
494
|
const todo = [expr];
|
|
495
495
|
const marked = new Set<number>();
|
|
496
|
-
|
|
497
|
-
const term = todo.pop() as number;
|
|
496
|
+
for (let term = todo.pop(); term !== undefined; term = todo.pop()) {
|
|
498
497
|
if (marked.has(term)) continue;
|
|
499
498
|
marked.add(term);
|
|
500
499
|
if (manager.isGroundApp(term)) {
|
|
@@ -25,10 +25,6 @@ export class TrailStack {
|
|
|
25
25
|
this.scopes.length -= numScopes;
|
|
26
26
|
while (this.undos.length > lim) (this.undos.pop() as () => void)();
|
|
27
27
|
}
|
|
28
|
-
|
|
29
|
-
get numScopes() {
|
|
30
|
-
return this.scopes.length;
|
|
31
|
-
}
|
|
32
28
|
}
|
|
33
29
|
|
|
34
30
|
// A th_explain: the literals and equalities that explain a propagation or a conflict.
|
|
@@ -109,9 +105,6 @@ export abstract class ThSolver {
|
|
|
109
105
|
isBetaRedex(_parent: Enode, _node: Enode) {
|
|
110
106
|
return false;
|
|
111
107
|
}
|
|
112
|
-
isFixed(_thVar: number, _lits: number[]): number {
|
|
113
|
-
return -1;
|
|
114
|
-
}
|
|
115
108
|
addValue(_node: Enode, _model: ProtoModel, _values: (number | undefined)[]) {}
|
|
116
109
|
addDep(node: Enode, deps: Dependencies) {
|
|
117
110
|
deps.set(node, null);
|