tla-ts 0.0.10-dev.8aec06f77 → 0.0.10-dev.94c3dd828
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/deciders.cjs +37 -36
- package/dist/deciders.js +55 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +142 -54
- package/dist/run.cjs +45 -43
- package/dist/run.js +47 -45
- package/dist/transfer.cjs +39 -36
- package/dist/transfer.js +23 -20
- package/dist/worker.cjs +1 -1
- package/dist/worker.js +1 -1
- package/package.json +1 -1
- package/src/ast.ts +3 -3
- package/src/check.ts +203 -33
- package/src/cli/tlapm.ts +261 -68
- package/src/dependencies.ts +23 -2
- package/src/errors.ts +1 -1
- package/src/exit-codes.ts +1 -0
- package/src/liveness-checker.ts +530 -201
- package/src/liveness.ts +47 -32
- package/src/obligations/anonymize.ts +2 -4
- package/src/obligations/index.ts +5 -3
- package/src/obligations/pragma.ts +2 -2
- package/src/parallel.ts +2 -2
- package/src/parser.ts +151 -42
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/isar/attrib.ts +86 -45
- package/src/prover/isabelle/isar/context.ts +25 -22
- package/src/prover/isabelle/isar/induct.ts +2 -5
- package/src/prover/isabelle/isar/method.ts +5 -7
- package/src/prover/isabelle/isar/proof.ts +33 -16
- package/src/prover/isabelle/isar/rule-cases.ts +6 -14
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -52
- package/src/prover/isabelle/provers/classical.ts +1 -1
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/methods.ts +50 -3
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +1 -0
- package/src/prover/smt/solver/aig-tactic.ts +25 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -5
- package/src/prover/smt/solver/asserted-formulas.ts +1 -1
- package/src/prover/smt/solver/ast-util.ts +3 -1
- package/src/prover/smt/solver/ast.ts +110 -152
- package/src/prover/smt/solver/bound-manager.ts +39 -28
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -8
- package/src/prover/smt/solver/bv-rewriter.ts +14 -16
- package/src/prover/smt/solver/bv1-blast.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +19 -14
- package/src/prover/smt/solver/check-logic.ts +6 -1
- package/src/prover/smt/solver/context.ts +20 -10
- package/src/prover/smt/solver/demodulator.ts +2 -2
- package/src/prover/smt/solver/dependent-expr-state.ts +16 -0
- package/src/prover/smt/solver/distribute-forall.ts +1 -10
- package/src/prover/smt/solver/dom-simplify.ts +1 -1
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -7
- package/src/prover/smt/solver/e-matching.ts +6 -6
- package/src/prover/smt/solver/elim-uncnstr.ts +3 -14
- package/src/prover/smt/solver/enode.ts +15 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +19 -8
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -19
- package/src/prover/smt/solver/euf/egraph.ts +65 -32
- package/src/prover/smt/solver/euf/euf-solver.ts +35 -18
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -51
- package/src/prover/smt/solver/euf/mam.ts +6 -48
- package/src/prover/smt/solver/euf/q-ematch.ts +21 -94
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -2
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -1
- package/src/prover/smt/solver/euf/q-solver.ts +2 -0
- package/src/prover/smt/solver/euf/th-solver.ts +1 -1
- package/src/prover/smt/solver/factor.ts +1 -11
- package/src/prover/smt/solver/fd-solver.ts +1 -2
- package/src/prover/smt/solver/fm-tactic.ts +19 -13
- package/src/prover/smt/solver/fpa-rewriter.ts +3 -1
- package/src/prover/smt/solver/fpa2bv-converter.ts +10 -6
- package/src/prover/smt/solver/internalizer.ts +41 -2
- package/src/prover/smt/solver/lia2pb.ts +18 -4
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +144 -107
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -17
- package/src/prover/smt/solver/macro-finder.ts +1 -1
- package/src/prover/smt/solver/mam-compiler.ts +13 -13
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -11
- package/src/prover/smt/solver/maxcore.ts +4 -12
- package/src/prover/smt/solver/maxlex.ts +0 -7
- package/src/prover/smt/solver/maxsmt-base.ts +7 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -11
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +9 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -9
- package/src/prover/smt/solver/model-evaluator.ts +9 -5
- package/src/prover/smt/solver/model-macro-solver.ts +3 -3
- package/src/prover/smt/solver/muz/dl-context.ts +57 -3
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -20
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -1
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -10
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +76 -13
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -2
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -2
- package/src/prover/smt/solver/muz/dl-rule.ts +93 -29
- package/src/prover/smt/solver/muz/hnf.ts +6 -5
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +178 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +14 -3
- package/src/prover/smt/solver/muz/rule-properties.ts +194 -36
- package/src/prover/smt/solver/muz/spacer-context.ts +102 -84
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -2
- package/src/prover/smt/solver/muz/spacer-pdr.ts +3 -3
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +2 -7
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -2
- package/src/prover/smt/solver/muz/substitution.ts +88 -37
- package/src/prover/smt/solver/nlqsat.ts +2 -2
- package/src/prover/smt/solver/nlsat/algebraic.ts +1 -2
- package/src/prover/smt/solver/nlsat/explain.ts +5 -0
- package/src/prover/smt/solver/nlsat/solver.ts +36 -25
- package/src/prover/smt/solver/opt-context.ts +9 -8
- package/src/prover/smt/solver/opt-nlsat.ts +68 -58
- package/src/prover/smt/solver/opt-solver.ts +16 -7
- package/src/prover/smt/solver/optsmt.ts +12 -9
- package/src/prover/smt/solver/pattern-inference.ts +2 -2
- package/src/prover/smt/solver/pb-rewriter.ts +13 -13
- package/src/prover/smt/solver/poly-rewriter.ts +2 -2
- package/src/prover/smt/solver/probes.ts +1 -1
- package/src/prover/smt/solver/propagate-values.ts +4 -0
- package/src/prover/smt/solver/proto-model.ts +5 -5
- package/src/prover/smt/solver/purify-arith.ts +50 -15
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -1
- package/src/prover/smt/solver/qe-mbp.ts +13 -23
- package/src/prover/smt/solver/qe.ts +45 -53
- package/src/prover/smt/solver/qsat.ts +70 -90
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -9
- package/src/prover/smt/solver/quasi-macros.ts +9 -18
- package/src/prover/smt/solver/rational.ts +17 -0
- package/src/prover/smt/solver/recfun-decl-plugin.ts +33 -19
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -2
- package/src/prover/smt/solver/rewriter.ts +1 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -46
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -6
- package/src/prover/smt/solver/sat/clause.ts +1 -3
- package/src/prover/smt/solver/sat/config.ts +3 -3
- package/src/prover/smt/solver/sat/consequences.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -1
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +4 -12
- package/src/prover/smt/solver/sat/model-converter.ts +1 -15
- package/src/prover/smt/solver/sat/pb-solver.ts +49 -23
- package/src/prover/smt/solver/sat/probing.ts +22 -19
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -10
- package/src/prover/smt/solver/sat/simplifier.ts +15 -56
- package/src/prover/smt/solver/sat/solver.ts +20 -19
- package/src/prover/smt/solver/sat/watch-list.ts +7 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +7 -7
- package/src/prover/smt/solver/seq-derive.ts +6 -7
- package/src/prover/smt/solver/seq-eq-solver.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +14 -1
- package/src/prover/smt/solver/seq-re-rewriter.ts +1 -10
- package/src/prover/smt/solver/seq-re-util.ts +1 -2
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
- package/src/prover/smt/solver/seq-regex-live.ts +4 -4
- package/src/prover/smt/solver/seq-rewriter.ts +1 -4
- package/src/prover/smt/solver/smt-setup.ts +15 -9
- package/src/prover/smt/solver/smtlib-parser.ts +1174 -579
- package/src/prover/smt/solver/smtlib-script.ts +866 -728
- package/src/prover/smt/solver/tactic.ts +66 -14
- package/src/prover/smt/solver/theory-array.ts +25 -58
- package/src/prover/smt/solver/theory-bv.ts +13 -50
- package/src/prover/smt/solver/theory-fpa.ts +46 -78
- package/src/prover/smt/solver/theory-pb.ts +10 -6
- package/src/prover/smt/solver/theory-recfun.ts +2 -2
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -6
- package/src/prover/smt/solver/theory-seq-solve.ts +5 -5
- package/src/prover/smt/solver/theory-seq-state.ts +6 -3
- package/src/prover/smt/solver/theory-seq.ts +32 -54
- package/src/prover/smt/solver/theory.ts +16 -1
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -3
- package/src/prover/smt/solver/var-subst.ts +2 -2
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/zenon/decide.ts +9 -11
- package/src/prover/zenon/node.ts +12 -11
- package/src/prover/zenon/tla/sets.ts +1 -1
- package/src/search.ts +131 -16
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/summary.ts +29 -14
- package/src/typed-tier.ts +6535 -0
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
|
@@ -85,7 +85,7 @@ import {
|
|
|
85
85
|
} from "./ast";
|
|
86
86
|
import { mkBvApp } from "./bv-decl-plugin";
|
|
87
87
|
import { type ArithRewriterOptions, PolyRewriter } from "./poly-rewriter";
|
|
88
|
-
import { Rational } from "./rational";
|
|
88
|
+
import { getMultInverse, Rational } from "./rational";
|
|
89
89
|
import type { Rewrite } from "./rewriter-tpl";
|
|
90
90
|
|
|
91
91
|
type Result = number | Rewrite | undefined;
|
|
@@ -94,6 +94,7 @@ export interface BvRewriterOptions {
|
|
|
94
94
|
readonly isHiDiv0: boolean;
|
|
95
95
|
readonly isMul2concat: boolean;
|
|
96
96
|
readonly isSplitConcatEq: boolean;
|
|
97
|
+
readonly isMkbv2num?: boolean;
|
|
97
98
|
}
|
|
98
99
|
|
|
99
100
|
export const DEFAULT_BV_OPTIONS: Omit<BvRewriterOptions, "isHiDiv0"> = {
|
|
@@ -117,20 +118,6 @@ const getPowerOfTwoExponent = (value: bigint) => {
|
|
|
117
118
|
return value.toString(2).length - 1;
|
|
118
119
|
};
|
|
119
120
|
|
|
120
|
-
const getMultInverse = (value: bigint, bits: number) => {
|
|
121
|
-
if (value === 1n) return 1n;
|
|
122
|
-
if (value % 2n === 0n) return undefined;
|
|
123
|
-
const modulus = getPowerOfTwo(bits);
|
|
124
|
-
let [oldRemainder, remainder] = [getMod(value, modulus), modulus];
|
|
125
|
-
let [oldCoefficient, coefficient] = [1n, 0n];
|
|
126
|
-
while (remainder !== 0n) {
|
|
127
|
-
const quotient = oldRemainder / remainder;
|
|
128
|
-
[oldRemainder, remainder] = [remainder, oldRemainder - quotient * remainder];
|
|
129
|
-
[oldCoefficient, coefficient] = [coefficient, oldCoefficient - quotient * coefficient];
|
|
130
|
-
}
|
|
131
|
-
return getMod(oldCoefficient, modulus);
|
|
132
|
-
};
|
|
133
|
-
|
|
134
121
|
const getAbs = (value: bigint) => (value < 0n ? -value : value);
|
|
135
122
|
|
|
136
123
|
export class BvRewriter extends PolyRewriter {
|
|
@@ -405,7 +392,7 @@ export class BvRewriter extends PolyRewriter {
|
|
|
405
392
|
2,
|
|
406
393
|
);
|
|
407
394
|
case OP_MKBV:
|
|
408
|
-
return
|
|
395
|
+
return this.mkMkbv(args);
|
|
409
396
|
case OP_BIT2BOOL:
|
|
410
397
|
return this.mkBit2boolIndex(args[0], parameters[0]);
|
|
411
398
|
case OP_BSMUL_NO_OVFL:
|
|
@@ -1557,6 +1544,17 @@ export class BvRewriter extends PolyRewriter {
|
|
|
1557
1544
|
return rewrite(this.mkConcatTerm([kept, this.mkZero(shift)]), 2);
|
|
1558
1545
|
}
|
|
1559
1546
|
|
|
1547
|
+
private mkMkbv(args: number[]) {
|
|
1548
|
+
const manager = this.manager;
|
|
1549
|
+
if (this.bvOptions.isMkbv2num !== true) return undefined;
|
|
1550
|
+
let value = 0n;
|
|
1551
|
+
for (let index = args.length - 1; index >= 0; index--) {
|
|
1552
|
+
if (!manager.isTrue(args[index]) && !manager.isFalse(args[index])) return undefined;
|
|
1553
|
+
value = value * 2n + (manager.isTrue(args[index]) ? 1n : 0n);
|
|
1554
|
+
}
|
|
1555
|
+
return this.mkBv(value, args.length);
|
|
1556
|
+
}
|
|
1557
|
+
|
|
1560
1558
|
private mkBit2boolIndex(arg: number, index: number): Result {
|
|
1561
1559
|
const manager = this.manager;
|
|
1562
1560
|
if (manager.getOp(arg) === OP_MKBV) return manager.getArg(arg, index);
|
|
@@ -200,15 +200,7 @@ export const runBv1Blast = (manager: AstManager) => (goal: Goal) => {
|
|
|
200
200
|
const rewriter = new Bv1BlasterRewriter(manager);
|
|
201
201
|
return {
|
|
202
202
|
reduce: () => {
|
|
203
|
-
|
|
204
|
-
state.forEachIndex((index) => {
|
|
205
|
-
const form = state.get(index);
|
|
206
|
-
const next = rewriter.rewrite(form);
|
|
207
|
-
if (rewritten !== -1) manager.decRef(rewritten);
|
|
208
|
-
rewritten = next;
|
|
209
|
-
if (rewritten !== form) goal.update(index, rewritten);
|
|
210
|
-
});
|
|
211
|
-
if (rewritten !== -1) manager.decRef(rewritten);
|
|
203
|
+
state.rewriteEach((form) => rewriter.rewrite(form));
|
|
212
204
|
if (rewriter.newbits.length === 0) return;
|
|
213
205
|
const definitions: Definition[] = rewriter.newbits.map((decl) => ({ decl, def: -1 }));
|
|
214
206
|
for (const [decl, bits] of rewriter.const2bits) definitions.push({ decl, def: bits });
|
|
@@ -7,7 +7,9 @@ export interface CgNode {
|
|
|
7
7
|
readonly owner: number;
|
|
8
8
|
readonly decl: number;
|
|
9
9
|
readonly numArgs: number;
|
|
10
|
-
readonly
|
|
10
|
+
readonly isCommutative: boolean;
|
|
11
|
+
// Whether cg_table::mk_table_for gives the declaration the binary commutative table.
|
|
12
|
+
readonly isCommutativeTable: boolean;
|
|
11
13
|
readonly root: CgNode;
|
|
12
14
|
getArg(index: number): CgNode;
|
|
13
15
|
}
|
|
@@ -17,8 +19,8 @@ const getEqHash = (decl: number, first: number, second: number) =>
|
|
|
17
19
|
? (Math.imul(Math.imul(decl, 0x9e3779b1) + first, 0x85ebca6b) + second) | 0
|
|
18
20
|
: (Math.imul(Math.imul(decl, 0x9e3779b1) + second, 0x85ebca6b) + first) | 0;
|
|
19
21
|
|
|
20
|
-
const getHash = (decl: number, args: readonly CgNode[],
|
|
21
|
-
if (
|
|
22
|
+
const getHash = (decl: number, args: readonly CgNode[], isCommutativeTable: boolean) => {
|
|
23
|
+
if (isCommutativeTable) return getEqHash(decl, args[0].root.owner, args[1].root.owner);
|
|
22
24
|
let hash = decl;
|
|
23
25
|
for (let index = 0; index < args.length; index++)
|
|
24
26
|
hash = (Math.imul(hash, 0x9e3779b1) + args[index].root.owner) | 0;
|
|
@@ -26,25 +28,26 @@ const getHash = (decl: number, args: readonly CgNode[], isEq: boolean) => {
|
|
|
26
28
|
};
|
|
27
29
|
|
|
28
30
|
const getNodeHash = (node: CgNode) => {
|
|
29
|
-
if (node.
|
|
31
|
+
if (node.isCommutativeTable)
|
|
32
|
+
return getEqHash(node.decl, node.getArg(0).root.owner, node.getArg(1).root.owner);
|
|
30
33
|
let hash = node.decl;
|
|
31
34
|
for (let index = 0; index < node.numArgs; index++)
|
|
32
35
|
hash = (Math.imul(hash, 0x9e3779b1) + node.getArg(index).root.owner) | 0;
|
|
33
36
|
return hash;
|
|
34
37
|
};
|
|
35
38
|
|
|
36
|
-
const isPairCongruentTo = (node: CgNode, first: CgNode, second: CgNode,
|
|
39
|
+
const isPairCongruentTo = (node: CgNode, first: CgNode, second: CgNode, isCommutative: boolean) => {
|
|
37
40
|
const nodeFirst = node.getArg(0).root;
|
|
38
41
|
const nodeSecond = node.getArg(1).root;
|
|
39
42
|
return (
|
|
40
43
|
(nodeFirst === first.root && nodeSecond === second.root) ||
|
|
41
|
-
(
|
|
44
|
+
(isCommutative && nodeFirst === second.root && nodeSecond === first.root)
|
|
42
45
|
);
|
|
43
46
|
};
|
|
44
47
|
|
|
45
|
-
const isCongruentTo = (node: CgNode, decl: number, args: readonly CgNode[]
|
|
48
|
+
const isCongruentTo = (node: CgNode, decl: number, args: readonly CgNode[]) => {
|
|
46
49
|
if (node.decl !== decl || node.numArgs !== args.length) return false;
|
|
47
|
-
if (
|
|
50
|
+
if (node.isCommutative) return isPairCongruentTo(node, args[0], args[1], true);
|
|
48
51
|
for (let index = 0; index < args.length; index++)
|
|
49
52
|
if (node.getArg(index).root !== args[index].root) return false;
|
|
50
53
|
return true;
|
|
@@ -53,14 +56,16 @@ const isCongruentTo = (node: CgNode, decl: number, args: readonly CgNode[], isEq
|
|
|
53
56
|
export const isCongruent = (first: CgNode, second: CgNode) => {
|
|
54
57
|
if (first.decl !== second.decl || first.numArgs !== second.numArgs) return false;
|
|
55
58
|
if (first.numArgs === 2)
|
|
56
|
-
return isPairCongruentTo(first, second.getArg(0), second.getArg(1), first.
|
|
59
|
+
return isPairCongruentTo(first, second.getArg(0), second.getArg(1), first.isCommutative);
|
|
57
60
|
for (let index = 0; index < first.numArgs; index++)
|
|
58
61
|
if (first.getArg(index).root !== second.getArg(index).root) return false;
|
|
59
62
|
return true;
|
|
60
63
|
};
|
|
61
64
|
|
|
62
65
|
export const getCongruenceJustification = (node: Enode, congruent: Enode) =>
|
|
63
|
-
CONGRUENCE_JUSTIFICATIONS[
|
|
66
|
+
CONGRUENCE_JUSTIFICATIONS[
|
|
67
|
+
node.isCommutative && congruent.getArg(0).root !== node.getArg(0).root ? 1 : 0
|
|
68
|
+
];
|
|
64
69
|
|
|
65
70
|
const EMPTY = 0;
|
|
66
71
|
const FULL = 1;
|
|
@@ -73,7 +78,7 @@ export class CgTable<Node extends CgNode = Enode> {
|
|
|
73
78
|
private numFull = 0;
|
|
74
79
|
private numDeleted = 0;
|
|
75
80
|
|
|
76
|
-
private find(decl: number, args: readonly CgNode[],
|
|
81
|
+
private find(decl: number, args: readonly CgNode[], hash: number) {
|
|
77
82
|
const mask = this.states.length - 1;
|
|
78
83
|
for (let slot = hash & mask; this.states[slot] !== EMPTY; slot = (slot + 1) & mask) {
|
|
79
84
|
const node = this.nodes[slot];
|
|
@@ -81,7 +86,7 @@ export class CgTable<Node extends CgNode = Enode> {
|
|
|
81
86
|
this.states[slot] === FULL &&
|
|
82
87
|
this.hashes[slot] === hash &&
|
|
83
88
|
node !== null &&
|
|
84
|
-
isCongruentTo(node, decl, args
|
|
89
|
+
isCongruentTo(node, decl, args)
|
|
85
90
|
)
|
|
86
91
|
return node;
|
|
87
92
|
}
|
|
@@ -143,8 +148,8 @@ export class CgTable<Node extends CgNode = Enode> {
|
|
|
143
148
|
}
|
|
144
149
|
}
|
|
145
150
|
|
|
146
|
-
findFor(decl: number, args: readonly CgNode[],
|
|
147
|
-
return this.find(decl, args,
|
|
151
|
+
findFor(decl: number, args: readonly CgNode[], isCommutativeTable: boolean) {
|
|
152
|
+
return this.find(decl, args, getHash(decl, args, isCommutativeTable));
|
|
148
153
|
}
|
|
149
154
|
|
|
150
155
|
findCongruent(node: CgNode) {
|
|
@@ -9,8 +9,11 @@ import {
|
|
|
9
9
|
FAMILY_DATATYPE,
|
|
10
10
|
FAMILY_FINITE_SET,
|
|
11
11
|
FAMILY_FPA,
|
|
12
|
+
FAMILY_LABEL,
|
|
12
13
|
FAMILY_MODEL_VALUE,
|
|
13
14
|
FAMILY_PB,
|
|
15
|
+
FAMILY_POLY,
|
|
16
|
+
FAMILY_RECFUN,
|
|
14
17
|
FAMILY_SEQ,
|
|
15
18
|
FAMILY_USER,
|
|
16
19
|
KIND_APP,
|
|
@@ -128,6 +131,8 @@ const FAMILY_NAMES = new Map([
|
|
|
128
131
|
[FAMILY_FPA, "fpa"],
|
|
129
132
|
[FAMILY_CHAR, "char"],
|
|
130
133
|
[FAMILY_PB, "pb"],
|
|
134
|
+
[FAMILY_RECFUN, "recfun"],
|
|
135
|
+
[FAMILY_POLY, "polymorphic"],
|
|
131
136
|
]);
|
|
132
137
|
|
|
133
138
|
const NONLINEAR = "logic does not support nonlinear arithmetic";
|
|
@@ -262,7 +267,7 @@ export const createLogicChecker = (manager: AstManager, logic: string | undefine
|
|
|
262
267
|
if (op === OP_EQ) return checkDiffPredicate(expr);
|
|
263
268
|
return op === OP_DISTINCT || op === OP_ITE ? checkDiffArgs(expr) : undefined;
|
|
264
269
|
}
|
|
265
|
-
if (family === FAMILY_MODEL_VALUE) return undefined;
|
|
270
|
+
if (family === FAMILY_MODEL_VALUE || family === FAMILY_LABEL) return undefined;
|
|
266
271
|
if (family === FAMILY_SEQ || manager.isCharSort(manager.sorts[expr])) return undefined;
|
|
267
272
|
if (family === FAMILY_DATATYPE && flags.isDt) return undefined;
|
|
268
273
|
if (family === FAMILY_PB && logic !== undefined && logicHasPb(logic)) return undefined;
|
|
@@ -187,7 +187,7 @@ export class Context extends Internalizer {
|
|
|
187
187
|
private phaseDefault = false;
|
|
188
188
|
private lubyIndex = 1;
|
|
189
189
|
private finalCheckIndex = 0;
|
|
190
|
-
private
|
|
190
|
+
private literalAssumptions = new Map<Literal, number>();
|
|
191
191
|
unsatCore: number[] = [];
|
|
192
192
|
private r1ParentGenerations = new Map<Enode, number>();
|
|
193
193
|
private erasedGenerations = new Map<Enode, number>();
|
|
@@ -1494,7 +1494,8 @@ export class Context extends Internalizer {
|
|
|
1494
1494
|
}
|
|
1495
1495
|
|
|
1496
1496
|
initAssumptions(assumptions: number[], asserted: AssertedFormulas) {
|
|
1497
|
-
this.
|
|
1497
|
+
this.literalAssumptions.clear();
|
|
1498
|
+
for (const assumption of this.unsatCore) this.manager.decRef(assumption);
|
|
1498
1499
|
this.unsatCore = [];
|
|
1499
1500
|
if (assumptions.length > 0) {
|
|
1500
1501
|
this.propagate();
|
|
@@ -1515,7 +1516,7 @@ export class Context extends Internalizer {
|
|
|
1515
1516
|
this.internalizeAssertion(proxy, 0);
|
|
1516
1517
|
const literal = this.getLiteral(proxy);
|
|
1517
1518
|
if (literal === this.trueLiteral || literal === this.falseLiteral) continue;
|
|
1518
|
-
this.
|
|
1519
|
+
this.literalAssumptions.set(literal, assumptions[index]);
|
|
1519
1520
|
}
|
|
1520
1521
|
}
|
|
1521
1522
|
this.searchLevel = this.scopeLevel;
|
|
@@ -1566,25 +1567,34 @@ export class Context extends Internalizer {
|
|
|
1566
1567
|
}
|
|
1567
1568
|
|
|
1568
1569
|
isAssumption(boolVar: BoolVar) {
|
|
1569
|
-
return
|
|
1570
|
+
return (
|
|
1571
|
+
this.literalAssumptions.has(mkLiteral(boolVar)) ||
|
|
1572
|
+
this.literalAssumptions.has(mkLiteral(boolVar, true))
|
|
1573
|
+
);
|
|
1570
1574
|
}
|
|
1571
1575
|
|
|
1572
1576
|
isTrackingAssumptions() {
|
|
1573
|
-
return this.
|
|
1577
|
+
return this.literalAssumptions.size > 0 && this.searchLevel > this.baseLevel;
|
|
1574
1578
|
}
|
|
1575
1579
|
|
|
1576
1580
|
mkUnsatCore(result: number) {
|
|
1577
1581
|
if (result !== L_FALSE || !this.isTrackingAssumptions()) return result;
|
|
1578
|
-
const
|
|
1582
|
+
const literalAssumptions = this.literalAssumptions;
|
|
1583
|
+
const found = new Set<Literal>();
|
|
1584
|
+
const core: number[] = [];
|
|
1579
1585
|
for (const literal of this.conflictResolution.unsatCore) {
|
|
1580
|
-
const
|
|
1581
|
-
|
|
1586
|
+
const assumed = literalAssumptions.has(literal) ? literal : negate(literal);
|
|
1587
|
+
const assumption = literalAssumptions.get(assumed);
|
|
1588
|
+
if (assumption === undefined || found.has(assumed)) continue;
|
|
1589
|
+
found.add(assumed);
|
|
1590
|
+
this.manager.incRef(assumption);
|
|
1591
|
+
core.push(assumption);
|
|
1582
1592
|
}
|
|
1583
|
-
|
|
1593
|
+
literalAssumptions.clear();
|
|
1584
1594
|
this.popToBaseLevel();
|
|
1585
1595
|
this.searchLevel = this.baseLevel;
|
|
1586
1596
|
const ids = this.manager.ids;
|
|
1587
|
-
this.unsatCore =
|
|
1597
|
+
this.unsatCore = core.sort((left, right) => ids[left] - ids[right]);
|
|
1588
1598
|
return L_FALSE;
|
|
1589
1599
|
}
|
|
1590
1600
|
|
|
@@ -379,8 +379,8 @@ class MatchSubstitution {
|
|
|
379
379
|
if (manager.kinds[right] === KIND_VAR) return false;
|
|
380
380
|
if (manager.kinds[left] === KIND_QUANTIFIER || manager.kinds[right] === KIND_QUANTIFIER)
|
|
381
381
|
return false;
|
|
382
|
-
if (manager.
|
|
383
|
-
if (left === right && manager.
|
|
382
|
+
if (manager.isGroundApp(left) && !manager.isGroundApp(right)) return false;
|
|
383
|
+
if (left === right && manager.isGroundApp(left)) {
|
|
384
384
|
this.todo.pop();
|
|
385
385
|
continue;
|
|
386
386
|
}
|
|
@@ -34,6 +34,22 @@ export class DependentExprState {
|
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
36
|
|
|
37
|
+
// A rewrite of -1 leaves the formula. The last result stays referenced until the next one.
|
|
38
|
+
rewriteEach(rewrite: (form: number) => number) {
|
|
39
|
+
const manager = this.manager;
|
|
40
|
+
const goal = this.goal;
|
|
41
|
+
let rewritten = -1;
|
|
42
|
+
this.forEachIndex((index) => {
|
|
43
|
+
const form = this.get(index);
|
|
44
|
+
const next = rewrite(form);
|
|
45
|
+
if (next === -1) return;
|
|
46
|
+
if (rewritten !== -1) manager.decRef(rewritten);
|
|
47
|
+
rewritten = next;
|
|
48
|
+
if (rewritten !== form) goal.update(index, rewritten, goal.getDependency(index));
|
|
49
|
+
});
|
|
50
|
+
if (rewritten !== -1) manager.decRef(rewritten);
|
|
51
|
+
}
|
|
52
|
+
|
|
37
53
|
hasQuantifiers() {
|
|
38
54
|
let isFound = false;
|
|
39
55
|
for (let index = 0; index < this.goal.forms.size; index++)
|
|
@@ -51,16 +51,7 @@ export const distributeForall = (manager: AstManager, goal: Goal) =>
|
|
|
51
51
|
reduce: () => {
|
|
52
52
|
if (!state.hasQuantifiers()) return;
|
|
53
53
|
const rewriter = new DistributeForallRewriter(manager);
|
|
54
|
-
|
|
55
|
-
state.forEachIndex((index) => {
|
|
56
|
-
const form = state.get(index);
|
|
57
|
-
if (!manager.hasQuantifierFlags[form]) return;
|
|
58
|
-
const next = rewriter.rewrite(form);
|
|
59
|
-
if (rewritten !== -1) manager.decRef(rewritten);
|
|
60
|
-
rewritten = next;
|
|
61
|
-
if (rewritten !== form) goal.update(index, rewritten);
|
|
62
|
-
});
|
|
63
|
-
if (rewritten !== -1) manager.decRef(rewritten);
|
|
54
|
+
state.rewriteEach((form) => (manager.hasQuantifierFlags[form] ? rewriter.rewrite(form) : -1));
|
|
64
55
|
rewriter.release();
|
|
65
56
|
},
|
|
66
57
|
release: () => {},
|
|
@@ -199,7 +199,7 @@ class ExprSubstitutionSimplifier {
|
|
|
199
199
|
|
|
200
200
|
private updateSubstitution(expr: number) {
|
|
201
201
|
const manager = this.manager;
|
|
202
|
-
if (manager.
|
|
202
|
+
if (manager.isGroundApp(expr) && manager.getOp(expr) === OP_EQ) {
|
|
203
203
|
const lhs = manager.getArg(expr, 0);
|
|
204
204
|
const rhs = manager.getArg(expr, 1);
|
|
205
205
|
this.computeDepth(lhs);
|
|
@@ -176,13 +176,8 @@ class Enum2BvRewriter extends RewriterTpl {
|
|
|
176
176
|
: data.kind === QUANTIFIER_FORALL
|
|
177
177
|
? manager.mkApp(OP_IMPLIES, [manager.mkAnd(bounds.items), body], SORT_BOOL)
|
|
178
178
|
: manager.mkAnd(bounds.items);
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
sorts,
|
|
182
|
-
body: newBody,
|
|
183
|
-
patterns,
|
|
184
|
-
noPatterns: [],
|
|
185
|
-
});
|
|
179
|
+
// Z3 reads the no-patterns from a vector its rewriter has shrunk: they are the quantifier's own.
|
|
180
|
+
const result = manager.mkQuantifier({ ...data, sorts, body: newBody, patterns });
|
|
186
181
|
manager.incRef(result);
|
|
187
182
|
bounds.reset();
|
|
188
183
|
return result;
|
|
@@ -310,7 +310,7 @@ export class Mam implements LabelHasher {
|
|
|
310
310
|
const numArgs = manager.getNumArgs(pattern);
|
|
311
311
|
let groundArgIndex = -1;
|
|
312
312
|
for (let index = 0; index < numArgs && groundArgIndex === -1; index++)
|
|
313
|
-
if (manager.
|
|
313
|
+
if (manager.isGroundApp(manager.getArg(pattern, index))) groundArgIndex = index;
|
|
314
314
|
const groundArg =
|
|
315
315
|
groundArgIndex === -1
|
|
316
316
|
? null
|
|
@@ -344,7 +344,7 @@ export class Mam implements LabelHasher {
|
|
|
344
344
|
if (!isFound) paths.push(path);
|
|
345
345
|
continue;
|
|
346
346
|
}
|
|
347
|
-
if (manager.
|
|
347
|
+
if (manager.isGroundApp(child)) {
|
|
348
348
|
const node = this.getGroundEnode(child, mp.quantifier);
|
|
349
349
|
if (node === null) continue;
|
|
350
350
|
this.updatePlbls(label);
|
|
@@ -361,7 +361,7 @@ export class Mam implements LabelHasher {
|
|
|
361
361
|
|
|
362
362
|
addPattern(quantifier: number, patterns: number[]) {
|
|
363
363
|
const manager = this.manager;
|
|
364
|
-
if (patterns.every((pattern) => manager.
|
|
364
|
+
if (patterns.every((pattern) => manager.isGroundApp(pattern))) return;
|
|
365
365
|
if (patterns.some((pattern) => manager.hasQuantifierFlags[pattern])) return;
|
|
366
366
|
const mp = { quantifier, patterns };
|
|
367
367
|
const numDecls = manager.getQuantifier(quantifier).sorts.length;
|
|
@@ -370,7 +370,7 @@ export class Mam implements LabelHasher {
|
|
|
370
370
|
this.collectGroundExprs(quantifier, patterns);
|
|
371
371
|
this.newPatterns.push(mp);
|
|
372
372
|
patterns.forEach((pattern, firstIndex) => {
|
|
373
|
-
if (manager.
|
|
373
|
+
if (manager.isGroundApp(pattern)) return;
|
|
374
374
|
const label = manager.decls[pattern];
|
|
375
375
|
const tree = this.trees.get(label);
|
|
376
376
|
if (tree !== undefined) {
|
|
@@ -387,7 +387,7 @@ export class Mam implements LabelHasher {
|
|
|
387
387
|
const manager = this.manager;
|
|
388
388
|
const todo: number[] = [];
|
|
389
389
|
for (const pattern of patterns) {
|
|
390
|
-
if (!manager.
|
|
390
|
+
if (!manager.isGroundApp(pattern)) {
|
|
391
391
|
todo.push(pattern);
|
|
392
392
|
continue;
|
|
393
393
|
}
|
|
@@ -397,7 +397,7 @@ export class Mam implements LabelHasher {
|
|
|
397
397
|
this.addSharedEnode(node);
|
|
398
398
|
}
|
|
399
399
|
for (let term = todo.pop(); term !== undefined; term = todo.pop()) {
|
|
400
|
-
if (manager.
|
|
400
|
+
if (manager.isGroundApp(term)) {
|
|
401
401
|
const node = this.getGroundEnode(term, quantifier);
|
|
402
402
|
if (node !== null) this.addSharedEnode(node);
|
|
403
403
|
} else
|
|
@@ -51,21 +51,10 @@ import {
|
|
|
51
51
|
} from "./datatype-decl-plugin";
|
|
52
52
|
import type { Definition, Goal } from "./goal";
|
|
53
53
|
import { getManagerSomeValue } from "./proto-model";
|
|
54
|
-
import { Rational } from "./rational";
|
|
54
|
+
import { getMultInverse, Rational } from "./rational";
|
|
55
55
|
import { RefVector } from "./ref-vector";
|
|
56
56
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
57
57
|
|
|
58
|
-
const getModInverse = (value: bigint, modulus: bigint) => {
|
|
59
|
-
let [oldRemainder, remainder] = [((value % modulus) + modulus) % modulus, modulus];
|
|
60
|
-
let [oldCoefficient, coefficient] = [1n, 0n];
|
|
61
|
-
while (remainder !== 0n) {
|
|
62
|
-
const quotient = oldRemainder / remainder;
|
|
63
|
-
[oldRemainder, remainder] = [remainder, oldRemainder - quotient * remainder];
|
|
64
|
-
[oldCoefficient, coefficient] = [coefficient, oldCoefficient - quotient * coefficient];
|
|
65
|
-
}
|
|
66
|
-
return oldRemainder === 1n ? ((oldCoefficient % modulus) + modulus) % modulus : undefined;
|
|
67
|
-
};
|
|
68
|
-
|
|
69
58
|
export const collectUnconstrained = (manager: AstManager, goal: Goal) => {
|
|
70
59
|
const visited = new Set<number>();
|
|
71
60
|
const vars: number[] = [];
|
|
@@ -381,7 +370,7 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
381
370
|
}
|
|
382
371
|
if (args.length !== 2 || !this.isUncnstr(args[1]) || !manager.isBvNumeral(args[0]))
|
|
383
372
|
return -1;
|
|
384
|
-
const inverse =
|
|
373
|
+
const inverse = getMultInverse(manager.getBvNumeralValue(args[0]), width);
|
|
385
374
|
if (inverse === undefined) return -1;
|
|
386
375
|
const found = this.mkFreshFor(decl, args, sort);
|
|
387
376
|
if (found.isNew)
|
|
@@ -502,7 +491,7 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
502
491
|
|
|
503
492
|
reduceApp(decl: number, args: number[], sort: number) {
|
|
504
493
|
const manager = this.manager;
|
|
505
|
-
if (args.length === 0 || !args.every((arg) => manager.
|
|
494
|
+
if (args.length === 0 || !args.every((arg) => manager.isGroundApp(arg))) return -1;
|
|
506
495
|
const info = manager.funcDecls[decl];
|
|
507
496
|
const result =
|
|
508
497
|
info.family === FAMILY_BASIC
|
|
@@ -36,7 +36,9 @@ const IS_CGC_ENABLED = 8;
|
|
|
36
36
|
const IS_MARKED = 16;
|
|
37
37
|
const IS_MARKED2 = 32;
|
|
38
38
|
const IS_INTERPRETED = 64;
|
|
39
|
-
const
|
|
39
|
+
const IS_COMMUTATIVE = 128;
|
|
40
|
+
const IS_COMMUTATIVE_TABLE = 256;
|
|
41
|
+
const NUM_ARGS_SHIFT = 9;
|
|
40
42
|
|
|
41
43
|
class ThVarCell {
|
|
42
44
|
constructor(
|
|
@@ -77,6 +79,8 @@ export class Enode {
|
|
|
77
79
|
moreArgs: Enode[],
|
|
78
80
|
public generation: number,
|
|
79
81
|
isEq: boolean,
|
|
82
|
+
isCommutative: boolean,
|
|
83
|
+
isCommutativeTable: boolean,
|
|
80
84
|
isBool: boolean,
|
|
81
85
|
isMergeTf: boolean,
|
|
82
86
|
isCgcEnabled: boolean,
|
|
@@ -88,6 +92,8 @@ export class Enode {
|
|
|
88
92
|
this.flags =
|
|
89
93
|
(numArgs << NUM_ARGS_SHIFT) |
|
|
90
94
|
(isEq ? IS_EQ : 0) |
|
|
95
|
+
(isCommutative ? IS_COMMUTATIVE : 0) |
|
|
96
|
+
(isCommutativeTable ? IS_COMMUTATIVE_TABLE : 0) |
|
|
91
97
|
(isBool ? IS_BOOL : 0) |
|
|
92
98
|
(isMergeTf ? IS_MERGE_TF : 0) |
|
|
93
99
|
(isCgcEnabled ? IS_CGC_ENABLED : 0);
|
|
@@ -109,6 +115,14 @@ export class Enode {
|
|
|
109
115
|
return (this.flags & IS_EQ) !== 0;
|
|
110
116
|
}
|
|
111
117
|
|
|
118
|
+
get isCommutative() {
|
|
119
|
+
return (this.flags & IS_COMMUTATIVE) !== 0;
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
get isCommutativeTable() {
|
|
123
|
+
return (this.flags & IS_COMMUTATIVE_TABLE) !== 0;
|
|
124
|
+
}
|
|
125
|
+
|
|
112
126
|
get isBool() {
|
|
113
127
|
return (this.flags & IS_BOOL) !== 0;
|
|
114
128
|
}
|
|
@@ -42,20 +42,31 @@ export interface VarData {
|
|
|
42
42
|
readonly parentSelects: Enode[];
|
|
43
43
|
}
|
|
44
44
|
|
|
45
|
-
const
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
45
|
+
const PACKED_EXPR_LIMIT = 2 ** 24;
|
|
46
|
+
|
|
47
|
+
// The kind, the node and the select or its only index in one exact integer, when both
|
|
48
|
+
// expressions are small enough.
|
|
49
|
+
const getAxiomKey = (record: AxiomRecord) => {
|
|
50
|
+
const node = record.node.owner;
|
|
51
|
+
const select = record.select;
|
|
52
|
+
const isSelect = record.kind === KIND_SELECT && select !== null;
|
|
53
|
+
if (isSelect && select.args.length !== 2)
|
|
54
|
+
return `${record.kind},${node},${select.args
|
|
55
|
+
.slice(1)
|
|
56
|
+
.map((arg) => arg.owner)
|
|
57
|
+
.join(",")}`;
|
|
58
|
+
const other = select === null ? 0 : (isSelect ? select.args[1].owner : select.owner) + 1;
|
|
59
|
+
return node < PACKED_EXPR_LIMIT && other < PACKED_EXPR_LIMIT
|
|
60
|
+
? (node * PACKED_EXPR_LIMIT + other) * 8 + record.kind
|
|
61
|
+
: `${record.kind},${node},${other}`;
|
|
62
|
+
};
|
|
52
63
|
|
|
53
64
|
export abstract class ArrayInternalize extends ThSolver {
|
|
54
65
|
protected readonly varData: VarData[] = [];
|
|
55
66
|
protected readonly find: UnionFind;
|
|
56
67
|
private sort2diffs = new Map<number, number[]>();
|
|
57
68
|
protected readonly axiomTrail: AxiomRecord[] = [];
|
|
58
|
-
private axioms = new Map<string, number>();
|
|
69
|
+
private axioms = new Map<number | string, number>();
|
|
59
70
|
protected qhead = 0;
|
|
60
71
|
protected delayQhead = 0;
|
|
61
72
|
protected isDelayEnabled = true;
|
|
@@ -39,7 +39,7 @@ const ENTER = 0;
|
|
|
39
39
|
const EXIT = 1;
|
|
40
40
|
|
|
41
41
|
interface VarData {
|
|
42
|
-
|
|
42
|
+
constructorNode: Enode | null;
|
|
43
43
|
readonly recognizers: (Enode | null)[];
|
|
44
44
|
}
|
|
45
45
|
|
|
@@ -187,12 +187,12 @@ export class DtSolver extends ThSolver {
|
|
|
187
187
|
const manager = this.manager;
|
|
188
188
|
const thVar = super.mkVar(node);
|
|
189
189
|
this.find.mkVar();
|
|
190
|
-
const data: VarData = {
|
|
190
|
+
const data: VarData = { constructorNode: null, recognizers: [] };
|
|
191
191
|
this.varData.push(data);
|
|
192
192
|
this.ctx.egraph.addThVar(node, thVar, this.id);
|
|
193
193
|
const expr = node.owner;
|
|
194
194
|
if (this.isConstructor(expr)) {
|
|
195
|
-
data.
|
|
195
|
+
data.constructorNode = node;
|
|
196
196
|
this.assertAccessorAxioms(node);
|
|
197
197
|
} else if (this.isUpdateField(expr)) this.assertUpdateFieldAxioms(node);
|
|
198
198
|
else if (!this.isRecognizer(expr)) {
|
|
@@ -283,11 +283,11 @@ export class DtSolver extends ThSolver {
|
|
|
283
283
|
const data = this.varData[thVar];
|
|
284
284
|
const constructor = getRecognizerConstructor(manager, node.decl);
|
|
285
285
|
if ((lit & 1) === 0) {
|
|
286
|
-
if (data.
|
|
286
|
+
if (data.constructorNode !== null && data.constructorNode.decl === constructor) return;
|
|
287
287
|
this.assertIsConstructorAxiom(arg, constructor, lit);
|
|
288
|
-
} else if (data.
|
|
289
|
-
else if (data.
|
|
290
|
-
this.signRecognizerConflict(data.
|
|
288
|
+
} else if (data.constructorNode === null) this.propagateRecognizer(thVar, node);
|
|
289
|
+
else if (data.constructorNode.decl === constructor)
|
|
290
|
+
this.signRecognizerConflict(data.constructorNode, node);
|
|
291
291
|
}
|
|
292
292
|
|
|
293
293
|
private addRecognizer(inputVar: number, recognizer: Enode) {
|
|
@@ -303,9 +303,9 @@ export class DtSolver extends ThSolver {
|
|
|
303
303
|
if (data.recognizers[index] !== null) return;
|
|
304
304
|
const value = this.value(recognizer);
|
|
305
305
|
if (value === L_TRUE) return;
|
|
306
|
-
if (value === L_FALSE && data.
|
|
307
|
-
if (data.
|
|
308
|
-
this.signRecognizerConflict(data.
|
|
306
|
+
if (value === L_FALSE && data.constructorNode !== null) {
|
|
307
|
+
if (data.constructorNode.decl === constructor)
|
|
308
|
+
this.signRecognizerConflict(data.constructorNode, recognizer);
|
|
309
309
|
return;
|
|
310
310
|
}
|
|
311
311
|
this.ctx.trail.push(() => {
|
|
@@ -365,8 +365,8 @@ export class DtSolver extends ThSolver {
|
|
|
365
365
|
const manager = this.manager;
|
|
366
366
|
const firstData = this.varData[first];
|
|
367
367
|
const secondData = this.varData[second];
|
|
368
|
-
const firstConstructor = firstData.
|
|
369
|
-
const secondConstructor = secondData.
|
|
368
|
+
const firstConstructor = firstData.constructorNode;
|
|
369
|
+
const secondConstructor = secondData.constructorNode;
|
|
370
370
|
if (
|
|
371
371
|
firstConstructor !== null &&
|
|
372
372
|
secondConstructor !== null &&
|
|
@@ -375,7 +375,7 @@ export class DtSolver extends ThSolver {
|
|
|
375
375
|
this.setConflict([], [[firstConstructor, secondConstructor]]);
|
|
376
376
|
else if (secondConstructor !== null && firstConstructor === null) {
|
|
377
377
|
this.ctx.trail.push(() => {
|
|
378
|
-
firstData.
|
|
378
|
+
firstData.constructorNode = null;
|
|
379
379
|
});
|
|
380
380
|
if (firstData.recognizers.length > 0) {
|
|
381
381
|
const recognizer =
|
|
@@ -385,7 +385,7 @@ export class DtSolver extends ThSolver {
|
|
|
385
385
|
return;
|
|
386
386
|
}
|
|
387
387
|
}
|
|
388
|
-
firstData.
|
|
388
|
+
firstData.constructorNode = secondConstructor;
|
|
389
389
|
}
|
|
390
390
|
for (const recognizer of secondData.recognizers)
|
|
391
391
|
if (recognizer !== null) this.addRecognizer(first, recognizer);
|
|
@@ -404,7 +404,7 @@ export class DtSolver extends ThSolver {
|
|
|
404
404
|
private ocGetConstructor(app: Enode) {
|
|
405
405
|
const thVar = app.root.getThVar(this.id);
|
|
406
406
|
if (thVar === NULL_THEORY_VAR) return null;
|
|
407
|
-
return this.varData[this.find.find(thVar)].
|
|
407
|
+
return this.varData[this.find.find(thVar)].constructorNode;
|
|
408
408
|
}
|
|
409
409
|
|
|
410
410
|
private explainIsChild(parent: Enode, child: Enode) {
|
|
@@ -439,7 +439,7 @@ export class DtSolver extends ThSolver {
|
|
|
439
439
|
const app = inputApp.root;
|
|
440
440
|
const thVar = app.getThVar(this.id);
|
|
441
441
|
if (thVar === NULL_THEORY_VAR) return false;
|
|
442
|
-
const parent = this.varData[this.find.find(thVar)].
|
|
442
|
+
const parent = this.varData[this.find.find(thVar)].constructorNode;
|
|
443
443
|
if (parent === null) return false;
|
|
444
444
|
this.ocMarkOnStack(parent);
|
|
445
445
|
const processArg = (arg: Enode) => {
|
|
@@ -510,7 +510,7 @@ export class DtSolver extends ThSolver {
|
|
|
510
510
|
this.clearMark();
|
|
511
511
|
return CR_CONTINUE;
|
|
512
512
|
}
|
|
513
|
-
if (this.varData[thVar].
|
|
513
|
+
if (this.varData[thVar].constructorNode !== null) continue;
|
|
514
514
|
this.clearMark();
|
|
515
515
|
this.mkSplit(thVar);
|
|
516
516
|
result = CR_CONTINUE;
|
|
@@ -530,7 +530,7 @@ export class DtSolver extends ThSolver {
|
|
|
530
530
|
values[node.root.owner] = model.getFreshValue(this.manager.sorts[node.owner]) ?? undefined;
|
|
531
531
|
return;
|
|
532
532
|
}
|
|
533
|
-
const constructor = this.varData[this.find.find(thVar)].
|
|
533
|
+
const constructor = this.varData[this.find.find(thVar)].constructorNode as Enode;
|
|
534
534
|
values[node.root.owner] = this.mkApp(
|
|
535
535
|
constructor.decl,
|
|
536
536
|
constructor.args.map((arg) => values[arg.root.owner] as number),
|
|
@@ -541,7 +541,7 @@ export class DtSolver extends ThSolver {
|
|
|
541
541
|
if (!this.isDatatype(node.owner)) return false;
|
|
542
542
|
const thVar = node.getThVar(this.id);
|
|
543
543
|
if (thVar === NULL_THEORY_VAR) return false;
|
|
544
|
-
const constructor = this.varData[this.find.find(thVar)].
|
|
544
|
+
const constructor = this.varData[this.find.find(thVar)].constructorNode as Enode;
|
|
545
545
|
if (constructor.numArgs === 0) deps.set(node, null);
|
|
546
546
|
for (const arg of constructor.args) addDependency(deps, node, arg.root);
|
|
547
547
|
return true;
|