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
|
@@ -1,6 +1,23 @@
|
|
|
1
1
|
// Ported from Z3 (src/ast/euf/euf_egraph.h, src/ast/euf/euf_egraph.cpp, src/ast/euf/euf_enode.h,
|
|
2
2
|
// src/ast/euf/euf_enode.cpp, src/ast/euf/euf_justification.h), MIT license, see z3-license.txt.
|
|
3
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
type AstManager,
|
|
5
|
+
OP_ADD,
|
|
6
|
+
OP_AND,
|
|
7
|
+
OP_ARRAY_EXT,
|
|
8
|
+
OP_ARRAY_MAP,
|
|
9
|
+
OP_BADD,
|
|
10
|
+
OP_BAND,
|
|
11
|
+
OP_BCOMP,
|
|
12
|
+
OP_BMUL,
|
|
13
|
+
OP_BOR,
|
|
14
|
+
OP_BXNOR,
|
|
15
|
+
OP_BXOR,
|
|
16
|
+
OP_EQ,
|
|
17
|
+
OP_MUL,
|
|
18
|
+
OP_OR,
|
|
19
|
+
OP_XOR,
|
|
20
|
+
} from "../ast";
|
|
4
21
|
import { CgTable } from "../cg-table";
|
|
5
22
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
6
23
|
|
|
@@ -10,35 +27,28 @@ export const NULL_BOOL_VAR = -1;
|
|
|
10
27
|
const J_AXIOM = 0;
|
|
11
28
|
export const J_CONGRUENCE = 1;
|
|
12
29
|
export const J_EXTERNAL = 2;
|
|
13
|
-
export const J_EQUALITY = 3;
|
|
14
30
|
|
|
15
31
|
export interface Justification {
|
|
16
32
|
readonly kind: number;
|
|
17
33
|
readonly isCommutative: boolean;
|
|
18
34
|
readonly external: number;
|
|
19
|
-
readonly lhs: Enode | null;
|
|
20
|
-
readonly rhs: Enode | null;
|
|
21
35
|
}
|
|
22
36
|
|
|
23
37
|
export const AXIOM: Justification = {
|
|
24
38
|
kind: J_AXIOM,
|
|
25
39
|
isCommutative: false,
|
|
26
40
|
external: 0,
|
|
27
|
-
lhs: null,
|
|
28
|
-
rhs: null,
|
|
29
41
|
};
|
|
30
42
|
|
|
31
43
|
const CONGRUENCES: readonly Justification[] = [
|
|
32
|
-
{ kind: J_CONGRUENCE, isCommutative: false, external: 0
|
|
33
|
-
{ kind: J_CONGRUENCE, isCommutative: true, external: 0
|
|
44
|
+
{ kind: J_CONGRUENCE, isCommutative: false, external: 0 },
|
|
45
|
+
{ kind: J_CONGRUENCE, isCommutative: true, external: 0 },
|
|
34
46
|
];
|
|
35
47
|
|
|
36
48
|
export const mkExternal = (external: number): Justification => ({
|
|
37
49
|
kind: J_EXTERNAL,
|
|
38
50
|
isCommutative: false,
|
|
39
51
|
external,
|
|
40
|
-
lhs: null,
|
|
41
|
-
rhs: null,
|
|
42
52
|
});
|
|
43
53
|
|
|
44
54
|
interface ThVar {
|
|
@@ -78,13 +88,17 @@ export class Enode {
|
|
|
78
88
|
readonly decl: number,
|
|
79
89
|
readonly args: readonly Enode[],
|
|
80
90
|
readonly generation: number,
|
|
81
|
-
readonly
|
|
91
|
+
readonly isCommutative: boolean,
|
|
82
92
|
) {}
|
|
83
93
|
|
|
84
94
|
get numArgs() {
|
|
85
95
|
return this.args.length;
|
|
86
96
|
}
|
|
87
97
|
|
|
98
|
+
get isCommutativeTable() {
|
|
99
|
+
return this.isCommutative;
|
|
100
|
+
}
|
|
101
|
+
|
|
88
102
|
getArg(index: number) {
|
|
89
103
|
return this.args[index];
|
|
90
104
|
}
|
|
@@ -135,7 +149,7 @@ export class Enode {
|
|
|
135
149
|
congruent(other: Enode) {
|
|
136
150
|
if (this.decl !== other.decl || this.args.length !== other.args.length) return false;
|
|
137
151
|
if (
|
|
138
|
-
this.
|
|
152
|
+
this.isCommutative &&
|
|
139
153
|
this.args[0].root === other.args[1].root &&
|
|
140
154
|
this.args[1].root === other.args[0].root
|
|
141
155
|
)
|
|
@@ -213,16 +227,40 @@ interface UpdateRecord {
|
|
|
213
227
|
|
|
214
228
|
const TO_MERGE_PLAIN = 0;
|
|
215
229
|
const TO_MERGE_COMM = 1;
|
|
216
|
-
const
|
|
217
|
-
const TO_ADD_LITERAL = 3;
|
|
230
|
+
const TO_ADD_LITERAL = 2;
|
|
218
231
|
|
|
219
232
|
interface ToMerge {
|
|
220
233
|
a: Enode;
|
|
221
234
|
b: Enode | null;
|
|
222
235
|
kind: number;
|
|
223
|
-
justification: Justification;
|
|
224
236
|
}
|
|
225
237
|
|
|
238
|
+
// func_decl_info::is_commutative, which the decl plugins set by family and kind.
|
|
239
|
+
export const isCommutativeDecl = (manager: AstManager, decl: number): boolean => {
|
|
240
|
+
const funcDecl = manager.funcDecls[decl];
|
|
241
|
+
switch (funcDecl.op) {
|
|
242
|
+
case OP_EQ:
|
|
243
|
+
case OP_AND:
|
|
244
|
+
case OP_OR:
|
|
245
|
+
case OP_XOR:
|
|
246
|
+
case OP_ADD:
|
|
247
|
+
case OP_MUL:
|
|
248
|
+
case OP_BADD:
|
|
249
|
+
case OP_BMUL:
|
|
250
|
+
case OP_BAND:
|
|
251
|
+
case OP_BOR:
|
|
252
|
+
case OP_BXOR:
|
|
253
|
+
case OP_BXNOR:
|
|
254
|
+
case OP_BCOMP:
|
|
255
|
+
case OP_ARRAY_EXT:
|
|
256
|
+
return true;
|
|
257
|
+
case OP_ARRAY_MAP:
|
|
258
|
+
return isCommutativeDecl(manager, funcDecl.parameters[0]);
|
|
259
|
+
default:
|
|
260
|
+
return false;
|
|
261
|
+
}
|
|
262
|
+
};
|
|
263
|
+
|
|
226
264
|
export class Egraph {
|
|
227
265
|
readonly nodes: Enode[] = [];
|
|
228
266
|
private toMerge: ToMerge[] = [];
|
|
@@ -264,8 +302,12 @@ export class Egraph {
|
|
|
264
302
|
return this.expr2enode[expr];
|
|
265
303
|
}
|
|
266
304
|
|
|
267
|
-
findCongruent(decl: number, args: readonly Enode[]
|
|
268
|
-
return this.table.findFor(
|
|
305
|
+
findCongruent(decl: number, args: readonly Enode[]) {
|
|
306
|
+
return this.table.findFor(
|
|
307
|
+
decl,
|
|
308
|
+
args,
|
|
309
|
+
args.length === 2 && isCommutativeDecl(this.manager, decl),
|
|
310
|
+
);
|
|
269
311
|
}
|
|
270
312
|
|
|
271
313
|
enodesOf(decl: number) {
|
|
@@ -292,7 +334,7 @@ export class Egraph {
|
|
|
292
334
|
decl,
|
|
293
335
|
args,
|
|
294
336
|
generation,
|
|
295
|
-
args.length === 2 && isApp && manager
|
|
337
|
+
args.length === 2 && isApp && isCommutativeDecl(manager, decl),
|
|
296
338
|
);
|
|
297
339
|
if (this.isDefaultRelevant) node.isRelevant = true;
|
|
298
340
|
this.nodes.push(node);
|
|
@@ -330,7 +372,7 @@ export class Egraph {
|
|
|
330
372
|
}
|
|
331
373
|
|
|
332
374
|
private isComm(node: Enode, other: Enode) {
|
|
333
|
-
return node.
|
|
375
|
+
return node.isCommutative && node.args[0].root !== other.args[0].root;
|
|
334
376
|
}
|
|
335
377
|
|
|
336
378
|
private insertTable(node: Enode) {
|
|
@@ -349,7 +391,7 @@ export class Egraph {
|
|
|
349
391
|
|
|
350
392
|
private queueLiteral(node: Enode, ante: Enode | null) {
|
|
351
393
|
if (this.onPropagateLiteral !== null)
|
|
352
|
-
this.toMerge.push({ a: node, b: ante, kind: TO_ADD_LITERAL
|
|
394
|
+
this.toMerge.push({ a: node, b: ante, kind: TO_ADD_LITERAL });
|
|
353
395
|
}
|
|
354
396
|
|
|
355
397
|
private updateChildren(node: Enode) {
|
|
@@ -358,12 +400,7 @@ export class Egraph {
|
|
|
358
400
|
}
|
|
359
401
|
|
|
360
402
|
private pushMerge(a: Enode, b: Enode, isComm: boolean) {
|
|
361
|
-
this.toMerge.push({
|
|
362
|
-
a,
|
|
363
|
-
b,
|
|
364
|
-
kind: isComm ? TO_MERGE_COMM : TO_MERGE_PLAIN,
|
|
365
|
-
justification: AXIOM,
|
|
366
|
-
});
|
|
403
|
+
this.toMerge.push({ a, b, kind: isComm ? TO_MERGE_COMM : TO_MERGE_PLAIN });
|
|
367
404
|
}
|
|
368
405
|
|
|
369
406
|
pushScope() {
|
|
@@ -455,6 +492,7 @@ export class Egraph {
|
|
|
455
492
|
}
|
|
456
493
|
const rootVar = root.getThVar(id);
|
|
457
494
|
node.replaceThVar(thVar, id);
|
|
495
|
+
// Deviation from Z3: the undo restores the variable of the node; Z3 records that of the root.
|
|
458
496
|
this.updates.push({
|
|
459
497
|
tag: U_REPLACE_TH_VAR,
|
|
460
498
|
r1: node,
|
|
@@ -550,7 +588,7 @@ export class Egraph {
|
|
|
550
588
|
this.toggleCgcEnabled(r1, true);
|
|
551
589
|
break;
|
|
552
590
|
case U_TOGGLE_MERGE_TF:
|
|
553
|
-
r1.isMergeTfEnabled = !r1.
|
|
591
|
+
r1.isMergeTfEnabled = !r1.mergeTf;
|
|
554
592
|
break;
|
|
555
593
|
case U_SET_PARENT:
|
|
556
594
|
this.undoEq(r1, record.n1 as Enode, record.num);
|
|
@@ -716,9 +754,6 @@ export class Egraph {
|
|
|
716
754
|
case TO_MERGE_COMM:
|
|
717
755
|
this.mergeWith(item.a, item.b as Enode, CONGRUENCES[item.kind]);
|
|
718
756
|
break;
|
|
719
|
-
case TO_JUSTIFIED:
|
|
720
|
-
this.mergeWith(item.a, item.b as Enode, item.justification);
|
|
721
|
-
break;
|
|
722
757
|
case TO_ADD_LITERAL:
|
|
723
758
|
this.addLiteral(item.a, item.b);
|
|
724
759
|
break;
|
|
@@ -833,8 +868,6 @@ export class Egraph {
|
|
|
833
868
|
if (justification.kind === J_EXTERNAL) justifications.push(justification.external);
|
|
834
869
|
else if (justification.kind === J_CONGRUENCE)
|
|
835
870
|
this.pushCongruence(a, b, justification.isCommutative);
|
|
836
|
-
else if (justification.kind === J_EQUALITY)
|
|
837
|
-
this.explainEq(justifications, justification.lhs as Enode, justification.rhs as Enode);
|
|
838
871
|
}
|
|
839
872
|
|
|
840
873
|
explainEq(justifications: number[], a: Enode, b: Enode) {
|
|
@@ -580,7 +580,9 @@ export class EufSolver implements SatExtension {
|
|
|
580
580
|
|
|
581
581
|
getThAntecedents(explain: ThExplain, antecedents: number[]) {
|
|
582
582
|
for (const lit of explain.lits) antecedents.push(lit);
|
|
583
|
-
for (const eq of explain.eqs)
|
|
583
|
+
for (const eq of explain.eqs)
|
|
584
|
+
if (eq[0].owner > eq[1].owner) this.egraph.explainEq(this.explanation, eq[1], eq[0]);
|
|
585
|
+
else this.egraph.explainEq(this.explanation, eq[0], eq[1]);
|
|
584
586
|
}
|
|
585
587
|
|
|
586
588
|
explainDiseq(justifications: number[], first: Enode, second: Enode) {
|
|
@@ -853,23 +855,31 @@ export class EufSolver implements SatExtension {
|
|
|
853
855
|
const replay = new Map<number, number>();
|
|
854
856
|
for (const reinit of this.reinits) replay.set(reinit.expr, reinit.boolVar);
|
|
855
857
|
si.setExpr2VarReplay(replay);
|
|
856
|
-
|
|
857
|
-
|
|
858
|
-
|
|
859
|
-
|
|
860
|
-
|
|
861
|
-
const
|
|
862
|
-
|
|
863
|
-
|
|
864
|
-
|
|
865
|
-
|
|
866
|
-
const
|
|
867
|
-
|
|
868
|
-
|
|
869
|
-
|
|
870
|
-
if (this.egraph.find(expr) === undefined
|
|
871
|
-
|
|
872
|
-
|
|
858
|
+
// scoped_suspend_rlimit: the replay runs to its end even when the limit is spent.
|
|
859
|
+
const limit = manager.limit;
|
|
860
|
+
const wasSuspended = limit.isSuspended;
|
|
861
|
+
limit.isSuspended = true;
|
|
862
|
+
try {
|
|
863
|
+
for (const reinit of this.reinits) {
|
|
864
|
+
const expr = reinit.expr;
|
|
865
|
+
const oldGeneration = this.generation;
|
|
866
|
+
this.generation = reinit.generation;
|
|
867
|
+
const lit = si.isBoolOp(expr) ? 2 * (replay.get(expr) as number) : si.internalize(expr);
|
|
868
|
+
const isConnective =
|
|
869
|
+
manager.getFamily(expr) === FAMILY_BASIC &&
|
|
870
|
+
(si.isBoolOp(expr) ||
|
|
871
|
+
(manager.getOp(expr) === OP_EQ && manager.isBool(manager.getArg(expr, 0))));
|
|
872
|
+
if (this.egraph.find(expr) === undefined && !isConnective) {
|
|
873
|
+
const args = manager.isApp(expr)
|
|
874
|
+
? manager.getArgs(expr).map((arg) => this.eInternalize(arg))
|
|
875
|
+
: [];
|
|
876
|
+
this.internalizeTerm(expr);
|
|
877
|
+
if (this.egraph.find(expr) === undefined) this.mkEnode(expr, args);
|
|
878
|
+
} else this.attachLit(lit, expr);
|
|
879
|
+
this.generation = oldGeneration;
|
|
880
|
+
}
|
|
881
|
+
} finally {
|
|
882
|
+
limit.isSuspended = wasSuspended;
|
|
873
883
|
}
|
|
874
884
|
for (const entry of replay)
|
|
875
885
|
if (si.isBoolOp(entry[0]) && !si.isCached(entry[0], 2 * entry[1]))
|
|
@@ -919,6 +929,13 @@ export class EufSolver implements SatExtension {
|
|
|
919
929
|
|
|
920
930
|
findMutexes() {}
|
|
921
931
|
|
|
932
|
+
// Every theory solver but pb's returns false from to_formulas, which ends the walk.
|
|
933
|
+
toFormulas(_lit2expr: (lit: number) => number, formulas: number[]) {
|
|
934
|
+
if (this.solvers.length > 0) return;
|
|
935
|
+
for (const node of this.egraph.nodes)
|
|
936
|
+
if (node.root !== node) formulas.push(this.manager.mkEq(node.owner, node.root.owner));
|
|
937
|
+
}
|
|
938
|
+
|
|
922
939
|
saveModel(model: ProtoModel | null) {
|
|
923
940
|
model?.incRef();
|
|
924
941
|
this.qmodel?.decRef();
|
|
@@ -152,18 +152,13 @@ export class FpaSolver extends ThSolver {
|
|
|
152
152
|
const owner = node.owner;
|
|
153
153
|
if (this.isOp(owner, OP_ITE)) return;
|
|
154
154
|
this.attachNewThVar(node);
|
|
155
|
-
manager.
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
}
|
|
163
|
-
this.activate(owner);
|
|
164
|
-
},
|
|
165
|
-
() => [],
|
|
166
|
-
);
|
|
155
|
+
const outer = manager.beginTemporaries();
|
|
156
|
+
if (this.isRm(owner) && !this.isOp(owner, OP_FPA_BV2RM)) {
|
|
157
|
+
const limit = manager.mkBvNumeral(4n, 3);
|
|
158
|
+
this.addUnit(this.mkLiteral(mkBvApp(manager, OP_ULEQ, [this.converter.wrap(owner), limit])));
|
|
159
|
+
}
|
|
160
|
+
this.activate(owner);
|
|
161
|
+
manager.endTemporaries(outer);
|
|
167
162
|
}
|
|
168
163
|
|
|
169
164
|
override unitPropagate() {
|
|
@@ -172,11 +167,11 @@ export class FpaSolver extends ThSolver {
|
|
|
172
167
|
this.ctx.trail.push(() => {
|
|
173
168
|
this.nodesQhead = qhead;
|
|
174
169
|
});
|
|
175
|
-
for (; this.nodesQhead < this.nodes.length; this.nodesQhead++)
|
|
176
|
-
this.manager.
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
170
|
+
for (; this.nodesQhead < this.nodes.length; this.nodesQhead++) {
|
|
171
|
+
const outer = this.manager.beginTemporaries();
|
|
172
|
+
this.propagateNode(this.nodes[this.nodesQhead]);
|
|
173
|
+
this.manager.endTemporaries(outer);
|
|
174
|
+
}
|
|
180
175
|
return true;
|
|
181
176
|
}
|
|
182
177
|
|
|
@@ -227,23 +222,20 @@ export class FpaSolver extends ThSolver {
|
|
|
227
222
|
const firstExpr = this.var2expr(first);
|
|
228
223
|
const secondExpr = this.var2expr(second);
|
|
229
224
|
if (this.isOp(firstExpr, OP_FPA_BVWRAP) || this.isOp(secondExpr, OP_FPA_BVWRAP)) return;
|
|
230
|
-
manager.
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
},
|
|
245
|
-
() => [],
|
|
246
|
-
);
|
|
225
|
+
const outer = manager.beginTemporaries();
|
|
226
|
+
const firstConverted = this.convert(firstExpr);
|
|
227
|
+
const secondConverted = this.convert(secondExpr);
|
|
228
|
+
const isFloatPair =
|
|
229
|
+
(this.isFloat(firstExpr) && this.isFloat(secondExpr)) ||
|
|
230
|
+
(this.isRm(firstExpr) && this.isRm(secondExpr));
|
|
231
|
+
const eq = isFloatPair
|
|
232
|
+
? this.converter.mkEq(firstConverted, secondConverted)
|
|
233
|
+
: manager.mkEq(firstConverted, secondConverted);
|
|
234
|
+
const condition = this.theoryRewriter.rewrite(eq);
|
|
235
|
+
manager.releaseLater(condition);
|
|
236
|
+
this.addEquiv(this.eqInternalize(firstExpr, secondExpr), this.mkLiteral(condition));
|
|
237
|
+
this.addUnits(this.mkSideConditions());
|
|
238
|
+
manager.endTemporaries(outer);
|
|
247
239
|
}
|
|
248
240
|
|
|
249
241
|
override newEqEh(eq: ThEq) {
|
|
@@ -259,26 +251,20 @@ export class FpaSolver extends ThSolver {
|
|
|
259
251
|
}
|
|
260
252
|
|
|
261
253
|
override asserted(lit: number) {
|
|
262
|
-
this.manager.
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
return;
|
|
270
|
-
}
|
|
271
|
-
this.addClause([...conds.map((cond) => cond ^ 1), lit]);
|
|
272
|
-
},
|
|
273
|
-
() => [],
|
|
274
|
-
);
|
|
254
|
+
const outer = this.manager.beginTemporaries();
|
|
255
|
+
const converted = this.mkLiteral(this.convert(this.boolVar2expr(lit >> 1) as number));
|
|
256
|
+
const conds = this.mkSideConditions();
|
|
257
|
+
conds.push(converted);
|
|
258
|
+
if ((lit & 1) === 1) for (const cond of conds) this.addClause([lit, cond]);
|
|
259
|
+
else this.addClause([...conds.map((cond) => cond ^ 1), lit]);
|
|
260
|
+
this.manager.endTemporaries(outer);
|
|
275
261
|
}
|
|
276
262
|
|
|
277
263
|
private getWrappedNode(expr: number) {
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
264
|
+
const outer = this.manager.beginTemporaries();
|
|
265
|
+
const wrapped = this.expr2enode(this.converter.wrap(expr));
|
|
266
|
+
this.manager.endTemporaries(outer);
|
|
267
|
+
return wrapped;
|
|
282
268
|
}
|
|
283
269
|
|
|
284
270
|
override addValue(node: Enode, _model: ProtoModel, values: (number | undefined)[]) {
|
|
@@ -55,8 +55,6 @@ export type OnBinding = (
|
|
|
55
55
|
pattern: number,
|
|
56
56
|
bindings: readonly Enode[],
|
|
57
57
|
maxGeneration: number,
|
|
58
|
-
minTopGeneration: number,
|
|
59
|
-
maxTopGeneration: number,
|
|
60
58
|
) => void;
|
|
61
59
|
|
|
62
60
|
const isAcDecl = (manager: AstManager, decl: number) => {
|
|
@@ -85,9 +83,6 @@ class Interpreter {
|
|
|
85
83
|
private top = 0;
|
|
86
84
|
private maxGeneration = 0;
|
|
87
85
|
private currMaxGeneration = 0;
|
|
88
|
-
private patternInstances: Enode[] = [];
|
|
89
|
-
private minTopGeneration: number[] = [];
|
|
90
|
-
private maxTopGeneration: number[] = [];
|
|
91
86
|
private acArgs: Enode[] = [];
|
|
92
87
|
private acBitset: boolean[] = [];
|
|
93
88
|
private acPatArg: number[] = [];
|
|
@@ -97,25 +92,6 @@ class Interpreter {
|
|
|
97
92
|
private onBinding: OnBinding,
|
|
98
93
|
) {}
|
|
99
94
|
|
|
100
|
-
private getMinMaxTopGeneration() {
|
|
101
|
-
const minTop = this.minTopGeneration;
|
|
102
|
-
const maxTop = this.maxTopGeneration;
|
|
103
|
-
const instances = this.patternInstances;
|
|
104
|
-
if (minTop.length === 0) {
|
|
105
|
-
minTop.push(instances[0].generation);
|
|
106
|
-
maxTop.push(instances[0].generation);
|
|
107
|
-
}
|
|
108
|
-
let min = minTop[minTop.length - 1];
|
|
109
|
-
let max = maxTop[maxTop.length - 1];
|
|
110
|
-
for (let index = minTop.length; index < instances.length; index++) {
|
|
111
|
-
min = Math.min(min, instances[index].generation);
|
|
112
|
-
minTop.push(min);
|
|
113
|
-
max = Math.max(max, instances[index].generation);
|
|
114
|
-
maxTop.push(max);
|
|
115
|
-
}
|
|
116
|
-
return [min, max];
|
|
117
|
-
}
|
|
118
|
-
|
|
119
95
|
private pushPoint(instr: Instruction<Enode>, oldMaxGeneration: number) {
|
|
120
96
|
let point = this.backtrackStack[this.top];
|
|
121
97
|
if (point === undefined) {
|
|
@@ -353,12 +329,6 @@ class Interpreter {
|
|
|
353
329
|
for (point.index++; point.index < point.candidates.length; point.index++) {
|
|
354
330
|
const node = point.candidates[point.index];
|
|
355
331
|
if (node.numArgs === instr.numArgs && node.isRelevant) {
|
|
356
|
-
const instances = this.patternInstances;
|
|
357
|
-
if (instances.length === this.maxTopGeneration.length) {
|
|
358
|
-
this.maxTopGeneration.pop();
|
|
359
|
-
this.minTopGeneration.pop();
|
|
360
|
-
}
|
|
361
|
-
instances[instances.length - 1] = node;
|
|
362
332
|
this.updateMaxGeneration(node);
|
|
363
333
|
this.setArgs(instr.oreg, node, instr.numArgs);
|
|
364
334
|
return instr.next;
|
|
@@ -374,9 +344,6 @@ class Interpreter {
|
|
|
374
344
|
const egraph = this.ctx.egraph;
|
|
375
345
|
const registers = this.registers;
|
|
376
346
|
if (!node.isRelevant) return false;
|
|
377
|
-
this.patternInstances = [node];
|
|
378
|
-
this.minTopGeneration = [];
|
|
379
|
-
this.maxTopGeneration = [];
|
|
380
347
|
this.maxGeneration = node.generation;
|
|
381
348
|
registers[0] = node;
|
|
382
349
|
this.top = 0;
|
|
@@ -445,15 +412,7 @@ class Interpreter {
|
|
|
445
412
|
for (const binding of bindings)
|
|
446
413
|
this.maxGeneration = Math.max(this.maxGeneration, binding.generation);
|
|
447
414
|
if (!manager.limit.inc()) return false;
|
|
448
|
-
|
|
449
|
-
this.onBinding(
|
|
450
|
-
instr.quantifier,
|
|
451
|
-
instr.pattern,
|
|
452
|
-
bindings,
|
|
453
|
-
this.maxGeneration,
|
|
454
|
-
topGenerations[0],
|
|
455
|
-
topGenerations[1],
|
|
456
|
-
);
|
|
415
|
+
this.onBinding(instr.quantifier, instr.pattern, bindings, this.maxGeneration);
|
|
457
416
|
break;
|
|
458
417
|
}
|
|
459
418
|
case OP_GET_ENODE:
|
|
@@ -470,7 +429,7 @@ class Interpreter {
|
|
|
470
429
|
)
|
|
471
430
|
)
|
|
472
431
|
break;
|
|
473
|
-
const found = egraph.findCongruent(instr.label, args
|
|
432
|
+
const found = egraph.findCongruent(instr.label, args);
|
|
474
433
|
if (found === undefined || !found.isRelevant) break;
|
|
475
434
|
this.updateMaxGeneration(found);
|
|
476
435
|
registers[instr.oreg] = found;
|
|
@@ -483,7 +442,6 @@ class Interpreter {
|
|
|
483
442
|
case OP_CONTINUE: {
|
|
484
443
|
const found = this.initContinue(instr);
|
|
485
444
|
if (found === null) break;
|
|
486
|
-
this.patternInstances.push(found);
|
|
487
445
|
this.setArgs(instr.oreg, found, instr.numArgs);
|
|
488
446
|
pc = instr.next;
|
|
489
447
|
break;
|
|
@@ -828,7 +786,7 @@ export class Mam implements LabelHasher<Enode> {
|
|
|
828
786
|
let groundArgIndex = 0;
|
|
829
787
|
let groundArg: Enode | null = null;
|
|
830
788
|
for (let index = 0; index < numArgs; index++)
|
|
831
|
-
if (manager.
|
|
789
|
+
if (manager.isGroundApp(manager.getArg(pattern, index))) {
|
|
832
790
|
groundArgIndex = index;
|
|
833
791
|
groundArg = this.getGroundEnode(manager.getArg(pattern, index));
|
|
834
792
|
break;
|
|
@@ -864,7 +822,7 @@ export class Mam implements LabelHasher<Enode> {
|
|
|
864
822
|
if (!isFound) paths.push(path);
|
|
865
823
|
continue;
|
|
866
824
|
}
|
|
867
|
-
if (manager.
|
|
825
|
+
if (manager.isGroundApp(child)) {
|
|
868
826
|
const node = this.getGroundEnode(child);
|
|
869
827
|
if (node === null) continue;
|
|
870
828
|
this.updatePlbls(label);
|
|
@@ -882,7 +840,7 @@ export class Mam implements LabelHasher<Enode> {
|
|
|
882
840
|
addPattern(quantifier: number, pattern: number) {
|
|
883
841
|
const manager = this.manager;
|
|
884
842
|
const patterns = manager.getArgs(pattern);
|
|
885
|
-
if (patterns.every((arg) => manager.
|
|
843
|
+
if (patterns.every((arg) => manager.isGroundApp(arg))) return;
|
|
886
844
|
if (patterns.some((arg) => manager.hasQuantifierFlags[arg])) return;
|
|
887
845
|
const mp: MultiPattern = { quantifier, pattern, patterns };
|
|
888
846
|
const numDecls = manager.getQuantifier(quantifier).sorts.length;
|
|
@@ -891,7 +849,7 @@ export class Mam implements LabelHasher<Enode> {
|
|
|
891
849
|
this.newPatterns.push(mp);
|
|
892
850
|
this.pushTrail(() => this.newPatterns.pop());
|
|
893
851
|
patterns.forEach((arg, firstIndex) => {
|
|
894
|
-
if (manager.
|
|
852
|
+
if (manager.isGroundApp(arg)) return;
|
|
895
853
|
const label = manager.decls[arg];
|
|
896
854
|
const tree = this.trees.get(label);
|
|
897
855
|
if (tree !== undefined) {
|