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
package/src/dependencies.ts
CHANGED
|
@@ -29,6 +29,8 @@ const VARIABLE_LEVEL_FLAGS = 32;
|
|
|
29
29
|
const ACTION_LEVEL_FLAGS = VARIABLE_LEVEL_FLAGS | 64;
|
|
30
30
|
const TEMPORAL_LEVEL_FLAGS = ACTION_LEVEL_FLAGS | 128;
|
|
31
31
|
const RANDOM = 256;
|
|
32
|
+
const ABOVE_CONSTANT_BOUND = 512;
|
|
33
|
+
const TLC_EVAL = 1024;
|
|
32
34
|
|
|
33
35
|
const ACTION_KINDS = new Set<Expression["kind"]>([
|
|
34
36
|
"Prime",
|
|
@@ -80,6 +82,7 @@ interface Edge {
|
|
|
80
82
|
callee: Definition;
|
|
81
83
|
isOverridden: boolean;
|
|
82
84
|
isLevelCounted: boolean;
|
|
85
|
+
isOperatorArgument: boolean;
|
|
83
86
|
}
|
|
84
87
|
|
|
85
88
|
const collectLocalFacts = (
|
|
@@ -104,20 +107,34 @@ const collectLocalFacts = (
|
|
|
104
107
|
}
|
|
105
108
|
return undefined;
|
|
106
109
|
};
|
|
107
|
-
const
|
|
110
|
+
const contexts = new Map<Expression, number>();
|
|
111
|
+
const visit = (node: Expression, isLevelCounted: boolean, isOperatorArgument: boolean) => {
|
|
108
112
|
const kind = node.kind;
|
|
113
|
+
if (kind === "Selection") {
|
|
114
|
+
const seen = contexts.get(node.expression) ?? 0;
|
|
115
|
+
const context = isLevelCounted ? (isOperatorArgument ? 1 : 2) : isOperatorArgument ? 4 : 8;
|
|
116
|
+
if ((seen & context) !== 0) return;
|
|
117
|
+
contexts.set(node.expression, seen | context);
|
|
118
|
+
}
|
|
119
|
+
// TLC's getLevelBound takes an operator argument for a constant.
|
|
120
|
+
const nonconstantFlags = isOperatorArgument ? NONCONSTANT : NONCONSTANT | ABOVE_CONSTANT_BOUND;
|
|
109
121
|
if (
|
|
110
122
|
NONCONSTANT_KINDS.has(kind) ||
|
|
111
123
|
(kind === "UnboundedQuantifier" && node.isTemporal === true) ||
|
|
112
124
|
(kind === "Apply" && NONCONSTANT_OPERATORS.has(node.operator))
|
|
113
125
|
) {
|
|
114
|
-
row[0] |=
|
|
126
|
+
row[0] |= nonconstantFlags;
|
|
115
127
|
}
|
|
116
128
|
if (NONCONSTANT_KINDS.has(kind)) row[0] |= READS_IMPURE;
|
|
117
129
|
const ownLevelFlags = getOwnLevelFlags(node);
|
|
118
130
|
if (isLevelCounted && ownLevelFlags !== undefined) row[0] |= ownLevelFlags;
|
|
119
131
|
const isInnerLevelCounted = isLevelCounted && ownLevelFlags === undefined;
|
|
120
132
|
const name = getReferencedName(node);
|
|
133
|
+
// TLC's getLevelBound takes a parameter named like a variable for that variable.
|
|
134
|
+
if (name !== undefined && isLocallyResolved(node) && environment.variableIndex.has(name)) {
|
|
135
|
+
if (!isOperatorArgument) row[0] |= ABOVE_CONSTANT_BOUND;
|
|
136
|
+
if (isInnerLevelCounted) row[0] |= VARIABLE_LEVEL_FLAGS;
|
|
137
|
+
}
|
|
121
138
|
if (name !== undefined && !isLocallyResolved(node)) {
|
|
122
139
|
const target = environment.substitutions.get(name) ?? name;
|
|
123
140
|
const definition = environment.definitions.get(target);
|
|
@@ -125,23 +142,34 @@ const collectLocalFacts = (
|
|
|
125
142
|
const variableIndex = environment.variableIndex.get(name);
|
|
126
143
|
if (
|
|
127
144
|
variableIndex !== undefined ||
|
|
128
|
-
environment.builtins.get(
|
|
145
|
+
environment.builtins.get(target)?.isStateLevel ||
|
|
129
146
|
(definition && environment.variableIndex.has(definition.name))
|
|
130
147
|
) {
|
|
131
|
-
row[0] |=
|
|
148
|
+
row[0] |= nonconstantFlags;
|
|
132
149
|
}
|
|
133
150
|
if (variableIndex !== undefined) {
|
|
134
151
|
if (isInnerLevelCounted) row[0] |= VARIABLE_LEVEL_FLAGS;
|
|
135
152
|
if (!isOverridden) row[1 + (variableIndex >>> 5)] |= 1 << (variableIndex & 31);
|
|
136
153
|
}
|
|
137
154
|
if (definition) {
|
|
138
|
-
edges.push({
|
|
155
|
+
edges.push({
|
|
156
|
+
callee: definition,
|
|
157
|
+
isOverridden,
|
|
158
|
+
isLevelCounted: isInnerLevelCounted,
|
|
159
|
+
isOperatorArgument:
|
|
160
|
+
isOperatorArgument ||
|
|
161
|
+
kind === "OperatorReference" ||
|
|
162
|
+
(kind === "Identifier" &&
|
|
163
|
+
definition.kind === "Operator" &&
|
|
164
|
+
definition.params.length > 0),
|
|
165
|
+
});
|
|
139
166
|
} else {
|
|
140
|
-
if (isImpureBuiltin(
|
|
141
|
-
row[0] |= IMPURE | (
|
|
167
|
+
if (isImpureBuiltin(target, environment)) {
|
|
168
|
+
row[0] |= IMPURE | (target === "Assert" ? 0 : REPEATED_EFFECT);
|
|
142
169
|
}
|
|
143
|
-
if (STREAMED_BUILTINS.has(
|
|
144
|
-
if (RANDOM_BUILTINS.has(
|
|
170
|
+
if (STREAMED_BUILTINS.has(target)) row[0] |= STREAMED;
|
|
171
|
+
if (RANDOM_BUILTINS.has(target)) row[0] |= RANDOM;
|
|
172
|
+
if (target === "TLCEval") row[0] |= TLC_EVAL;
|
|
145
173
|
if (!isOverridden && isImpureBuiltin(target, environment)) row[0] |= READS_IMPURE;
|
|
146
174
|
const builtin = environment.builtins.get(target);
|
|
147
175
|
if (
|
|
@@ -155,9 +183,11 @@ const collectLocalFacts = (
|
|
|
155
183
|
}
|
|
156
184
|
}
|
|
157
185
|
}
|
|
158
|
-
getChildren(node).forEach((child) =>
|
|
186
|
+
getChildren(node).forEach((child) =>
|
|
187
|
+
visit(child, isInnerLevelCounted, isOperatorArgument || kind === "Lambda"),
|
|
188
|
+
);
|
|
159
189
|
};
|
|
160
|
-
expressions.forEach((expression) => visit(expression, true));
|
|
190
|
+
expressions.forEach((expression) => visit(expression, true, false));
|
|
161
191
|
return { row, edges };
|
|
162
192
|
};
|
|
163
193
|
|
|
@@ -228,11 +258,12 @@ const closeRows = (local: Uint32Array, words: number, edges: Int32Array[], mask:
|
|
|
228
258
|
return closed;
|
|
229
259
|
};
|
|
230
260
|
|
|
231
|
-
const PURITY_MASK = IMPURE | REPEATED_EFFECT | STREAMED | RANDOM;
|
|
261
|
+
const PURITY_MASK = IMPURE | REPEATED_EFFECT | STREAMED | RANDOM | TLC_EVAL;
|
|
232
262
|
const READ_MASK = NONCONSTANT | READS_IMPURE;
|
|
263
|
+
const STARTUP_MASK = NONCONSTANT | ABOVE_CONSTANT_BOUND;
|
|
233
264
|
|
|
234
265
|
const isEvaluatedOnce = (definition: Definition, flags: number) =>
|
|
235
|
-
definition.kind === "Operator" && definition.params.length === 0 && (flags &
|
|
266
|
+
definition.kind === "Operator" && definition.params.length === 0 && (flags & STARTUP_MASK) === 0;
|
|
236
267
|
|
|
237
268
|
export const createDefinitionFacts = (environment: DefinitionNames): DefinitionFacts => {
|
|
238
269
|
const definitions = [...new Set(environment.definitions.values())];
|
|
@@ -256,18 +287,32 @@ export const createDefinitionFacts = (environment: DefinitionNames): DefinitionF
|
|
|
256
287
|
new Int32Array(own.filter((edge) => !edge.isOverridden && edge.isLevelCounted).map(getId)),
|
|
257
288
|
);
|
|
258
289
|
const levels = closeRows(local, words, levelEdges, TEMPORAL_LEVEL_FLAGS);
|
|
290
|
+
const startupEdges = edges.map(
|
|
291
|
+
(own) =>
|
|
292
|
+
new Int32Array(
|
|
293
|
+
own.filter((edge) => !edge.isOverridden && !edge.isOperatorArgument).map(getId),
|
|
294
|
+
),
|
|
295
|
+
);
|
|
296
|
+
const startup = closeRows(local, words, startupEdges, ABOVE_CONSTANT_BOUND);
|
|
259
297
|
const purityEdges = edges.map(
|
|
260
298
|
(own) =>
|
|
261
299
|
new Int32Array(
|
|
262
300
|
own
|
|
263
301
|
.map(getId)
|
|
264
|
-
.filter(
|
|
302
|
+
.filter(
|
|
303
|
+
(callee) =>
|
|
304
|
+
!isEvaluatedOnce(
|
|
305
|
+
definitions[callee],
|
|
306
|
+
reads[callee * words] | startup[callee * words],
|
|
307
|
+
),
|
|
308
|
+
),
|
|
265
309
|
),
|
|
266
310
|
);
|
|
267
311
|
const purity = closeRows(localImpurity, words, purityEdges, PURITY_MASK);
|
|
268
312
|
const rows = reads.map((word, position) =>
|
|
269
313
|
position % words === 0
|
|
270
314
|
? (word & READ_MASK) |
|
|
315
|
+
(startup[position] & ABOVE_CONSTANT_BOUND) |
|
|
271
316
|
(levels[position] & TEMPORAL_LEVEL_FLAGS) |
|
|
272
317
|
(purity[position] & PURITY_MASK)
|
|
273
318
|
: word,
|
|
@@ -291,6 +336,7 @@ const getExpressionsRow = (expressions: Expression[], environment: Environment)
|
|
|
291
336
|
const callee = getRow(edge.callee, environment);
|
|
292
337
|
if (!edge.isOverridden) {
|
|
293
338
|
row[0] |= callee[0] & READ_MASK;
|
|
339
|
+
if (!edge.isOperatorArgument) row[0] |= callee[0] & ABOVE_CONSTANT_BOUND;
|
|
294
340
|
if (edge.isLevelCounted) row[0] |= callee[0] & TEMPORAL_LEVEL_FLAGS;
|
|
295
341
|
for (let word = 1; word < words; word++) row[word] |= callee[word];
|
|
296
342
|
}
|
|
@@ -300,7 +346,10 @@ const getExpressionsRow = (expressions: Expression[], environment: Environment)
|
|
|
300
346
|
};
|
|
301
347
|
|
|
302
348
|
export const isConstantLevel = (definition: Definition, environment: Environment) =>
|
|
303
|
-
(getRow(definition, environment)[0] &
|
|
349
|
+
(getRow(definition, environment)[0] & STARTUP_MASK) === 0;
|
|
350
|
+
|
|
351
|
+
export const isEvaluatedAtStartup = (definition: Definition, environment: Environment) =>
|
|
352
|
+
(getRow(definition, environment)[0] & ABOVE_CONSTANT_BOUND) === 0;
|
|
304
353
|
|
|
305
354
|
const EFFECT_FLAGS = {
|
|
306
355
|
any: IMPURE,
|
|
@@ -308,6 +357,7 @@ const EFFECT_FLAGS = {
|
|
|
308
357
|
streamed: STREAMED,
|
|
309
358
|
// What a second evaluation shows: output again, or other random draws.
|
|
310
359
|
replayed: REPEATED_EFFECT | RANDOM,
|
|
360
|
+
varying: IMPURE | RANDOM,
|
|
311
361
|
};
|
|
312
362
|
|
|
313
363
|
export const isExpressionImpure = (
|
|
@@ -322,6 +372,9 @@ export const isImpureDefinition = (
|
|
|
322
372
|
effect: keyof typeof EFFECT_FLAGS = "any",
|
|
323
373
|
) => (getRow(definition, environment)[0] & EFFECT_FLAGS[effect]) !== 0;
|
|
324
374
|
|
|
375
|
+
export const isTlcEvalReached = (expression: Expression, environment: Environment) =>
|
|
376
|
+
(getExpressionsRow([expression], environment)[0] & TLC_EVAL) !== 0;
|
|
377
|
+
|
|
325
378
|
export const getDefinitionLevel = (definition: Definition, environment: Environment) => {
|
|
326
379
|
const flags = getRow(definition, environment)[0] & TEMPORAL_LEVEL_FLAGS;
|
|
327
380
|
return flags === TEMPORAL_LEVEL_FLAGS
|
package/src/dfid.ts
CHANGED
|
@@ -1,21 +1,25 @@
|
|
|
1
1
|
import type { Expression } from "./ast";
|
|
2
2
|
import type { CheckOptions } from "./check";
|
|
3
|
+
import type { CoverageOutput } from "./coverage";
|
|
3
4
|
import {
|
|
4
5
|
getErrorExitCode,
|
|
5
6
|
getUnexpectedException,
|
|
6
7
|
isStackOverflow,
|
|
7
8
|
TlaEvaluationError,
|
|
8
|
-
TlaIncompleteSuccessorError,
|
|
9
9
|
TlaStackOverflowError,
|
|
10
10
|
TlaTooManyStatesError,
|
|
11
11
|
TlaUnsupportedError,
|
|
12
12
|
} from "./errors";
|
|
13
|
-
import { createTracingEnvironment } from "./evaluate";
|
|
13
|
+
import { createTracingEnvironment, type State } from "./evaluate";
|
|
14
14
|
import { EXIT_STATUS, getMessageExitStatus, withLivenessExitCode } from "./exit-codes";
|
|
15
15
|
import { createLivenessChecker } from "./liveness-checker";
|
|
16
|
-
import {
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
import {
|
|
17
|
+
addActionCoverage,
|
|
18
|
+
getIncompleteSuccessorMessage,
|
|
19
|
+
prepareSearch,
|
|
20
|
+
reportAssumptionViolation,
|
|
21
|
+
} from "./search";
|
|
22
|
+
import { forEachInitialState, forEachSuccessor, getSuccessors, type Successor } from "./successors";
|
|
19
23
|
import {
|
|
20
24
|
formatNestedMessage,
|
|
21
25
|
formatTlcDate,
|
|
@@ -26,7 +30,8 @@ import {
|
|
|
26
30
|
withUnexpectedException,
|
|
27
31
|
} from "./tlc/messages";
|
|
28
32
|
import { getTlcFingerprint } from "./tlc/fingerprint";
|
|
29
|
-
import {
|
|
33
|
+
import { createJavaRandom } from "./tlc/random";
|
|
34
|
+
import { replayInitialStates, replaySuccessors, walkSuccessors } from "./tlc/replay";
|
|
30
35
|
import { getOptimisticProbability, getActualProbability } from "./tlc/summary";
|
|
31
36
|
import { createModelValue, formatState, getSetBound, isSameValue, type Value } from "./values";
|
|
32
37
|
|
|
@@ -39,6 +44,7 @@ export type DepthFirstOutput =
|
|
|
39
44
|
| { kind: "message"; code: number; isError: boolean; message: string; toolMessage: string }
|
|
40
45
|
| { kind: "behavior"; states: Record<string, Value>[]; isInvariant: boolean }
|
|
41
46
|
| { kind: "nested-expressions"; callStack: Expression[] }
|
|
47
|
+
| CoverageOutput
|
|
42
48
|
| { kind: "success"; optimistic: number; actual: number };
|
|
43
49
|
|
|
44
50
|
interface StateEntry {
|
|
@@ -131,7 +137,7 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
|
|
|
131
137
|
withUnexpectedException(() =>
|
|
132
138
|
createLivenessChecker(temporalProperties, search.spec.temporals, environment, {
|
|
133
139
|
getFingerprint: () => 0,
|
|
134
|
-
|
|
140
|
+
forEachActionSuccessors: () => {},
|
|
135
141
|
}),
|
|
136
142
|
),
|
|
137
143
|
)?.branches;
|
|
@@ -164,7 +170,10 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
|
|
|
164
170
|
);
|
|
165
171
|
if (assumptionStatus !== undefined) return assumptionStatus;
|
|
166
172
|
|
|
167
|
-
const
|
|
173
|
+
const description = prepared.getDescription();
|
|
174
|
+
const nextActions = description.actions;
|
|
175
|
+
const coverage = prepared.coverage;
|
|
176
|
+
const covered = coverage && addActionCoverage(coverage, environment, description);
|
|
168
177
|
// Deviation from TLC: TLCExt#pickSuccessor casts the DFID checker to ModelChecker and fails, so tla-ts asks as model checking does.
|
|
169
178
|
runtime.getSuccessorAction = (state, next) =>
|
|
170
179
|
nextActions.find((action) =>
|
|
@@ -211,6 +220,8 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
|
|
|
211
220
|
const toRecord = (state: (Value | undefined)[]) =>
|
|
212
221
|
search.toRecord(state.map((value) => value ?? createModelValue("null")));
|
|
213
222
|
const printSummary = () => {
|
|
223
|
+
const report = nextActions.length > 0 ? prepared.getCoverage() : undefined;
|
|
224
|
+
if (report) output({ kind: "coverage", coverage: report });
|
|
214
225
|
const counts = `${generatedCount} states generated, ${statuses.size} distinct states found`;
|
|
215
226
|
if (isTool) {
|
|
216
227
|
message(
|
|
@@ -247,7 +258,13 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
|
|
|
247
258
|
return false;
|
|
248
259
|
};
|
|
249
260
|
const init = search.spec.init;
|
|
250
|
-
if (
|
|
261
|
+
if (covered) {
|
|
262
|
+
replayInitialStates(covered.inits, environment, addGenerated, (partial) =>
|
|
263
|
+
addGenerated([...partial]),
|
|
264
|
+
);
|
|
265
|
+
} else if (init) {
|
|
266
|
+
forEachInitialState(init, environment, addGenerated, search.spec.scope, addGenerated);
|
|
267
|
+
}
|
|
251
268
|
generatedCount = generated.length;
|
|
252
269
|
for (const state of generated) {
|
|
253
270
|
if (!state.every((value) => value !== undefined)) {
|
|
@@ -268,16 +285,21 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
|
|
|
268
285
|
config.alias === undefined
|
|
269
286
|
? search.toRecord(state)
|
|
270
287
|
: search.evaluateAlias(config.alias, state, state, isTool);
|
|
271
|
-
const
|
|
272
|
-
? search.getViolatedInvariants(state)
|
|
273
|
-
: [search.findViolatedInvariant(state)].filter((invariant) => invariant !== undefined);
|
|
274
|
-
for (const invariant of violated) {
|
|
288
|
+
const reportInvariant = (name: string) =>
|
|
275
289
|
message(
|
|
276
290
|
MESSAGE_CODE.invariantViolatedInitial,
|
|
277
|
-
`Invariant ${
|
|
291
|
+
`Invariant ${name} is violated by the initial state:\n${formatState(alias())}`,
|
|
278
292
|
);
|
|
279
|
-
|
|
280
|
-
|
|
293
|
+
if (isContinued) {
|
|
294
|
+
search.forEachViolatedInvariant(state, (invariant) => {
|
|
295
|
+
reportInvariant(invariant.name);
|
|
296
|
+
checker.continuedCode = MESSAGE_CODE.invariantViolatedInitial;
|
|
297
|
+
});
|
|
298
|
+
}
|
|
299
|
+
const violated = isContinued ? undefined : search.findViolatedInvariant(state);
|
|
300
|
+
if (violated) {
|
|
301
|
+
reportInvariant(violated.name);
|
|
302
|
+
return MESSAGE_CODE.invariantViolatedInitial;
|
|
281
303
|
}
|
|
282
304
|
const predicate = search.findFailedInitialPredicate(state);
|
|
283
305
|
if (predicate) {
|
|
@@ -291,25 +313,56 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
|
|
|
291
313
|
return NO_ERROR;
|
|
292
314
|
};
|
|
293
315
|
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
316
|
+
let actionSuccessors: Value[][] = [];
|
|
317
|
+
let incompleteSuccessor: State | undefined;
|
|
318
|
+
let actionSuccessorCount = 0;
|
|
319
|
+
const addActionSuccessor = (successor: Value[]) => {
|
|
320
|
+
actionSuccessorCount++;
|
|
321
|
+
if (incompleteSuccessor) return false;
|
|
322
|
+
if (actionSuccessors.length === getSetBound()) throw new TlaTooManyStatesError();
|
|
323
|
+
actionSuccessors.push(successor);
|
|
324
|
+
return false;
|
|
325
|
+
};
|
|
326
|
+
const visitActionSuccessor = (successor: Successor) => addActionSuccessor(successor.state);
|
|
327
|
+
const addIncompleteSuccessor = (partial: State) => {
|
|
328
|
+
actionSuccessorCount++;
|
|
329
|
+
incompleteSuccessor ??= [...partial];
|
|
330
|
+
return true;
|
|
331
|
+
};
|
|
332
|
+
// TLC's Tool#getNextStates generates every successor of the action before DFIDWorker finds an incomplete one.
|
|
333
|
+
const getActionSuccessors = (index: number, state: Value[]) => {
|
|
334
|
+
const action = nextActions[index];
|
|
335
|
+
const coveredAction = covered?.actions[index];
|
|
336
|
+
actionSuccessors = [];
|
|
337
|
+
incompleteSuccessor = undefined;
|
|
338
|
+
actionSuccessorCount = 0;
|
|
339
|
+
if (coverage && coveredAction) {
|
|
340
|
+
walkSuccessors(
|
|
341
|
+
coveredAction,
|
|
342
|
+
coveredAction.node,
|
|
343
|
+
state,
|
|
344
|
+
environment,
|
|
345
|
+
addActionSuccessor,
|
|
346
|
+
addIncompleteSuccessor,
|
|
347
|
+
);
|
|
348
|
+
coverage.primary[coveredAction.node] += actionSuccessorCount;
|
|
349
|
+
} else {
|
|
297
350
|
forEachSuccessor(
|
|
298
351
|
action.expression,
|
|
299
352
|
state,
|
|
300
353
|
environment,
|
|
301
|
-
|
|
302
|
-
if (successors.length === getSetBound()) throw new TlaTooManyStatesError();
|
|
303
|
-
successors.push(successor.state);
|
|
304
|
-
return false;
|
|
305
|
-
},
|
|
354
|
+
visitActionSuccessor,
|
|
306
355
|
action.scope,
|
|
356
|
+
undefined,
|
|
357
|
+
undefined,
|
|
358
|
+
addIncompleteSuccessor,
|
|
307
359
|
);
|
|
308
|
-
return { successors, incomplete: undefined };
|
|
309
|
-
} catch (error) {
|
|
310
|
-
if (!(error instanceof TlaIncompleteSuccessorError)) throw error;
|
|
311
|
-
return { successors, incomplete: error };
|
|
312
360
|
}
|
|
361
|
+
return {
|
|
362
|
+
successors: actionSuccessors,
|
|
363
|
+
incomplete: incompleteSuccessor,
|
|
364
|
+
count: actionSuccessorCount,
|
|
365
|
+
};
|
|
313
366
|
};
|
|
314
367
|
|
|
315
368
|
const findCheckFailure = (state: Value[], successor: Value[], isNew: boolean) => {
|
|
@@ -375,12 +428,12 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
|
|
|
375
428
|
};
|
|
376
429
|
currentState = state;
|
|
377
430
|
try {
|
|
378
|
-
for (
|
|
379
|
-
const
|
|
431
|
+
for (let index = 0; index < nextActions.length; index++) {
|
|
432
|
+
const action = nextActions[index];
|
|
433
|
+
const next = getActionSuccessors(index, state);
|
|
380
434
|
const incomplete = next.incomplete;
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
isDeadlocked &&= count === 0;
|
|
435
|
+
generatedCount += next.count;
|
|
436
|
+
isDeadlocked &&= next.count === 0;
|
|
384
437
|
for (const successor of next.successors) {
|
|
385
438
|
processedSuccessor = successor;
|
|
386
439
|
levels.set(successor, depth + 2);
|
|
@@ -406,11 +459,13 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
|
|
|
406
459
|
if (failure) return report(failure.code, failure.text, !failure.isViolated);
|
|
407
460
|
}
|
|
408
461
|
if (incomplete) {
|
|
409
|
-
processedSuccessor = incomplete
|
|
462
|
+
processedSuccessor = incomplete;
|
|
410
463
|
return report(
|
|
411
464
|
MESSAGE_CODE.incompleteSuccessor,
|
|
412
465
|
getIncompleteSuccessorMessage(
|
|
413
|
-
|
|
466
|
+
environment.variables.filter(
|
|
467
|
+
(_variable, position) => incomplete[position] === undefined,
|
|
468
|
+
),
|
|
414
469
|
action.name,
|
|
415
470
|
nextActions.length,
|
|
416
471
|
options.version,
|
|
@@ -615,6 +670,9 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
|
|
|
615
670
|
);
|
|
616
671
|
fingerprintSet.level++;
|
|
617
672
|
fingerprintSet.leveled = LEVELED - fingerprintSet.leveled;
|
|
673
|
+
// TLC starts a new DFIDWorker thread for each level, whose generator for random values starts over from the seed.
|
|
674
|
+
const random = createJavaRandom(runtime.seed);
|
|
675
|
+
runtime.getRandom = () => random;
|
|
618
676
|
searchLevel(level);
|
|
619
677
|
checker.isDone = false;
|
|
620
678
|
levelCode = checker.isKeepingCallStack ? NO_ERROR : checker.errorCode;
|