tla-ts 0.0.10-dev.99796fe03 → 0.0.10-dev.a17d6d9fa
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 +54 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -2
- package/dist/index.d.ts +3 -2
- 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 +60 -60
- package/dist/prove.js +78 -78
- package/dist/run.cjs +42 -44
- package/dist/run.js +44 -46
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +43 -43
- package/dist/transfer.js +39 -39
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +1 -0
- package/src/bags.ts +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +1 -1
- package/src/check-trace.ts +90 -51
- package/src/check.ts +367 -178
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +1 -2
- package/src/cli/tlc.ts +16 -10
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +26 -9
- package/src/dependencies.ts +49 -9
- package/src/dfid.ts +22 -10
- package/src/environment.ts +58 -33
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +117 -41
- package/src/exit-codes.ts +4 -2
- package/src/instances.ts +5 -5
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/liveness-checker.ts +81 -33
- package/src/liveness.ts +49 -11
- package/src/obligations/index.ts +1 -1
- package/src/obligations/normalize.ts +1 -4
- package/src/obligations/printer.ts +5 -5
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +5 -0
- package/src/parser.ts +112 -145
- package/src/prover/isabelle/isar/attrib.ts +4 -4
- package/src/prover/isabelle/isar/rule-cases.ts +8 -6
- package/src/prover/isabelle/provers/clasimp.ts +1 -1
- package/src/prover/isabelle/provers/hypsubst.ts +2 -2
- package/src/prover/isabelle/pure/rewriter.ts +3 -3
- package/src/prover/isabelle/pure/term.ts +3 -3
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/smt/rewrite.ts +2 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/arith-rewriter.ts +11 -3
- package/src/prover/smt/solver/array-rewriter.ts +12 -2
- package/src/prover/smt/solver/asserted-formulas.ts +169 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +63 -14
- package/src/prover/smt/solver/auf-solver.ts +23 -12
- package/src/prover/smt/solver/bit-blast-tactic.ts +26 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-simplifier.ts +11 -13
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
- package/src/prover/smt/solver/bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/card2bv.ts +32 -18
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
- package/src/prover/smt/solver/context.ts +47 -9
- package/src/prover/smt/solver/ctx-simplify.ts +1 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
- package/src/prover/smt/solver/dependent-expr-state.ts +9 -4
- package/src/prover/smt/solver/diff-neq.ts +1 -2
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +5 -8
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/egraph.ts +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 +2 -0
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- 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/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/logic-tactics.ts +9 -2
- package/src/prover/smt/solver/lp/lp-settings.ts +5 -1
- package/src/prover/smt/solver/lp/nla-core.ts +1 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +2 -2
- package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
- package/src/prover/smt/solver/lp/pdd.ts +2 -3
- package/src/prover/smt/solver/lp/union-find.ts +1 -1
- package/src/prover/smt/solver/mam-compiler.ts +1 -1
- package/src/prover/smt/solver/model-based-opt.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 +10 -4
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
- package/src/prover/smt/solver/muz/dl-rule.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 +1 -1
- 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/nlqsat.ts +1 -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/opt-context.ts +20 -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 +9 -5
- package/src/prover/smt/solver/optsmt.ts +1 -1
- package/src/prover/smt/solver/pb-rewriter.ts +1 -4
- package/src/prover/smt/solver/poly-rewriter.ts +75 -18
- package/src/prover/smt/solver/probes.ts +88 -23
- package/src/prover/smt/solver/proto-model.ts +8 -8
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
- package/src/prover/smt/solver/qe-lite.ts +2 -2
- package/src/prover/smt/solver/qe.ts +3 -2
- package/src/prover/smt/solver/qsat.ts +16 -6
- 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/rewriter.ts +31 -25
- package/src/prover/smt/solver/rlimit.ts +4 -0
- package/src/prover/smt/solver/sat/config.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +0 -1
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +39 -5
- package/src/prover/smt/solver/sat/model-converter.ts +1 -1
- package/src/prover/smt/solver/sat/pb-solver.ts +1 -1
- package/src/prover/smt/solver/sat/sat-tactic.ts +13 -5
- package/src/prover/smt/solver/sat/simplifier.ts +1 -1
- package/src/prover/smt/solver/sat/solver.ts +25 -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-kernel.ts +39 -5
- package/src/prover/smt/solver/smt-setup.ts +96 -10
- package/src/prover/smt/solver/smtlib-parser.ts +584 -223
- package/src/prover/smt/solver/smtlib-script.ts +509 -154
- package/src/prover/smt/solver/solve-eqs.ts +36 -37
- package/src/prover/smt/solver/solver.ts +18 -3
- package/src/prover/smt/solver/tactic.ts +284 -168
- package/src/prover/smt/solver/theory-bv.ts +13 -3
- package/src/prover/smt/solver/theory-fpa.ts +1 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
- package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
- package/src/prover/smt/solver/theory-lra.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/tseitin-cnf.ts +1 -0
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/index-table.ts +5 -2
- package/src/prover/zenon/isar-case.ts +1 -1
- package/src/prover/zenon/isar.ts +2 -2
- package/src/prover/zenon/phrase.ts +1 -1
- package/src/resolve.ts +959 -243
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/lexer.ts +3 -3
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +166 -101
- package/src/simulate.ts +110 -50
- package/src/spec-description.ts +5 -6
- package/src/standard-modules.ts +15 -6
- package/src/subexpressions.ts +398 -108
- package/src/successors.ts +4 -2
- package/src/symmetry.ts +1 -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 +3 -2
- 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/typed-tier.ts +32 -25
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +135 -78
|
@@ -75,7 +75,7 @@ export const getCases = (rule: CasesRule): [CaseInfo, number] => {
|
|
|
75
75
|
const names = lookupTag(rule.tags, "case_names");
|
|
76
76
|
const cases =
|
|
77
77
|
names === undefined
|
|
78
|
-
? Array.from({ length: Math.max(nprems(rule.rule) - consumes, 0) }, (
|
|
78
|
+
? Array.from({ length: Math.max(nprems(rule.rule) - consumes, 0) }, (_value, index) => ({
|
|
79
79
|
name: String(index + 1),
|
|
80
80
|
concls: [] as string[],
|
|
81
81
|
}))
|
|
@@ -138,11 +138,13 @@ const extractCase = (
|
|
|
138
138
|
return {
|
|
139
139
|
fixes,
|
|
140
140
|
assumes: [{ name: "", props: stripAssumsHyp(prop).flatMap(destConjunctions).map(absFixes) }],
|
|
141
|
-
binds: [[CASE_CONCL, concl]
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
141
|
+
binds: [[CASE_CONCL, concl] satisfies [string, Term], ...destBinops(concls, concl)].map(
|
|
142
|
+
(bind) => ({
|
|
143
|
+
name: bind[0],
|
|
144
|
+
index: 0,
|
|
145
|
+
term: absFixes(bind[1]),
|
|
146
|
+
}),
|
|
147
|
+
),
|
|
146
148
|
cases: [],
|
|
147
149
|
};
|
|
148
150
|
};
|
|
@@ -91,7 +91,7 @@ const pruneParamsTac = (simp: SimpContext): Tactic => {
|
|
|
91
91
|
const empty = { ...simp, simpset: emptySimpset };
|
|
92
92
|
const context = { ...empty, simpset: addSimps(empty, [trivForallEquality]) };
|
|
93
93
|
return primitive((state) =>
|
|
94
|
-
Array.from({ length: nprems(state) }, (
|
|
94
|
+
Array.from({ length: nprems(state) }, (_value, offset) => offset + 1).reduce(
|
|
95
95
|
(current, index) =>
|
|
96
96
|
gconvRule(
|
|
97
97
|
(term) =>
|
|
@@ -245,9 +245,9 @@ const instSubstTac = (context: HypsubstContext, isLeft: boolean, rule: Thm): Goa
|
|
|
245
245
|
chosen.kind === "Bound"
|
|
246
246
|
? substBounds(
|
|
247
247
|
[
|
|
248
|
-
...Array.from({ length: chosen.index }, (
|
|
248
|
+
...Array.from({ length: chosen.index }, (_value, position) => mkBound(position + 1)),
|
|
249
249
|
mkBound(0),
|
|
250
|
-
...Array.from({ length: params.length - chosen.index - 1 }, (
|
|
250
|
+
...Array.from({ length: params.length - chosen.index - 1 }, (_value, position) =>
|
|
251
251
|
mkBound(chosen.index + 2 + position),
|
|
252
252
|
),
|
|
253
253
|
],
|
|
@@ -83,9 +83,9 @@ const rhsOf = (thm: Thm) => destEquals(thm.prop)[1];
|
|
|
83
83
|
|
|
84
84
|
const instantiateMatch = (env: MatchEnv, rule: Thm): Thm => {
|
|
85
85
|
const typed = instantiateTypes(env.tyenv, rule);
|
|
86
|
-
const insts: Instantiation[] = tableEntries(env.tenv).map((
|
|
87
|
-
variable: mkVar(
|
|
88
|
-
term:
|
|
86
|
+
const insts: Instantiation[] = tableEntries(env.tenv).map((entry) => ({
|
|
87
|
+
variable: mkVar(entry[0].name, entry[0].index, substType(env.tyenv, entry[1].type)),
|
|
88
|
+
term: entry[1].term,
|
|
89
89
|
}));
|
|
90
90
|
return instantiate(insts, typed);
|
|
91
91
|
};
|
|
@@ -636,10 +636,10 @@ const mapAbsVars = (rename: (name: string) => string, term: Term): Term => {
|
|
|
636
636
|
|
|
637
637
|
export const renameAbs = (pattern: Term, object: Term, term: Term): Term | undefined => {
|
|
638
638
|
const renaming = new Map<string, string>();
|
|
639
|
-
matchBvs(pattern, object, []).forEach((
|
|
640
|
-
if (!renaming.has(
|
|
639
|
+
matchBvs(pattern, object, []).forEach((pair) => {
|
|
640
|
+
if (!renaming.has(pair[0])) renaming.set(pair[0], pair[1]);
|
|
641
641
|
});
|
|
642
|
-
if ([...renaming].every((
|
|
642
|
+
if ([...renaming].every((pair) => pair[0] === pair[1])) return undefined;
|
|
643
643
|
const renamed = mapAbsVars((name) => renaming.get(name) ?? name, term);
|
|
644
644
|
return renamed === term ? undefined : renamed;
|
|
645
645
|
};
|
package/src/prover/prep/md5.ts
CHANGED
|
@@ -20,35 +20,32 @@ export const getMd5 = (text: string): string => {
|
|
|
20
20
|
const words = Array.from({ length: 16 }, (_value, index) =>
|
|
21
21
|
view.getUint32(offset + index * 4, true),
|
|
22
22
|
);
|
|
23
|
-
const mixedState = Array.from({ length: 64 }).reduce<number[]>(
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
},
|
|
50
|
-
state,
|
|
51
|
-
);
|
|
23
|
+
const mixedState = Array.from({ length: 64 }).reduce<number[]>((state, _value, index) => {
|
|
24
|
+
const round = Math.floor(index / 16);
|
|
25
|
+
const mixed =
|
|
26
|
+
round === 0
|
|
27
|
+
? (state[1] & state[2]) | (~state[1] & state[3])
|
|
28
|
+
: round === 1
|
|
29
|
+
? (state[3] & state[1]) | (~state[3] & state[2])
|
|
30
|
+
: round === 2
|
|
31
|
+
? state[1] ^ state[2] ^ state[3]
|
|
32
|
+
: state[2] ^ (state[1] | ~state[3]);
|
|
33
|
+
const word =
|
|
34
|
+
round === 0
|
|
35
|
+
? index
|
|
36
|
+
: round === 1
|
|
37
|
+
? (5 * index + 1) % 16
|
|
38
|
+
: round === 2
|
|
39
|
+
? (3 * index + 5) % 16
|
|
40
|
+
: (7 * index) % 16;
|
|
41
|
+
const sum = (state[0] + mixed + CONSTANTS[index] + words[word]) | 0;
|
|
42
|
+
return [
|
|
43
|
+
state[3],
|
|
44
|
+
(state[1] + rotate(sum, SHIFTS[round * 4 + (index % 4)])) | 0,
|
|
45
|
+
state[1],
|
|
46
|
+
state[2],
|
|
47
|
+
];
|
|
48
|
+
}, state);
|
|
52
49
|
state.splice(0, 4, ...state.map((word, index) => (word + mixedState[index]) | 0));
|
|
53
50
|
}
|
|
54
51
|
return state
|
|
@@ -296,7 +296,7 @@ const invert = (mode: Mode): Mode => ({
|
|
|
296
296
|
: "Neither",
|
|
297
297
|
});
|
|
298
298
|
|
|
299
|
-
|
|
299
|
+
const encodeIdv = (encoder: Encoder, expression: Expr, env: Env | undefined, mode: Mode) =>
|
|
300
300
|
toIdv(encode(encoder, expression, env, clearPolarity(mode)));
|
|
301
301
|
|
|
302
302
|
export const encodeBool = (encoder: Encoder, expression: Expr, env: Env | undefined, mode: Mode) =>
|
|
@@ -917,12 +917,7 @@ const encodeSequent = (
|
|
|
917
917
|
);
|
|
918
918
|
};
|
|
919
919
|
|
|
920
|
-
|
|
921
|
-
encoder: Encoder,
|
|
922
|
-
expression: Expr,
|
|
923
|
-
env: Env | undefined,
|
|
924
|
-
mode: Mode,
|
|
925
|
-
): Term => {
|
|
920
|
+
const encode = (encoder: Encoder, expression: Expr, env: Env | undefined, mode: Mode): Term => {
|
|
926
921
|
switch (expression.kind) {
|
|
927
922
|
case "Ix":
|
|
928
923
|
return encodeReference(encoder, getBinding(env, expression.index), [], env, mode);
|
|
@@ -307,7 +307,7 @@ const getMembership = (polarity: Polarity, element: Expr, set: Expr): Expr | und
|
|
|
307
307
|
items: [
|
|
308
308
|
builtin("Eq", [
|
|
309
309
|
left,
|
|
310
|
-
{ kind: "Tuple", elements: factors.map((
|
|
310
|
+
{ kind: "Tuple", elements: factors.map((_value, index) => component(index)) },
|
|
311
311
|
]),
|
|
312
312
|
...factors.map((factor, index) => mem(component(index), factor)),
|
|
313
313
|
],
|
|
@@ -41,6 +41,7 @@ import { Anum } from "./nlsat/algebraic";
|
|
|
41
41
|
export const KERNEL_ARITH_OPTIONS: ArithRewriterOptions = {
|
|
42
42
|
isSom: true,
|
|
43
43
|
isSortSums: true,
|
|
44
|
+
isArithLhs: false,
|
|
44
45
|
isArithIneqLhs: true,
|
|
45
46
|
isGcdRounding: true,
|
|
46
47
|
isAnumSimp: true,
|
|
@@ -52,6 +53,7 @@ export const KERNEL_ARITH_OPTIONS: ArithRewriterOptions = {
|
|
|
52
53
|
export const TACTIC_ARITH_OPTIONS: ArithRewriterOptions = {
|
|
53
54
|
isSom: false,
|
|
54
55
|
isSortSums: false,
|
|
56
|
+
isArithLhs: false,
|
|
55
57
|
isArithIneqLhs: false,
|
|
56
58
|
isGcdRounding: false,
|
|
57
59
|
isAnumSimp: true,
|
|
@@ -118,7 +120,8 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
118
120
|
]),
|
|
119
121
|
2,
|
|
120
122
|
);
|
|
121
|
-
if (!this.isArithTerm(left) && !this.isArithTerm(right))
|
|
123
|
+
if (!this.options.isArithLhs && !this.isArithTerm(left) && !this.isArithTerm(right))
|
|
124
|
+
return undefined;
|
|
122
125
|
return this.mkLeGeEq(left, right, KIND_EQ);
|
|
123
126
|
}
|
|
124
127
|
|
|
@@ -1259,7 +1262,12 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
1259
1262
|
sides[index] = expr;
|
|
1260
1263
|
};
|
|
1261
1264
|
const cancelled = manager.withTemporaries(
|
|
1262
|
-
() =>
|
|
1265
|
+
() =>
|
|
1266
|
+
this.cancelMonomials(
|
|
1267
|
+
originalLeft,
|
|
1268
|
+
originalRight,
|
|
1269
|
+
this.options.isArithIneqLhs || this.options.isArithLhs,
|
|
1270
|
+
),
|
|
1263
1271
|
(result) => (result === undefined ? [] : [result.lhs, result.rhs]),
|
|
1264
1272
|
);
|
|
1265
1273
|
if (cancelled !== undefined) sides.push(cancelled.lhs, cancelled.rhs);
|
|
@@ -1366,7 +1374,7 @@ export class ArithRewriter extends PolyRewriter {
|
|
|
1366
1374
|
return this.reduce(manager.mkAnd([mkUpper(), lower]), 3);
|
|
1367
1375
|
}
|
|
1368
1376
|
const negated =
|
|
1369
|
-
this.options.isArithIneqLhs && this.manager.isNumeral(right)
|
|
1377
|
+
(this.options.isArithLhs || this.options.isArithIneqLhs) && this.manager.isNumeral(right)
|
|
1370
1378
|
? this.getNegatedPolynomial(left)
|
|
1371
1379
|
: undefined;
|
|
1372
1380
|
if (negated !== undefined) {
|
|
@@ -24,6 +24,7 @@ export class ArrayRewriter {
|
|
|
24
24
|
constructor(
|
|
25
25
|
private manager: AstManager,
|
|
26
26
|
private isSortingStore = false,
|
|
27
|
+
private isExpandingSelects = false,
|
|
27
28
|
) {}
|
|
28
29
|
|
|
29
30
|
private isOp(expr: number, op: number) {
|
|
@@ -193,7 +194,12 @@ export class ArrayRewriter {
|
|
|
193
194
|
(index, position) =>
|
|
194
195
|
manager.isValue(index) && manager.isValue(manager.getArg(array, position + 1)),
|
|
195
196
|
);
|
|
196
|
-
if (
|
|
197
|
+
if (
|
|
198
|
+
!this.isOp(base, OP_CONST_ARRAY) &&
|
|
199
|
+
!areValues &&
|
|
200
|
+
!(this.isExpandingSelects && manager.getRefCount(base) === 1)
|
|
201
|
+
)
|
|
202
|
+
return undefined;
|
|
197
203
|
const selectBase = this.mkApp(OP_SELECT, [base, ...indices]);
|
|
198
204
|
const value = manager.getArg(array, indices.length + 1);
|
|
199
205
|
const eqs = indices.map((index, position) =>
|
|
@@ -208,7 +214,11 @@ export class ArrayRewriter {
|
|
|
208
214
|
if (this.isOp(array, OP_ITE)) {
|
|
209
215
|
const thenArray = manager.getArg(array, 1);
|
|
210
216
|
const elseArray = manager.getArg(array, 2);
|
|
211
|
-
if (
|
|
217
|
+
if (
|
|
218
|
+
!this.isExpandingSelects &&
|
|
219
|
+
manager.getRefCount(thenArray) !== 1 &&
|
|
220
|
+
manager.getRefCount(elseArray) !== 1
|
|
221
|
+
)
|
|
212
222
|
return undefined;
|
|
213
223
|
const thenSelect = this.mkApp(OP_SELECT, [thenArray, ...indices]);
|
|
214
224
|
const elseSelect = this.mkApp(OP_SELECT, [elseArray, ...indices]);
|
|
@@ -14,10 +14,12 @@ import {
|
|
|
14
14
|
import { mkNot } from "./ast-util";
|
|
15
15
|
import { simplifyInjAxiom } from "./inj-axiom";
|
|
16
16
|
import { MacroManager } from "./macro-finder";
|
|
17
|
+
import { ElimBoundsRw } from "./elim-bounds";
|
|
17
18
|
import { DefinedNames, Nnf } from "./nnf";
|
|
18
19
|
import { PatternInference } from "./pattern-inference";
|
|
19
20
|
import { MaxBvSharing } from "./maximize-ac-sharing";
|
|
20
21
|
import { PullQuant } from "./pull-quant";
|
|
22
|
+
import { NgPushAppIteRw } from "./push-app-ite";
|
|
21
23
|
import { RefVector } from "./ref-vector";
|
|
22
24
|
import { KERNEL_REWRITER_OPTIONS, Rewriter } from "./rewriter";
|
|
23
25
|
import { RewriterTpl } from "./rewriter-tpl";
|
|
@@ -68,6 +70,43 @@ export class PatternInferenceRw extends RewriterTpl {
|
|
|
68
70
|
}
|
|
69
71
|
}
|
|
70
72
|
|
|
73
|
+
// Like Z3's, it keeps the definitions it made until a pop, and each reduce asserts them all again.
|
|
74
|
+
class ElimTermIteRw extends RewriterTpl {
|
|
75
|
+
readonly definitions: RefVector;
|
|
76
|
+
private lims: number[] = [];
|
|
77
|
+
|
|
78
|
+
constructor(
|
|
79
|
+
manager: AstManager,
|
|
80
|
+
private names: DefinedNames,
|
|
81
|
+
) {
|
|
82
|
+
super(manager);
|
|
83
|
+
this.definitions = new RefVector(manager);
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
reduceApp(decl: number, args: number[], sort: number) {
|
|
87
|
+
const manager = this.manager;
|
|
88
|
+
if (decl !== OP_ITE || sort === SORT_BOOL) return -1;
|
|
89
|
+
const ite = manager.mkApp(OP_ITE, args, sort);
|
|
90
|
+
manager.incRef(ite);
|
|
91
|
+
const named = this.names.mkName(ite);
|
|
92
|
+
manager.decRef(ite);
|
|
93
|
+
if (named.definition === -1) return -1;
|
|
94
|
+
this.definitions.push(named.definition);
|
|
95
|
+
manager.decRef(named.definition);
|
|
96
|
+
manager.incRef(named.name);
|
|
97
|
+
return named.name;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
push() {
|
|
101
|
+
this.lims.push(this.definitions.size);
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
pop() {
|
|
105
|
+
this.definitions.shrink(this.lims[this.lims.length - 1]);
|
|
106
|
+
this.lims.pop();
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
|
|
71
110
|
const isGreater = (manager: AstManager, left: number, right: number): boolean => {
|
|
72
111
|
if (left === right) return false;
|
|
73
112
|
const isLeftValue = manager.isValue(left);
|
|
@@ -156,9 +195,15 @@ export class AssertedFormulas {
|
|
|
156
195
|
private isReducePending = true;
|
|
157
196
|
private isNnfCnf = true;
|
|
158
197
|
private isEq2Ineq = false;
|
|
198
|
+
private isEliminatingTermIte = false;
|
|
199
|
+
private isLiftingNonGroundIte = false;
|
|
200
|
+
private isEliminatingBounds = false;
|
|
159
201
|
private names: DefinedNames;
|
|
202
|
+
private termIteElim: ElimTermIteRw;
|
|
160
203
|
private patternInference: PatternInferenceRw;
|
|
161
204
|
private bvSharing: MaxBvSharing;
|
|
205
|
+
private ngLiftIte: NgPushAppIteRw;
|
|
206
|
+
private boundsElim: ElimBoundsRw;
|
|
162
207
|
hasQuantifiers = false;
|
|
163
208
|
readonly macros: MacroManager;
|
|
164
209
|
isInconsistent = false;
|
|
@@ -177,8 +222,11 @@ export class AssertedFormulas {
|
|
|
177
222
|
// string literals reach the seq theory as concatenations of units.
|
|
178
223
|
this.rewriter = new Rewriter(manager, { ...KERNEL_REWRITER_OPTIONS, isCoalescingChars: false });
|
|
179
224
|
this.names = new DefinedNames(manager);
|
|
225
|
+
this.termIteElim = new ElimTermIteRw(manager, this.names);
|
|
180
226
|
this.patternInference = new PatternInferenceRw(manager, new PatternInference(manager));
|
|
181
227
|
this.bvSharing = new MaxBvSharing(manager);
|
|
228
|
+
this.ngLiftIte = new NgPushAppIteRw(manager);
|
|
229
|
+
this.boundsElim = new ElimBoundsRw(manager);
|
|
182
230
|
}
|
|
183
231
|
|
|
184
232
|
push() {
|
|
@@ -196,6 +244,7 @@ export class AssertedFormulas {
|
|
|
196
244
|
this.bvSharing.popScope();
|
|
197
245
|
this.macros.popScope();
|
|
198
246
|
this.names.pop();
|
|
247
|
+
this.termIteElim.pop();
|
|
199
248
|
this.substitution.pop();
|
|
200
249
|
this.formulas.shrink(scope.numFormulas);
|
|
201
250
|
this.qhead = scope.numFormulas;
|
|
@@ -207,6 +256,7 @@ export class AssertedFormulas {
|
|
|
207
256
|
this.substitution.push();
|
|
208
257
|
this.scopes.push({ numFormulas: this.formulas.size, isInconsistent: this.isInconsistent });
|
|
209
258
|
this.names.push();
|
|
259
|
+
this.termIteElim.push();
|
|
210
260
|
this.macros.pushScope();
|
|
211
261
|
this.bvSharing.pushScope();
|
|
212
262
|
}
|
|
@@ -232,9 +282,22 @@ export class AssertedFormulas {
|
|
|
232
282
|
setup(config: SmtConfig) {
|
|
233
283
|
this.isNnfCnf = config.isNnfCnf;
|
|
234
284
|
this.isEq2Ineq = config.isEq2Ineq;
|
|
285
|
+
this.isEliminatingTermIte = config.isEliminatingTermIte;
|
|
286
|
+
this.isLiftingNonGroundIte = config.isLiftingNonGroundIte;
|
|
287
|
+
this.isEliminatingBounds = config.isEliminatingBounds;
|
|
235
288
|
this.isFindingMacros ||= config.isFindingMacros;
|
|
236
289
|
}
|
|
237
290
|
|
|
291
|
+
updateParams(config: SmtConfig) {
|
|
292
|
+
this.isNnfCnf = config.isNnfCnf;
|
|
293
|
+
this.isEq2Ineq = config.isEq2Ineq;
|
|
294
|
+
this.isEliminatingTermIte = config.isEliminatingTermIte;
|
|
295
|
+
this.isLiftingNonGroundIte = config.isLiftingNonGroundIte;
|
|
296
|
+
this.isEliminatingBounds = config.isEliminatingBounds;
|
|
297
|
+
this.isFindingMacros = config.isFindingMacros;
|
|
298
|
+
this.isReducePending = true;
|
|
299
|
+
}
|
|
300
|
+
|
|
238
301
|
getNumFormulas() {
|
|
239
302
|
return this.formulas.size;
|
|
240
303
|
}
|
|
@@ -243,55 +306,51 @@ export class AssertedFormulas {
|
|
|
243
306
|
return this.formulas.items;
|
|
244
307
|
}
|
|
245
308
|
|
|
246
|
-
|
|
309
|
+
getQhead() {
|
|
310
|
+
return this.qhead;
|
|
311
|
+
}
|
|
312
|
+
|
|
313
|
+
commit(qhead = this.formulas.size) {
|
|
314
|
+
const committed = this.formulas.items.slice(this.qhead, qhead);
|
|
315
|
+
this.macros.markForbidden(committed);
|
|
316
|
+
for (const formula of committed) this.substitution.update(formula);
|
|
317
|
+
this.qhead = qhead;
|
|
318
|
+
}
|
|
319
|
+
|
|
247
320
|
reduce() {
|
|
248
|
-
if (this.qhead === this.formulas.size) return
|
|
249
|
-
if (!this.
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
if (this.isFindingMacros) this.macros.markForbidden(result);
|
|
253
|
-
for (const formula of result) this.substitution.update(formula);
|
|
254
|
-
this.qhead = this.formulas.size;
|
|
255
|
-
return result;
|
|
256
|
-
}
|
|
257
|
-
|
|
258
|
-
private reduceCore() {
|
|
259
|
-
if (this.macros.hasMacros()) this.findMacros();
|
|
321
|
+
if (this.isInconsistent || this.isCanceled() || this.qhead === this.formulas.size) return;
|
|
322
|
+
if (!this.hasQuantifiers && !this.isPreprocessing) return;
|
|
323
|
+
const isFindingMacros = this.isFindingMacros && this.hasQuantifiers;
|
|
324
|
+
if (this.macros.hasMacros()) this.invoke(isFindingMacros, () => this.findMacros());
|
|
260
325
|
this.setEliminateAnd(false);
|
|
261
|
-
this.propagateValues();
|
|
262
|
-
if (this.
|
|
263
|
-
this.
|
|
264
|
-
if (this.isInconsistent) return;
|
|
265
|
-
if (this.isNnfCnf || this.hasQuantifiers) {
|
|
266
|
-
this.isReducePending = true;
|
|
267
|
-
this.nnfCnf();
|
|
268
|
-
if (this.isInconsistent) return;
|
|
269
|
-
}
|
|
326
|
+
if (!this.invoke(true, () => this.propagateValues())) return;
|
|
327
|
+
if (!this.invoke(isFindingMacros, () => this.findMacros())) return;
|
|
328
|
+
if (!this.invoke(this.isNnfCnf || this.hasQuantifiers, () => this.nnfCnf())) return;
|
|
270
329
|
this.setEliminateAnd(true);
|
|
271
|
-
this.reduceAsserted();
|
|
272
|
-
if (this.
|
|
273
|
-
if (this.
|
|
274
|
-
|
|
275
|
-
if (this.
|
|
276
|
-
this.
|
|
277
|
-
|
|
278
|
-
if (
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
)
|
|
282
|
-
this.isReducePending = true;
|
|
283
|
-
if (this.isInconsistent) return;
|
|
284
|
-
if (this.simplifyFormulas((formula) => this.bvSharing.rewrite(formula)))
|
|
285
|
-
this.isReducePending = true;
|
|
286
|
-
if (this.isInconsistent) return;
|
|
287
|
-
this.reduceAsserted();
|
|
288
|
-
if (this.isInconsistent) return;
|
|
289
|
-
this.isReducePending = true;
|
|
290
|
-
this.flattenClauses();
|
|
291
|
-
if (this.isInconsistent) return;
|
|
330
|
+
if (!this.invoke(true, () => this.reduceAsserted())) return;
|
|
331
|
+
if (!this.invoke(this.isLiftingNonGroundIte, () => this.liftNonGroundIte())) return;
|
|
332
|
+
if (!this.invoke(this.isEliminatingTermIte, () => this.elimTermIte())) return;
|
|
333
|
+
if (!this.invoke(this.hasQuantifiers, () => this.refineInjAxioms())) return;
|
|
334
|
+
if (!this.invoke(isFindingMacros, () => this.findMacros())) return;
|
|
335
|
+
if (!this.invoke(this.isEliminatingBounds && this.hasQuantifiers, () => this.elimBounds()))
|
|
336
|
+
return;
|
|
337
|
+
if (!this.invoke(this.hasQuantifiers, () => this.inferPatterns())) return;
|
|
338
|
+
if (!this.invoke(true, () => this.maximizeBvSharing())) return;
|
|
339
|
+
if (!this.invoke(true, () => this.reduceAsserted())) return;
|
|
340
|
+
if (!this.invoke(true, () => this.flattenClauses())) return;
|
|
292
341
|
this.flushCache();
|
|
293
342
|
}
|
|
294
343
|
|
|
344
|
+
private isCanceled() {
|
|
345
|
+
return !this.manager.limit.inc();
|
|
346
|
+
}
|
|
347
|
+
|
|
348
|
+
private invoke(isApplying: boolean, step: () => void) {
|
|
349
|
+
if (!isApplying) return true;
|
|
350
|
+
step();
|
|
351
|
+
return !this.isInconsistent && !this.isCanceled();
|
|
352
|
+
}
|
|
353
|
+
|
|
295
354
|
private pushAssertion(expr: number, result: RefVector) {
|
|
296
355
|
const manager = this.manager;
|
|
297
356
|
if (this.isInconsistent || manager.isTrue(expr)) return;
|
|
@@ -330,8 +389,43 @@ export class AssertedFormulas {
|
|
|
330
389
|
return formula;
|
|
331
390
|
}
|
|
332
391
|
|
|
392
|
+
private elimTermIte() {
|
|
393
|
+
const elim = this.termIteElim;
|
|
394
|
+
if (!this.simplifyFormulas((formula) => elim.rewrite(formula))) return;
|
|
395
|
+
if (elim.definitions.size > 0) this.isReducePending = true;
|
|
396
|
+
for (const definition of elim.definitions.items) this.formulas.push(definition);
|
|
397
|
+
this.flushCache();
|
|
398
|
+
this.reduceAsserted();
|
|
399
|
+
elim.reset();
|
|
400
|
+
}
|
|
401
|
+
|
|
402
|
+
private simplifyAndReduce(simplify: (formula: number) => number) {
|
|
403
|
+
if (!this.simplifyFormulas(simplify)) return;
|
|
404
|
+
this.flushCache();
|
|
405
|
+
this.reduceAsserted();
|
|
406
|
+
}
|
|
407
|
+
|
|
408
|
+
private liftNonGroundIte() {
|
|
409
|
+
this.simplifyAndReduce((formula) => this.ngLiftIte.rewrite(formula));
|
|
410
|
+
}
|
|
411
|
+
|
|
412
|
+
private refineInjAxioms() {
|
|
413
|
+
this.simplifyFormulas((formula) => this.refineInjAxiom(formula));
|
|
414
|
+
}
|
|
415
|
+
|
|
416
|
+
private elimBounds() {
|
|
417
|
+
this.simplifyAndReduce((formula) => this.boundsElim.rewrite(formula));
|
|
418
|
+
}
|
|
419
|
+
|
|
420
|
+
private inferPatterns() {
|
|
421
|
+
this.simplifyFormulas((formula) => this.patternInference.rewrite(formula));
|
|
422
|
+
}
|
|
423
|
+
|
|
424
|
+
private maximizeBvSharing() {
|
|
425
|
+
if (this.simplifyFormulas((formula) => this.bvSharing.rewrite(formula))) this.reduceAsserted();
|
|
426
|
+
}
|
|
427
|
+
|
|
333
428
|
private findMacros() {
|
|
334
|
-
if (!this.isFindingMacros || !this.hasQuantifiers) return;
|
|
335
429
|
this.isReducePending = true;
|
|
336
430
|
this.swapFormulas(this.macros.find(this.formulas.items.slice(this.qhead)));
|
|
337
431
|
this.flushCache();
|
|
@@ -360,19 +454,22 @@ export class AssertedFormulas {
|
|
|
360
454
|
private simplifyFormulas(simplify: (formula: number) => number) {
|
|
361
455
|
const manager = this.manager;
|
|
362
456
|
const formulas = new RefVector(manager);
|
|
363
|
-
let isChanged = false;
|
|
364
457
|
for (let index = this.qhead; index < this.formulas.size; index++) {
|
|
365
458
|
const formula = this.formulas.items[index];
|
|
366
459
|
const result = simplify(formula);
|
|
367
460
|
if (result === formula) formulas.push(formula);
|
|
368
461
|
else {
|
|
369
462
|
this.pushAssertion(result, formulas);
|
|
370
|
-
|
|
463
|
+
this.isReducePending = true;
|
|
371
464
|
}
|
|
372
465
|
manager.decRef(result);
|
|
466
|
+
if (this.isCanceled()) {
|
|
467
|
+
formulas.reset();
|
|
468
|
+
return false;
|
|
469
|
+
}
|
|
373
470
|
}
|
|
374
471
|
this.swapFormulas(formulas);
|
|
375
|
-
return
|
|
472
|
+
return true;
|
|
376
473
|
}
|
|
377
474
|
|
|
378
475
|
private reduceAsserted() {
|
|
@@ -410,28 +507,42 @@ export class AssertedFormulas {
|
|
|
410
507
|
}
|
|
411
508
|
|
|
412
509
|
private nnfCnf() {
|
|
510
|
+
this.isReducePending = true;
|
|
413
511
|
const manager = this.manager;
|
|
414
512
|
const nnf = new Nnf(manager, this.names);
|
|
415
513
|
const formulas = new RefVector(manager);
|
|
416
514
|
const todo = new RefVector(manager);
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
515
|
+
const isFinished = (() => {
|
|
516
|
+
for (let index = this.qhead; index < this.formulas.size; index++) {
|
|
517
|
+
todo.reset();
|
|
518
|
+
let result = nnf.apply(this.formulas.items[index], todo);
|
|
519
|
+
todo.push(result);
|
|
520
|
+
if (this.isCanceled()) {
|
|
521
|
+
manager.decRef(result);
|
|
522
|
+
return false;
|
|
523
|
+
}
|
|
524
|
+
for (let position = 0; position < todo.size; position++) {
|
|
525
|
+
const rewritten = this.rewriter.rewrite(todo.items[position]);
|
|
526
|
+
manager.decRef(result);
|
|
527
|
+
result = rewritten;
|
|
528
|
+
if (this.isCanceled()) {
|
|
529
|
+
manager.decRef(result);
|
|
530
|
+
return false;
|
|
531
|
+
}
|
|
532
|
+
this.pushAssertion(result, formulas);
|
|
533
|
+
}
|
|
423
534
|
manager.decRef(result);
|
|
424
|
-
result = rewritten;
|
|
425
|
-
this.pushAssertion(result, formulas);
|
|
426
535
|
}
|
|
427
|
-
|
|
428
|
-
}
|
|
429
|
-
this.swapFormulas(formulas);
|
|
536
|
+
return true;
|
|
537
|
+
})();
|
|
538
|
+
if (isFinished) this.swapFormulas(formulas);
|
|
430
539
|
todo.reset();
|
|
540
|
+
formulas.reset();
|
|
431
541
|
nnf.release();
|
|
432
542
|
}
|
|
433
543
|
|
|
434
544
|
private flattenClauses() {
|
|
545
|
+
this.isReducePending = true;
|
|
435
546
|
const manager = this.manager;
|
|
436
547
|
const mkNegation = (expr: number) =>
|
|
437
548
|
manager.isNot(expr) ? manager.getArg(expr, 0) : manager.mkApp(OP_NOT, [expr], SORT_BOOL);
|
|
@@ -250,7 +250,7 @@ const compareDecls = (manager: AstManager, first: number, second: number) => {
|
|
|
250
250
|
return compareSorts(manager, firstKey.range, secondKey.range);
|
|
251
251
|
};
|
|
252
252
|
|
|
253
|
-
|
|
253
|
+
const compareAsts = (manager: AstManager, first: number, second: number): number => {
|
|
254
254
|
if (first === second) return 0;
|
|
255
255
|
const byKind = compareValues(manager.kinds[first], manager.kinds[second]);
|
|
256
256
|
if (byKind !== 0) return byKind;
|