tla-ts 0.0.10-dev.37a75eb5b → 0.0.10-dev.45c0eaef5
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 +33 -33
- package/dist/deciders.js +53 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +17 -3
- package/dist/index.d.ts +17 -3
- 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 +55 -55
- package/dist/prove.js +78 -78
- package/dist/run.cjs +40 -42
- package/dist/run.js +42 -44
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +96 -91
- package/dist/transfer.js +95 -90
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +31 -3
- package/src/bags.ts +12 -10
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +13 -11
- package/src/check-trace.ts +146 -93
- package/src/check.ts +418 -246
- package/src/cli/tlc-output.ts +17 -2
- package/src/cli/tlc.ts +5 -4
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +23 -10
- package/src/coverage.ts +255 -18
- package/src/dependencies.ts +68 -15
- package/src/dfid.ts +93 -35
- package/src/environment.ts +106 -39
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +415 -132
- package/src/exit-codes.ts +28 -15
- package/src/instances.ts +135 -11
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +674 -236
- package/src/lexer.ts +12 -2
- package/src/liveness-checker.ts +161 -60
- package/src/liveness.ts +55 -10
- package/src/obligations/index.ts +1 -1
- package/src/obligations/normalize.ts +1 -4
- package/src/obligations/printer.ts +5 -5
- package/src/obligations/source.ts +2 -0
- package/src/parser.ts +110 -111
- 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 +164 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +65 -13
- package/src/prover/smt/solver/auf-solver.ts +23 -12
- package/src/prover/smt/solver/bit-blast-tactic.ts +27 -1
- 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 +35 -18
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
- package/src/prover/smt/solver/context.ts +65 -14
- 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 +28 -16
- package/src/prover/smt/solver/diff-neq.ts +1 -2
- package/src/prover/smt/solver/dt2bv-tactic.ts +57 -21
- 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 +3 -9
- 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/fd-solver.ts +608 -141
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
- package/src/prover/smt/solver/goal.ts +4 -3
- 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 +15 -5
- package/src/prover/smt/solver/lp/core-solver.ts +12 -8
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -2
- package/src/prover/smt/solver/lp/nla-grobner.ts +2 -2
- 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/maxcore.ts +2 -1
- package/src/prover/smt/solver/maxsmt-base.ts +1 -0
- package/src/prover/smt/solver/model-based-opt.ts +1 -1
- package/src/prover/smt/solver/model-checker.ts +1 -1
- package/src/prover/smt/solver/model-evaluator.ts +2 -0
- package/src/prover/smt/solver/model-generator.ts +85 -43
- package/src/prover/smt/solver/mpf.ts +2 -4
- package/src/prover/smt/solver/mus.ts +2 -3
- package/src/prover/smt/solver/muz/dl-context.ts +14 -42
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
- package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
- package/src/prover/smt/solver/muz/hnf.ts +2 -2
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -2
- package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -1
- package/src/prover/smt/solver/nlqsat.ts +1 -1
- package/src/prover/smt/solver/nlsat/algebraic.ts +4 -5
- package/src/prover/smt/solver/nlsat/levelwise.ts +0 -4
- package/src/prover/smt/solver/nlsat/polynomial.ts +1 -36
- package/src/prover/smt/solver/nlsat/upolynomial.ts +1 -1
- 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 +16 -7
- 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 +4 -3
- package/src/prover/smt/solver/optsmt.ts +1 -1
- package/src/prover/smt/solver/parallel-tactic.ts +1 -1
- package/src/prover/smt/solver/pb-rewriter.ts +1 -4
- package/src/prover/smt/solver/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 +23 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
- package/src/prover/smt/solver/rewriter.ts +31 -25
- package/src/prover/smt/solver/rlimit.ts +7 -3
- package/src/prover/smt/solver/sat/config.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +65 -12
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +129 -43
- package/src/prover/smt/solver/sat/model-converter.ts +1 -1
- package/src/prover/smt/solver/sat/pb-constraint.ts +7 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +26 -7
- package/src/prover/smt/solver/sat/sat-tactic.ts +15 -6
- package/src/prover/smt/solver/sat/sat2goal.ts +72 -48
- package/src/prover/smt/solver/sat/simplifier.ts +1 -1
- package/src/prover/smt/solver/sat/solver.ts +27 -47
- package/src/prover/smt/solver/seq-axioms.ts +20 -35
- package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
- package/src/prover/smt/solver/seq-derive.ts +1 -1
- package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
- package/src/prover/smt/solver/seq-monadic.ts +7 -5
- package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
- package/src/prover/smt/solver/seq-re-util.ts +1 -1
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
- package/src/prover/smt/solver/seq-regex-live.ts +2 -2
- package/src/prover/smt/solver/seq-rewriter.ts +31 -29
- package/src/prover/smt/solver/seq-skolem.ts +0 -23
- package/src/prover/smt/solver/seq-view-witness.ts +4 -4
- package/src/prover/smt/solver/smt-consequences.ts +1 -1
- package/src/prover/smt/solver/smt-kernel.ts +40 -6
- package/src/prover/smt/solver/smt-setup.ts +106 -13
- package/src/prover/smt/solver/smtlib-parser.ts +579 -214
- package/src/prover/smt/solver/smtlib-script.ts +600 -170
- 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 +342 -196
- 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-state.ts +1 -1
- package/src/prover/smt/solver/theory-lra.ts +1 -1
- package/src/prover/smt/solver/theory-pb.ts +24 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
- package/src/prover/smt/solver/theory-seq-state.ts +2 -21
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +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 +1226 -246
- package/src/runtime.ts +19 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +4 -2
- package/src/sany/generator-def-entries.ts +123 -36
- package/src/sany/generator-definitions.ts +4 -2
- package/src/sany/generator-expressions.ts +51 -20
- package/src/sany/generator-proofs.ts +17 -11
- package/src/sany/generator.ts +11 -5
- package/src/sany/lexer.ts +15 -7
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +283 -126
- package/src/simulate.ts +247 -185
- package/src/spec-description.ts +15 -7
- package/src/standard-definitions.ts +1 -0
- package/src/standard-modules.ts +56 -22
- package/src/subexpressions.ts +563 -139
- package/src/successors.ts +50 -20
- package/src/symmetry.ts +2 -1
- package/src/tlc/jar-data.ts +1 -3
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/random.ts +2 -1
- package/src/tlc/replay.ts +147 -46
- package/src/tlc/tlc-operators.ts +10 -8
- package/src/tlc/tlcext-operators.ts +26 -10
- package/src/tlc/trace-spec.ts +9 -22
- package/src/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +52 -31
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +150 -79
|
@@ -213,7 +213,7 @@ export class MkSlice implements RuleTransformerPlugin {
|
|
|
213
213
|
const manager = this.context.manager;
|
|
214
214
|
let hasOutput = false;
|
|
215
215
|
for (const [predicate, slice] of this.sliceable) {
|
|
216
|
-
const domain = manager.funcDecls[predicate].domain.filter((
|
|
216
|
+
const domain = manager.funcDecls[predicate].domain.filter((_value, index) => !slice[index]);
|
|
217
217
|
if (domain.length < slice.length) {
|
|
218
218
|
const sliced = this.context.mkFreshHeadPredicate(
|
|
219
219
|
getSymbolName(manager.funcDecls[predicate].name),
|
|
@@ -238,7 +238,7 @@ export class MkSlice implements RuleTransformerPlugin {
|
|
|
238
238
|
const slice = this.getPredicateSlice(manager.decls[atom]);
|
|
239
239
|
return manager.mkApp(
|
|
240
240
|
sliced,
|
|
241
|
-
manager.getArgs(atom).filter((
|
|
241
|
+
manager.getArgs(atom).filter((_value, index) => !slice[index]),
|
|
242
242
|
SORT_BOOL,
|
|
243
243
|
);
|
|
244
244
|
}
|
|
@@ -303,7 +303,7 @@ export class MkSlice implements RuleTransformerPlugin {
|
|
|
303
303
|
const domain = manager.funcDecls[predicate].domain;
|
|
304
304
|
const subst = domain
|
|
305
305
|
.map((sort, index) => manager.mkVar(index, sort))
|
|
306
|
-
.filter((
|
|
306
|
+
.filter((_value, index) => !slice[index]);
|
|
307
307
|
const interp = model.funcInterps.get(sliced);
|
|
308
308
|
if (interp === undefined) continue;
|
|
309
309
|
const oldInterp = new FuncInterp(manager, slice.length);
|
|
@@ -47,7 +47,7 @@ export class Rule {
|
|
|
47
47
|
readonly isNegated: boolean[],
|
|
48
48
|
readonly uninterpretedSize: number,
|
|
49
49
|
readonly positiveSize: number,
|
|
50
|
-
readonly name: string,
|
|
50
|
+
readonly name: string | undefined,
|
|
51
51
|
) {}
|
|
52
52
|
|
|
53
53
|
getDecl(manager: AstManager) {
|
|
@@ -64,9 +64,8 @@ export class Rule {
|
|
|
64
64
|
return false;
|
|
65
65
|
}
|
|
66
66
|
|
|
67
|
-
// symbol::str of the name, where the empty name is the null symbol.
|
|
68
67
|
getNameText() {
|
|
69
|
-
return this.name
|
|
68
|
+
return this.name ?? "<null>";
|
|
70
69
|
}
|
|
71
70
|
|
|
72
71
|
display(context: DatalogContext) {
|
|
@@ -225,20 +224,20 @@ export class RuleManager {
|
|
|
225
224
|
return expr;
|
|
226
225
|
}
|
|
227
226
|
|
|
228
|
-
mkRule(fml: number, rules: RuleSet, name
|
|
227
|
+
mkRule(fml: number, rules: RuleSet, name?: string) {
|
|
229
228
|
const bound = this.context.bindVars(fml, true);
|
|
230
229
|
if (this.manager.hasLabelFlags[bound]) throw new SmtUnsupportedError("labels in Horn rules");
|
|
231
230
|
this.mkRuleCore(bound, rules, name);
|
|
232
231
|
}
|
|
233
232
|
|
|
234
|
-
private mkRuleCore(fml: number, rules: RuleSet, name: string) {
|
|
233
|
+
private mkRuleCore(fml: number, rules: RuleSet, name: string | undefined) {
|
|
235
234
|
this.hnf.setName(name);
|
|
236
235
|
const fmls = this.hnf.apply(fml);
|
|
237
236
|
for (const predicate of this.hnf.freshPredicates) this.context.registerPredicate(predicate);
|
|
238
237
|
for (const horn of fmls) this.mkHornRule(horn, rules, name);
|
|
239
238
|
}
|
|
240
239
|
|
|
241
|
-
private mkHornRule(fml: number, rules: RuleSet, name: string) {
|
|
240
|
+
private mkHornRule(fml: number, rules: RuleSet, name: string | undefined) {
|
|
242
241
|
const manager = this.manager;
|
|
243
242
|
const body: number[] = [];
|
|
244
243
|
const extracted = this.extractHorn(fml, body);
|
|
@@ -307,7 +306,7 @@ export class RuleManager {
|
|
|
307
306
|
head: number,
|
|
308
307
|
tail: readonly number[],
|
|
309
308
|
isNegated: readonly boolean[],
|
|
310
|
-
name
|
|
309
|
+
name?: string,
|
|
311
310
|
isNormalizing = true,
|
|
312
311
|
) {
|
|
313
312
|
const manager = this.manager;
|
|
@@ -382,7 +381,7 @@ export class RuleManager {
|
|
|
382
381
|
return mkForall(
|
|
383
382
|
manager,
|
|
384
383
|
sorts,
|
|
385
|
-
sorts.map((
|
|
384
|
+
sorts.map((_value, index) => getVarName(index)),
|
|
386
385
|
matrix,
|
|
387
386
|
);
|
|
388
387
|
}
|
|
@@ -479,7 +478,7 @@ export class RuleManager {
|
|
|
479
478
|
const preQuant = this.pin(varSubst.apply(unboundTail, subst));
|
|
480
479
|
varSubst.release();
|
|
481
480
|
sorts.reverse();
|
|
482
|
-
const names = sorts.map((
|
|
481
|
+
const names = sorts.map((_value, index) => String(sorts.length - 1 - index));
|
|
483
482
|
const quantified = this.pin(mkExists(manager, sorts, names, preQuant));
|
|
484
483
|
let fixed = isTryingQe ? this.pin(simplifyQuantifiers(manager, quantified)) : quantified;
|
|
485
484
|
if (manager.kinds[fixed] !== KIND_APP) fixed = this.pin(manager.mkEq(fixed, manager.trueExpr));
|
|
@@ -64,7 +64,7 @@ export class HornSubsumeModelConverter {
|
|
|
64
64
|
const quantified = manager.mkQuantifier({
|
|
65
65
|
kind: QUANTIFIER_EXISTS,
|
|
66
66
|
sorts: sorts.reverse(),
|
|
67
|
-
names: sorts.map((
|
|
67
|
+
names: sorts.map((_value, index) => sorts.length - index - 1),
|
|
68
68
|
body: substituted,
|
|
69
69
|
patterns: [],
|
|
70
70
|
noPatterns: [],
|
|
@@ -17,7 +17,7 @@ import { L_FALSE, L_TRUE } from "../lbool";
|
|
|
17
17
|
import { RefVector } from "../ref-vector";
|
|
18
18
|
import type { RewriterOptions } from "../rewriter";
|
|
19
19
|
import { getFreeVarSorts } from "../var-subst";
|
|
20
|
-
import { DatalogContext, ENGINE_SPACER, FpParams } from "./dl-context";
|
|
20
|
+
import { DatalogContext, ENGINE_DATALOG, ENGINE_SPACER, FpParams } from "./dl-context";
|
|
21
21
|
import { mkForall, mkPp } from "./dl-rule";
|
|
22
22
|
import { SpacerDlInterface } from "./spacer-dl-interface";
|
|
23
23
|
|
|
@@ -27,6 +27,19 @@ export const createDatalogContext = (
|
|
|
27
27
|
rewriterOptions: RewriterOptions,
|
|
28
28
|
) =>
|
|
29
29
|
new DatalogContext(manager, new FpParams(parameters), rewriterOptions, (context, engine) => {
|
|
30
|
+
if (engine === ENGINE_DATALOG)
|
|
31
|
+
return {
|
|
32
|
+
// rel_context::query checks the rules with the query's before the saturation the port lacks.
|
|
33
|
+
query: (query) => {
|
|
34
|
+
context.ruleManager.mkQuery(query, context.getRules());
|
|
35
|
+
context.ensureClosed();
|
|
36
|
+
context.getRules();
|
|
37
|
+
throw new SmtUnsupportedError("the datalog engine");
|
|
38
|
+
},
|
|
39
|
+
getModel: () => {
|
|
40
|
+
throw new SmtUnsupportedError("the datalog engine");
|
|
41
|
+
},
|
|
42
|
+
};
|
|
30
43
|
if (engine !== ENGINE_SPACER) throw new SmtUnsupportedError("the bmc engine");
|
|
31
44
|
return new SpacerDlInterface(context);
|
|
32
45
|
});
|
|
@@ -138,7 +151,7 @@ class HornTactic {
|
|
|
138
151
|
);
|
|
139
152
|
if (sorts.length === 0) return formula;
|
|
140
153
|
sorts.reverse();
|
|
141
|
-
const names = sorts.map((
|
|
154
|
+
const names = sorts.map((_value, index) => String(sorts.length - index - 1));
|
|
142
155
|
const result = mkForall(manager, sorts, names, formula);
|
|
143
156
|
manager.incRef(result);
|
|
144
157
|
return result;
|
|
@@ -277,6 +277,28 @@ export class RuleProperties {
|
|
|
277
277
|
);
|
|
278
278
|
}
|
|
279
279
|
|
|
280
|
+
checkQuantifierFree() {
|
|
281
|
+
const first = this.quantifiers.entries().next();
|
|
282
|
+
if (first.done !== true)
|
|
283
|
+
throw new SmtTacticError(
|
|
284
|
+
`cannot process quantifier in rule ${first.value[1].display(this.context)}`,
|
|
285
|
+
);
|
|
286
|
+
}
|
|
287
|
+
|
|
288
|
+
checkNestedFree() {
|
|
289
|
+
const rules = this.interpretedPredicateRules;
|
|
290
|
+
if (rules.length > 0)
|
|
291
|
+
throw new SmtTacticError(`Rule contains nested predicates ${rules[0].display(this.context)}`);
|
|
292
|
+
}
|
|
293
|
+
|
|
294
|
+
checkInfiniteSorts() {
|
|
295
|
+
const rules = this.infiniteSortRules;
|
|
296
|
+
if (rules.length > 0)
|
|
297
|
+
throw new SmtTacticError(
|
|
298
|
+
`Rule contains infinite sorts in rule ${rules[rules.length - 1].display(this.context)}`,
|
|
299
|
+
);
|
|
300
|
+
}
|
|
301
|
+
|
|
280
302
|
checkExistsFree() {
|
|
281
303
|
for (const entry of this.quantifiers)
|
|
282
304
|
if (this.manager.getQuantifier(entry[0]).kind === QUANTIFIER_EXISTS)
|
|
@@ -53,7 +53,6 @@ export class Lemma {
|
|
|
53
53
|
ctp: ProtoModel | undefined;
|
|
54
54
|
level: number;
|
|
55
55
|
bumped = 0;
|
|
56
|
-
weakness: number;
|
|
57
56
|
isBlocked = false;
|
|
58
57
|
|
|
59
58
|
constructor(
|
|
@@ -63,7 +62,6 @@ export class Lemma {
|
|
|
63
62
|
pob?: Pob,
|
|
64
63
|
) {
|
|
65
64
|
this.level = level;
|
|
66
|
-
this.weakness = pob === undefined ? 65535 : pob.weakness;
|
|
67
65
|
this.pob = pob;
|
|
68
66
|
if (body !== -1) this.body = context.normalizer.normalize(body);
|
|
69
67
|
}
|
|
@@ -298,7 +296,6 @@ class Derivation {
|
|
|
298
296
|
|
|
299
297
|
constructor(
|
|
300
298
|
readonly parent: Pob,
|
|
301
|
-
readonly rule: Rule,
|
|
302
299
|
private trans: number,
|
|
303
300
|
private evars: number[],
|
|
304
301
|
) {}
|
|
@@ -1373,7 +1370,7 @@ export class SpacerContext {
|
|
|
1373
1370
|
];
|
|
1374
1371
|
phi = pt.mbp(vars, phi, model, this.isUsingGroundPob);
|
|
1375
1372
|
if (this.isUsingGpdr && predicates.length > 1) return gpdrCreateSplitChildren();
|
|
1376
|
-
const derivation = new Derivation(pob,
|
|
1373
|
+
const derivation = new Derivation(pob, phi, vars);
|
|
1377
1374
|
for (let index = 0; index < predicates.length; index++) {
|
|
1378
1375
|
const premisePt = this.getPredTransformer(predicates[index]);
|
|
1379
1376
|
const summary = premisePt.getOriginSummary(
|
|
@@ -128,7 +128,7 @@ export class IucSolver {
|
|
|
128
128
|
const result = kernel.check(this.assumptions);
|
|
129
129
|
this.lastModel = undefined;
|
|
130
130
|
if (result === L_TRUE) {
|
|
131
|
-
this.lastModel = kernel.context.
|
|
131
|
+
this.lastModel = kernel.context.getSatModel();
|
|
132
132
|
this.lastModel.incRef();
|
|
133
133
|
}
|
|
134
134
|
this.lastCore = result === L_FALSE ? [...kernel.context.unsatCore] : [];
|
|
@@ -429,7 +429,7 @@ class Nlqsat {
|
|
|
429
429
|
|
|
430
430
|
private mkModel() {
|
|
431
431
|
const manager = this.manager;
|
|
432
|
-
const model = new ProtoModel(manager);
|
|
432
|
+
const model = new ProtoModel(manager).mkModel();
|
|
433
433
|
for (const [term, variable] of this.t2x) {
|
|
434
434
|
if (!manager.isUninterpretedConst(term) || !this.freeVars.has(term)) continue;
|
|
435
435
|
const value = this.rmodel0[variable] ?? new Anum(Rational.zero);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { SmtCanceledError, SmtInvariantError } from "../../../../errors";
|
|
1
|
+
import { SmtCanceledError, SmtDefaultError, SmtInvariantError } from "../../../../errors";
|
|
2
2
|
import { Rational } from "../rational";
|
|
3
3
|
import type { ResourceLimit } from "../rlimit";
|
|
4
4
|
import { getLog2, Mpbq } from "./mpbq";
|
|
@@ -930,7 +930,7 @@ export class AlgebraicManager {
|
|
|
930
930
|
|
|
931
931
|
power(anum: Anum, exponent: number): Anum {
|
|
932
932
|
if (exponent === 0) {
|
|
933
|
-
if (this.isZero(anum)) throw new
|
|
933
|
+
if (this.isZero(anum)) throw new SmtDefaultError("0^0 is indeterminate");
|
|
934
934
|
return new Anum(Rational.one);
|
|
935
935
|
}
|
|
936
936
|
if (exponent === 1) return this.copy(anum);
|
|
@@ -939,10 +939,10 @@ export class AlgebraicManager {
|
|
|
939
939
|
}
|
|
940
940
|
|
|
941
941
|
root(anum: Anum, k: number): Anum {
|
|
942
|
-
if (k === 0) throw new
|
|
942
|
+
if (k === 0) throw new SmtDefaultError("0-th root is indeterminate");
|
|
943
943
|
if (k === 1 || this.isZero(anum)) return this.copy(anum);
|
|
944
944
|
if (this.isNeg(anum) && k % 2 === 0)
|
|
945
|
-
throw new
|
|
945
|
+
throw new SmtDefaultError("even root of negative number is not real");
|
|
946
946
|
if (anum.value instanceof Rational) return this.rootRational(anum.value, k);
|
|
947
947
|
return this.mkRoot(anum, k);
|
|
948
948
|
}
|
|
@@ -1010,7 +1010,6 @@ export class AlgebraicManager {
|
|
|
1010
1010
|
return (refined.isInterval ? refined.upper : refined.lower).toDecimal(precision);
|
|
1011
1011
|
}
|
|
1012
1012
|
|
|
1013
|
-
// Releases first.
|
|
1014
1013
|
private getResultantCoeffs(first: PolynomialRef, p: Upolynomial) {
|
|
1015
1014
|
const q = new PolynomialRef(this.pm);
|
|
1016
1015
|
const r = new PolynomialRef(this.pm);
|
|
@@ -902,10 +902,6 @@ export class PolynomialManager {
|
|
|
902
902
|
this.modulus = prime;
|
|
903
903
|
}
|
|
904
904
|
|
|
905
|
-
setZ() {
|
|
906
|
-
this.modulus = null;
|
|
907
|
-
}
|
|
908
|
-
|
|
909
905
|
mkPolynomialCore(as: bigint[], ms: Monomial[]) {
|
|
910
906
|
const id = this.freePolynomialIds.pop() ?? this.nextPolynomialId++;
|
|
911
907
|
const polynomial = new Polynomial(id, as, ms);
|
|
@@ -1096,12 +1092,6 @@ export class PolynomialManager {
|
|
|
1096
1092
|
return this.som.mk();
|
|
1097
1093
|
}
|
|
1098
1094
|
|
|
1099
|
-
private divConst(polynomial: Polynomial, divisor: bigint) {
|
|
1100
|
-
for (let index = 0; index < polynomial.size; index++)
|
|
1101
|
-
this.cheap.add(this.divNumeral(polynomial.as[index], divisor), polynomial.ms[index]);
|
|
1102
|
-
return this.cheap.mk();
|
|
1103
|
-
}
|
|
1104
|
-
|
|
1105
1095
|
neg(polynomial: Polynomial) {
|
|
1106
1096
|
for (let index = 0; index < polynomial.size; index++)
|
|
1107
1097
|
this.cheap.add(this.negNumeral(polynomial.as[index]), polynomial.ms[index]);
|
|
@@ -1456,8 +1446,7 @@ export class PolynomialManager {
|
|
|
1456
1446
|
this.modulus = savedModulus;
|
|
1457
1447
|
if (isBadPrime) continue;
|
|
1458
1448
|
if (this.isConst(q.get())) {
|
|
1459
|
-
// Deviation from Z3: when d_a is 1
|
|
1460
|
-
// (polynomial.cpp:4170), so gcd(2x - 3, 2x - 1) is 2 there. This returns 1 and frees q.
|
|
1449
|
+
// Deviation from Z3: when d_a is 1, uni_mod_gcd returns a constant q other than 1, so gcd(2x - 3, 2x - 1) is 2 there.
|
|
1461
1450
|
r.set(dA === 1n && q.get().as[0] === 1n ? q.get() : this.mkConst(dA));
|
|
1462
1451
|
release();
|
|
1463
1452
|
return;
|
|
@@ -2270,29 +2259,6 @@ export class PolynomialManager {
|
|
|
2270
2259
|
}
|
|
2271
2260
|
}
|
|
2272
2261
|
|
|
2273
|
-
discriminant(polynomial: Polynomial, x: number, r: PolynomialRef) {
|
|
2274
|
-
const pPrime = new PolynomialRef(this);
|
|
2275
|
-
const m = this.degree(polynomial, x);
|
|
2276
|
-
if (m === 0) {
|
|
2277
|
-
r.set(this.zero);
|
|
2278
|
-
pPrime.reset();
|
|
2279
|
-
return;
|
|
2280
|
-
}
|
|
2281
|
-
pPrime.set(this.derivative(polynomial, x));
|
|
2282
|
-
this.resultant(polynomial, pPrime.get(), x, r);
|
|
2283
|
-
const isNegated = (m * (m - 1)) % 4 !== 0;
|
|
2284
|
-
const lc = this.getConstCoeff(polynomial, x, m);
|
|
2285
|
-
if (lc !== null) r.set(this.divConst(r.get(), isNegated ? this.negNumeral(lc) : lc));
|
|
2286
|
-
else {
|
|
2287
|
-
if (isNegated) r.set(this.neg(r.get()));
|
|
2288
|
-
const c = new PolynomialRef(this);
|
|
2289
|
-
c.set(this.coeff(polynomial, x, m));
|
|
2290
|
-
r.set(this.exactDiv(r.get(), c.get()));
|
|
2291
|
-
c.reset();
|
|
2292
|
-
}
|
|
2293
|
-
pPrime.reset();
|
|
2294
|
-
}
|
|
2295
|
-
|
|
2296
2262
|
private seLazard(d: number, lcSd: Polynomial, sd1: Polynomial, x: number, se: PolynomialRef) {
|
|
2297
2263
|
let n = d - this.degree(sd1, x) - 1;
|
|
2298
2264
|
if (n === 0) {
|
|
@@ -3139,7 +3105,6 @@ export class PolynomialManager {
|
|
|
3139
3105
|
return result;
|
|
3140
3106
|
}
|
|
3141
3107
|
|
|
3142
|
-
// Like Z3's t_eval, this stops at the first variable that getValue has no value for.
|
|
3143
3108
|
private evaluatePartially<T>(
|
|
3144
3109
|
polynomial: Polynomial,
|
|
3145
3110
|
ops: ValueOps<T>,
|
|
@@ -27,7 +27,7 @@ export const BIG_PRIMES = [
|
|
|
27
27
|
|
|
28
28
|
const getSign = (value: bigint) => (value > 0n ? 1 : value < 0n ? -1 : 0);
|
|
29
29
|
|
|
30
|
-
|
|
30
|
+
const floorDiv = (dividend: bigint, divisor: bigint) => {
|
|
31
31
|
const quotient = dividend / divisor;
|
|
32
32
|
return dividend % divisor !== 0n && dividend < 0n !== divisor < 0n ? quotient - 1n : quotient;
|
|
33
33
|
};
|
|
@@ -30,7 +30,7 @@ const mkModel = (
|
|
|
30
30
|
t2x: ReadonlyMap<number, number>,
|
|
31
31
|
a2b: ReadonlyMap<number, number>,
|
|
32
32
|
) => {
|
|
33
|
-
const model = new ProtoModel(manager);
|
|
33
|
+
const model = new ProtoModel(manager).mkModel();
|
|
34
34
|
for (const [term, variable] of t2x) {
|
|
35
35
|
if (!manager.isUninterpretedConst(term)) continue;
|
|
36
36
|
const value = solver.getValue(variable);
|
|
@@ -14,6 +14,7 @@ import {
|
|
|
14
14
|
OP_OR,
|
|
15
15
|
OP_XOR,
|
|
16
16
|
SORT_BOOL,
|
|
17
|
+
type SmtSymbol,
|
|
17
18
|
QUANTIFIER_FORALL,
|
|
18
19
|
} from "./ast";
|
|
19
20
|
import { mkNot } from "./ast-util";
|
|
@@ -27,7 +28,10 @@ export class DefinedNames {
|
|
|
27
28
|
private nameRefs: RefVector;
|
|
28
29
|
private lims: number[] = [];
|
|
29
30
|
|
|
30
|
-
constructor(
|
|
31
|
+
constructor(
|
|
32
|
+
private manager: AstManager,
|
|
33
|
+
private prefix: SmtSymbol | null = "z3name",
|
|
34
|
+
) {
|
|
31
35
|
this.exprs = new RefVector(manager);
|
|
32
36
|
this.nameRefs = new RefVector(manager);
|
|
33
37
|
}
|
|
@@ -68,7 +72,7 @@ export class DefinedNames {
|
|
|
68
72
|
const varSorts = freeVarSorts.map((sort) => sort ?? SORT_BOOL);
|
|
69
73
|
const sort = manager.sorts[expr];
|
|
70
74
|
const name = manager.mkApp(
|
|
71
|
-
manager.mkFreshFuncDecl(
|
|
75
|
+
manager.mkFreshFuncDecl(this.prefix, varSorts, sort),
|
|
72
76
|
freeVarSorts.map((varSort, index) =>
|
|
73
77
|
varSort === undefined ? manager.trueExpr : manager.mkVar(index, varSort),
|
|
74
78
|
),
|
|
@@ -25,7 +25,13 @@ import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
|
25
25
|
import type { MaxsatContext, MaxsatParams, MaxsatSolver } from "./maxsmt-base";
|
|
26
26
|
import { Maxsmt } from "./maxsmt";
|
|
27
27
|
import { isInNraFragment } from "./opt-nlsat";
|
|
28
|
-
import {
|
|
28
|
+
import {
|
|
29
|
+
canReuseNlsatSolver,
|
|
30
|
+
giaPareto,
|
|
31
|
+
ParetoNlsatSolver,
|
|
32
|
+
type ParetoObjective,
|
|
33
|
+
type ParetoSolver,
|
|
34
|
+
} from "./opt-pareto";
|
|
29
35
|
import type { ProtoModel } from "./proto-model";
|
|
30
36
|
import { Rational } from "./rational";
|
|
31
37
|
import { RefVector } from "./ref-vector";
|
|
@@ -131,7 +137,7 @@ export class OptContext {
|
|
|
131
137
|
private boxIndex = -1;
|
|
132
138
|
private pareto: ParetoSolver | null = null;
|
|
133
139
|
private internal: Objective[] = [];
|
|
134
|
-
private normalized:
|
|
140
|
+
private normalized: ParetoObjective[] = [];
|
|
135
141
|
private normalizedGoal: Goal | null = null;
|
|
136
142
|
private normalizedTerms: RefVector;
|
|
137
143
|
private hiddenDecls: number[] = [];
|
|
@@ -254,6 +260,7 @@ export class OptContext {
|
|
|
254
260
|
checkSat: (assumptions) => getSolver().check(assumptions),
|
|
255
261
|
getModel: () => getSolver().getModel(),
|
|
256
262
|
getUnsatCore: () => getSolver().getUnsatCore(),
|
|
263
|
+
getNumAssertions: () => getSolver().getAssertions().length,
|
|
257
264
|
findMutexes: (vars) => ({ status: L_TRUE, mutexes: getSolver().findMutexes(vars) }),
|
|
258
265
|
};
|
|
259
266
|
return {
|
|
@@ -358,8 +365,6 @@ export class OptContext {
|
|
|
358
365
|
this.updateBound(optsmt, true);
|
|
359
366
|
const count = this.internal.length;
|
|
360
367
|
if (count > 1 && options.priority === "pareto") {
|
|
361
|
-
if (this.internal.some((objective) => objective.type === O_MAXSMT))
|
|
362
|
-
throw new SmtUnsupportedError("pareto optimization of soft constraints");
|
|
363
368
|
this.pareto = this.mkParetoSolver(solver, hard, options);
|
|
364
369
|
return this.executePareto();
|
|
365
370
|
}
|
|
@@ -699,6 +704,9 @@ export class OptContext {
|
|
|
699
704
|
this.normalized = this.internal.map((objective) => ({
|
|
700
705
|
term: objective.term,
|
|
701
706
|
isMax: objective.type === O_MAXIMIZE,
|
|
707
|
+
isMaxsmt: objective.type === O_MAXSMT,
|
|
708
|
+
terms: objective.terms,
|
|
709
|
+
weights: objective.weights,
|
|
702
710
|
}));
|
|
703
711
|
result.forms.reset();
|
|
704
712
|
return normalizedHard;
|
|
@@ -709,13 +717,14 @@ export class OptContext {
|
|
|
709
717
|
const maxsmt = objective?.maxsmt;
|
|
710
718
|
if (maxsmt !== null && maxsmt !== undefined)
|
|
711
719
|
return new ObjectiveValue(InfEps.of(isLower ? maxsmt.getLower() : maxsmt.getUpper()));
|
|
720
|
+
// Z3 reads the bounds of a solver it never set up, as when the hard constraints are false, as 0.
|
|
721
|
+
if (objective?.type === O_MAXSMT)
|
|
722
|
+
return new ObjectiveValue(InfEps.of(this.adjust(index, Rational.zero)));
|
|
712
723
|
const isMax = this.objectives[index].type === O_MAXIMIZE;
|
|
713
724
|
const optsmt = this.optsmt;
|
|
714
725
|
const value =
|
|
715
726
|
optsmt === null || objective === undefined
|
|
716
|
-
?
|
|
717
|
-
? ObjectiveValue.minusInfinity
|
|
718
|
-
: ObjectiveValue.infinity
|
|
727
|
+
? new ObjectiveValue(InfEps.of(Rational.zero))
|
|
719
728
|
: (isLower === isMax ? optsmt.lower : optsmt.upper)[objective.index];
|
|
720
729
|
return isMax ? value : value.negated(this.manager.am);
|
|
721
730
|
}
|
|
@@ -27,7 +27,9 @@ import { goal2nlsat } from "./goal2nlsat";
|
|
|
27
27
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
28
28
|
import { NlsatSolver } from "./nlsat/solver";
|
|
29
29
|
import { getModelValueBound } from "./opt-solver";
|
|
30
|
+
import { mkPbGe, mkPbLe } from "./pb-rewriter";
|
|
30
31
|
import { ProtoModel } from "./proto-model";
|
|
32
|
+
import { Rational } from "./rational";
|
|
31
33
|
import { RefVector } from "./ref-vector";
|
|
32
34
|
import { compileInternalTactic, type TacticEnvironment } from "./tactic";
|
|
33
35
|
|
|
@@ -53,6 +55,9 @@ const REUSABLE_OPS = new Set([
|
|
|
53
55
|
export interface ParetoObjective {
|
|
54
56
|
term: number;
|
|
55
57
|
isMax: boolean;
|
|
58
|
+
isMaxsmt: boolean;
|
|
59
|
+
terms: readonly number[];
|
|
60
|
+
weights: readonly Rational[];
|
|
56
61
|
}
|
|
57
62
|
|
|
58
63
|
export const canReuseNlsatSolver = (manager: AstManager, terms: readonly number[]) => {
|
|
@@ -238,6 +243,20 @@ export const giaPareto = (
|
|
|
238
243
|
return bound === undefined ? -1 : pin(manager.mkRealNumeral(bound));
|
|
239
244
|
};
|
|
240
245
|
const mkCmp = (isGe: boolean, model: ProtoModel, objective: ParetoObjective) => {
|
|
246
|
+
if (objective.isMaxsmt) {
|
|
247
|
+
let bound = Rational.zero;
|
|
248
|
+
for (const [index, term] of objective.terms.entries()) {
|
|
249
|
+
const value = model.eval(term, true);
|
|
250
|
+
if (value === manager.trueExpr) bound = bound.add(objective.weights[index]);
|
|
251
|
+
manager.decRef(value);
|
|
252
|
+
}
|
|
253
|
+
const terms = [...objective.terms];
|
|
254
|
+
return pin(
|
|
255
|
+
isGe
|
|
256
|
+
? mkPbGe(manager, objective.weights, terms, bound)
|
|
257
|
+
: mkPbLe(manager, objective.weights, terms, bound),
|
|
258
|
+
);
|
|
259
|
+
}
|
|
241
260
|
const isGreater = objective.isMax ? isGe : !isGe;
|
|
242
261
|
const evaluated = model.eval(objective.term, true);
|
|
243
262
|
pin(evaluated);
|
|
@@ -90,7 +90,7 @@ export class Preprocess {
|
|
|
90
90
|
if (dual.size !== soft.size) soft = this.dualize(dual, fmls);
|
|
91
91
|
}
|
|
92
92
|
return {
|
|
93
|
-
soft: [...soft].map((
|
|
93
|
+
soft: [...soft].map((entry) => ({ expr: entry[0], weight: entry[1], value: L_UNDEF })),
|
|
94
94
|
lower: lower.value,
|
|
95
95
|
};
|
|
96
96
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { SmtCanceledError, SmtInvariantError } from "../../../errors";
|
|
1
|
+
import { SmtCanceledError, SmtDefaultError, SmtInvariantError } from "../../../errors";
|
|
2
2
|
import { type AstManager, FAMILY_ARITH, FAMILY_PB } from "./ast";
|
|
3
3
|
import { InfEps } from "./inf-eps";
|
|
4
4
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
@@ -76,7 +76,7 @@ export class OptSolver {
|
|
|
76
76
|
}
|
|
77
77
|
|
|
78
78
|
private getContextModel() {
|
|
79
|
-
return this.hold(this.kernel.context.
|
|
79
|
+
return this.hold(this.kernel.context.getSatModel());
|
|
80
80
|
}
|
|
81
81
|
|
|
82
82
|
// get_optimizer makes an arithmetic theory when the setup made none.
|
|
@@ -232,7 +232,8 @@ export class OptSolver {
|
|
|
232
232
|
try {
|
|
233
233
|
this.kernel.push();
|
|
234
234
|
} catch (error) {
|
|
235
|
-
|
|
235
|
+
const isPushCanceled = error instanceof SmtDefaultError && error.message === "push canceled";
|
|
236
|
+
if (!(error instanceof SmtCanceledError || isPushCanceled)) throw error;
|
|
236
237
|
return L_UNDEF;
|
|
237
238
|
}
|
|
238
239
|
limit.push(this.dualBoundRlimit);
|
|
@@ -17,7 +17,7 @@ const UNBOUNDED_CHECK_RLIMIT = 100000;
|
|
|
17
17
|
const UNBOUNDED_CHECK_ROUNDS = 8;
|
|
18
18
|
const MAX_ONE_SIDED_ROUNDS = 16;
|
|
19
19
|
|
|
20
|
-
|
|
20
|
+
interface OptsmtHost {
|
|
21
21
|
getBaseModel(): ProtoModel | null;
|
|
22
22
|
setModel(model: ProtoModel | null): void;
|
|
23
23
|
}
|
|
@@ -113,7 +113,7 @@ class ParallelSolver {
|
|
|
113
113
|
this.context.maxConflicts = this.threadsMaxConflicts;
|
|
114
114
|
const result = this.kernel.check([...this.assumptions, ...cube]);
|
|
115
115
|
if (result === L_TRUE) {
|
|
116
|
-
this.setSat(this.context.
|
|
116
|
+
this.setSat(this.context.getSatModel());
|
|
117
117
|
return false;
|
|
118
118
|
}
|
|
119
119
|
if (result === L_FALSE) {
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
2
|
type AstManager,
|
|
3
|
-
FAMILY_PB,
|
|
4
3
|
OP_AT_LEAST_K,
|
|
5
4
|
OP_AT_MOST_K,
|
|
6
5
|
OP_PB_EQ,
|
|
@@ -19,8 +18,6 @@ interface PbArg {
|
|
|
19
18
|
coeff: Rational;
|
|
20
19
|
}
|
|
21
20
|
|
|
22
|
-
export const isPb = (manager: AstManager, expr: number) => manager.getFamily(expr) === FAMILY_PB;
|
|
23
|
-
|
|
24
21
|
export const getPbK = (manager: AstManager, decl: number) => manager.getPbParameters(decl)[0];
|
|
25
22
|
|
|
26
23
|
export const getPbCoeff = (manager: AstManager, decl: number, index: number) => {
|
|
@@ -31,7 +28,7 @@ export const getPbCoeff = (manager: AstManager, decl: number, index: number) =>
|
|
|
31
28
|
};
|
|
32
29
|
|
|
33
30
|
export const hasUnitCoefficients = (manager: AstManager, decl: number) =>
|
|
34
|
-
manager.funcDecls[decl].domain.every((
|
|
31
|
+
manager.funcDecls[decl].domain.every((_value, index) =>
|
|
35
32
|
getPbCoeff(manager, decl, index).equals(Rational.one),
|
|
36
33
|
);
|
|
37
34
|
|