tla-ts 0.0.10-dev.3a85c3a9e → 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 +36 -36
- package/dist/deciders.js +53 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +18 -4
- package/dist/index.d.ts +18 -4
- 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 +56 -56
- package/dist/prove.js +79 -79
- package/dist/run.cjs +40 -44
- package/dist/run.js +42 -46
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +97 -92
- package/dist/transfer.js +97 -92
- 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 +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +13 -11
- package/src/check-trace.ts +146 -107
- package/src/check.ts +535 -281
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +21 -7
- package/src/cli/tlc.ts +31 -11
- 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 +101 -36
- package/src/environment.ts +131 -41
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +424 -135
- package/src/exit-codes.ts +28 -13
- package/src/instances.ts +135 -11
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +675 -236
- package/src/lexer.ts +12 -2
- package/src/liveness-checker.ts +204 -62
- 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/parallel-worker.ts +8 -2
- package/src/parallel.ts +5 -0
- package/src/parser.ts +180 -149
- 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 +171 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +66 -14
- 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 +84 -15
- 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 +4 -10
- 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 +608 -139
- 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 +15 -5
- package/src/prover/smt/solver/lp/containers.ts +7 -1
- package/src/prover/smt/solver/lp/core-solver.ts +12 -8
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -3
- 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/nex-creator.ts +3 -2
- package/src/prover/smt/solver/lp/nex.ts +2 -1
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -1
- package/src/prover/smt/solver/lp/nla-core.ts +26 -6
- package/src/prover/smt/solver/lp/nla-grobner.ts +158 -81
- package/src/prover/smt/solver/lp/nra-solver.ts +138 -95
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -2
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -20
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -39
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- 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 +22 -44
- 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 +2 -4
- package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
- 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 +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 -71
- 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 +21 -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 +10 -6
- 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/quantifier-manager.ts +14 -9
- 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 +20 -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 +17 -7
- 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 +4 -7
- 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 +48 -7
- package/src/prover/smt/solver/smt-setup.ts +106 -13
- package/src/prover/smt/solver/smtlib-parser.ts +589 -224
- package/src/prover/smt/solver/smtlib-script.ts +713 -210
- 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 +350 -195
- 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 +10 -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/equality-rules.ts +24 -0
- package/src/prover/zenon/expr.ts +21 -0
- package/src/prover/zenon/index-table.ts +7 -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/prover/zenon/rules.ts +2 -1
- package/src/resolve.ts +1274 -258
- package/src/runtime.ts +25 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +5 -15
- package/src/sany/generator-def-entries.ts +123 -36
- package/src/sany/generator-definitions.ts +5 -3
- package/src/sany/generator-expressions.ts +60 -37
- package/src/sany/generator-proofs.ts +18 -12
- package/src/sany/generator.ts +12 -6
- 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 +348 -153
- package/src/simulate.ts +250 -185
- package/src/spec-description.ts +15 -7
- package/src/standard-definitions.ts +5 -0
- package/src/standard-modules.ts +56 -22
- package/src/subexpressions.ts +564 -138
- package/src/successors.ts +50 -20
- package/src/symmetry.ts +2 -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 +147 -46
- package/src/tlc/tlc-operators.ts +10 -8
- package/src/tlc/tlcext-operators.ts +87 -26
- package/src/tlc/trace-spec.ts +11 -25
- 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
|
@@ -3,14 +3,9 @@ import { EXIT_STATUS, setExitCode } from "../exit-codes";
|
|
|
3
3
|
import { parseModule } from "../parser";
|
|
4
4
|
import { generateSanySpecification } from "../sany/generator";
|
|
5
5
|
import { checkModuleLevels } from "../sany/levels";
|
|
6
|
-
import {
|
|
7
|
-
VARIABLE_DECL_KIND,
|
|
8
|
-
type ModuleNode,
|
|
9
|
-
type OpDefNode,
|
|
10
|
-
type SymbolNode,
|
|
11
|
-
} from "../sany/nodes";
|
|
6
|
+
import type { ModuleNode, OpDefNode, SymbolNode } from "../sany/nodes";
|
|
12
7
|
import type { TlcVersion } from "../tlc/version";
|
|
13
|
-
import type {
|
|
8
|
+
import type { RuntimeInvariantTemplate } from "./tlc-arguments";
|
|
14
9
|
|
|
15
10
|
const CONSTANT_LEVEL = 0;
|
|
16
11
|
const TEMPORAL_LEVEL = 3;
|
|
@@ -31,21 +26,20 @@ const createParsingFailure = (detail: string) =>
|
|
|
31
26
|
EXIT_STATUS.specParseError,
|
|
32
27
|
);
|
|
33
28
|
|
|
34
|
-
const
|
|
35
|
-
|
|
29
|
+
const checkDebuggerExpression = (
|
|
30
|
+
source: string,
|
|
31
|
+
moduleName: string,
|
|
36
32
|
name: string,
|
|
37
33
|
expression: string,
|
|
38
34
|
loadModule: (name: string) => string | undefined,
|
|
39
35
|
version: TlcVersion,
|
|
40
36
|
) => {
|
|
41
|
-
const moduleName = name.replace("__DebuggerExpr__", "__DebuggerModule__");
|
|
42
|
-
const text = `---- MODULE ${moduleName} ----\nEXTENDS ${root}\n\n${name} == ${expression}\n====`;
|
|
43
37
|
const createFailure = (message: string) =>
|
|
44
38
|
createParsingFailure(
|
|
45
39
|
`Unknown location\n\n${message} while parsing breakpoint expression "${expression}"`,
|
|
46
40
|
);
|
|
47
41
|
try {
|
|
48
|
-
parseModule(
|
|
42
|
+
parseModule(source);
|
|
49
43
|
} catch (error) {
|
|
50
44
|
if (!(error instanceof TlaSyntaxError)) throw error;
|
|
51
45
|
throw createParsingFailure(`Syntax error while parsing breakpoint expression "${expression}"`);
|
|
@@ -54,7 +48,7 @@ const getDebuggerExpressionLevel = (
|
|
|
54
48
|
let isLevelCorrect = false;
|
|
55
49
|
const specification = (() => {
|
|
56
50
|
try {
|
|
57
|
-
return generateSanySpecification(
|
|
51
|
+
return generateSanySpecification(source, loadModule, {
|
|
58
52
|
version,
|
|
59
53
|
onModule: (module, messages) => {
|
|
60
54
|
const isCorrect = () => messages.every((message) => message.isWarning);
|
|
@@ -81,56 +75,26 @@ const getDebuggerExpressionLevel = (
|
|
|
81
75
|
`Unknown location\n\nDebug expressions must be action-level or below; actual level: ${level} (Temporal)`,
|
|
82
76
|
);
|
|
83
77
|
}
|
|
84
|
-
return level;
|
|
85
78
|
};
|
|
86
79
|
|
|
87
|
-
|
|
88
|
-
export const addRuntimeInvariants = (
|
|
80
|
+
export const getRuntimeInvariants = (
|
|
89
81
|
source: string,
|
|
90
82
|
root: ModuleNode,
|
|
91
|
-
invariants:
|
|
83
|
+
invariants: RuntimeInvariantTemplate[],
|
|
92
84
|
loadModule: (name: string) => string | undefined,
|
|
93
85
|
version: TlcVersion,
|
|
94
86
|
) => {
|
|
95
|
-
const stamp = Date.now();
|
|
96
|
-
const named = invariants.map((invariant, index) => ({
|
|
97
|
-
expression: invariant.expression,
|
|
98
|
-
name: findDefinition(root, invariant.expression)
|
|
99
|
-
? invariant.expression
|
|
100
|
-
: `__DebuggerExpr__${stamp + index}`,
|
|
101
|
-
}));
|
|
102
|
-
const names = named.map((invariant) => invariant.name);
|
|
103
|
-
const generated = named.filter((invariant) => invariant.name !== invariant.expression);
|
|
104
|
-
if (generated.length === 0) return { names, source };
|
|
105
87
|
const loadDependency = (name: string) => (name === root.name ? source : loadModule(name));
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
)
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
);
|
|
118
|
-
// HACK: TLC checks a constant-level -inv in every state, so an unused LET makes it depend on one.
|
|
119
|
-
return level === CONSTANT_LEVEL && variable
|
|
120
|
-
? `${invariant.name} ==\nLET ${invariant.name}State == ${variable.name} IN\n${" ".repeat(head.length)}${invariant.expression}`
|
|
121
|
-
: `${head}${invariant.expression}`;
|
|
88
|
+
// Deviation from TLC: TLC reads the clock for each name, which no fixed output can match; one reading plus an index keeps the names apart.
|
|
89
|
+
const stamp = Date.now();
|
|
90
|
+
return invariants.map((invariant, index) => {
|
|
91
|
+
if (findDefinition(root, invariant.expression)) {
|
|
92
|
+
return { name: invariant.expression, module: undefined, source: undefined };
|
|
93
|
+
}
|
|
94
|
+
const module = `__DebuggerModule__${stamp + index}`;
|
|
95
|
+
const name = `__DebuggerExpr__${stamp + index}`;
|
|
96
|
+
const text = `---- MODULE ${module} ----\nEXTENDS ${root.name}\n\n${name} == ${invariant.expression}\n====`;
|
|
97
|
+
checkDebuggerExpression(text, module, name, invariant.expression, loadDependency, version);
|
|
98
|
+
return { name, module, source: text };
|
|
122
99
|
});
|
|
123
|
-
const lines = source.split("\n");
|
|
124
|
-
const end = (parseModule(source).location.range?.end.line ?? lines.length) - 1;
|
|
125
|
-
const terminator = lines[end].search(/={4,}/);
|
|
126
|
-
return {
|
|
127
|
-
names,
|
|
128
|
-
source: [
|
|
129
|
-
...lines.slice(0, end),
|
|
130
|
-
lines[end].slice(0, terminator),
|
|
131
|
-
...definitions,
|
|
132
|
-
lines[end].slice(terminator),
|
|
133
|
-
...lines.slice(end + 1),
|
|
134
|
-
].join("\n"),
|
|
135
|
-
};
|
|
136
100
|
};
|
package/src/cli/tlc-arguments.ts
CHANGED
|
@@ -35,11 +35,11 @@ export interface TlcArguments {
|
|
|
35
35
|
suppressedCodes: number[];
|
|
36
36
|
errorCodes: number[];
|
|
37
37
|
userFile: string | undefined;
|
|
38
|
-
invariants:
|
|
38
|
+
invariants: RuntimeInvariantTemplate[];
|
|
39
39
|
moduleOperators: ModuleOperator[];
|
|
40
40
|
}
|
|
41
41
|
|
|
42
|
-
export interface
|
|
42
|
+
export interface RuntimeInvariantTemplate {
|
|
43
43
|
modules: string[];
|
|
44
44
|
expression: string;
|
|
45
45
|
}
|
package/src/cli/tlc-output.ts
CHANGED
|
@@ -320,11 +320,10 @@ export const printCheckProgress = (
|
|
|
320
320
|
timing.livenessStartTime = Date.now();
|
|
321
321
|
if (progress.isComplete) printProgress(printer, progress.statistics);
|
|
322
322
|
const branches = progress.branches > 1 ? `${progress.branches} branches of ` : "";
|
|
323
|
-
const states = progress.branches * progress.states;
|
|
324
323
|
print(
|
|
325
324
|
MESSAGE_CODE.checkingTemporal,
|
|
326
325
|
MESSAGE_LEVEL.none,
|
|
327
|
-
`Checking ${branches}temporal properties for the ${progress.isComplete ? "complete" : "current"} state space with ${states} total distinct states at (${formatTlcDate(new Date())})`,
|
|
326
|
+
`Checking ${branches}temporal properties for the ${progress.isComplete ? "complete" : "current"} state space with ${progress.states} total distinct states at (${formatTlcDate(new Date())})`,
|
|
328
327
|
);
|
|
329
328
|
return;
|
|
330
329
|
}
|
|
@@ -473,7 +472,11 @@ const printSuccess = (printer: MessagePrinter, optimistic: number, actual: numbe
|
|
|
473
472
|
].join("\n"),
|
|
474
473
|
);
|
|
475
474
|
|
|
476
|
-
export const printDepthFirst = (
|
|
475
|
+
export const printDepthFirst = (
|
|
476
|
+
printer: MessagePrinter,
|
|
477
|
+
output: DepthFirstOutput,
|
|
478
|
+
startTime: number,
|
|
479
|
+
) => {
|
|
477
480
|
switch (output.kind) {
|
|
478
481
|
case "message":
|
|
479
482
|
printer.print(
|
|
@@ -482,6 +485,9 @@ export const printDepthFirst = (printer: MessagePrinter, output: DepthFirstOutpu
|
|
|
482
485
|
printer.isTool ? output.toolMessage : output.message,
|
|
483
486
|
);
|
|
484
487
|
return;
|
|
488
|
+
case "coverage":
|
|
489
|
+
printCoverage(printer, output.coverage, startTime);
|
|
490
|
+
return;
|
|
485
491
|
case "behavior":
|
|
486
492
|
output.states.forEach((state, index) =>
|
|
487
493
|
output.isInvariant
|
|
@@ -549,6 +555,7 @@ export const printResult = (result: CheckResult, printer: MessagePrinter, timing
|
|
|
549
555
|
printTrace(printer, failure.trace, "error-trace");
|
|
550
556
|
const traceFailure = failure.traceFailure;
|
|
551
557
|
if (traceFailure) {
|
|
558
|
+
printTraceOutput(printer, traceFailure.output);
|
|
552
559
|
print(
|
|
553
560
|
traceFailure.code,
|
|
554
561
|
MESSAGE_LEVEL.error,
|
|
@@ -609,9 +616,9 @@ export const printCommandLineError = (isTool: boolean, version: TlcVersion, mess
|
|
|
609
616
|
return 1;
|
|
610
617
|
};
|
|
611
618
|
|
|
612
|
-
//
|
|
619
|
+
// TLC prints the JVM's default direct memory limit and its default fingerprint set and state queue.
|
|
613
620
|
export const printStartupBanner = (printer: MessagePrinter, args: TlcArguments) => {
|
|
614
|
-
const workers = `${args.workers} worker${args.workers === 1 ? "" : "s"} on ${availableParallelism()} cores with ${Math.floor(getHeapStatistics().heap_size_limit / 1024 / 1024)}MB heap and
|
|
621
|
+
const workers = `${args.workers} worker${args.workers === 1 ? "" : "s"} on ${availableParallelism()} cores with ${Math.floor(getHeapStatistics().heap_size_limit / 1024 / 1024)}MB heap and 64MB offheap memory [pid: ${process.pid}] (${type()} ${release()} ${arch()}, Node.js ${process.versions.node} ${process.arch.endsWith("64") ? 64 : 32}bit`;
|
|
615
622
|
if (args.mode === "model-check" && args.dfidDepth !== undefined) {
|
|
616
623
|
printer.print(
|
|
617
624
|
MESSAGE_CODE.depthFirstModelChecking,
|
|
@@ -624,7 +631,7 @@ export const printStartupBanner = (printer: MessagePrinter, args: TlcArguments)
|
|
|
624
631
|
printer.print(
|
|
625
632
|
MESSAGE_CODE.modelChecking,
|
|
626
633
|
MESSAGE_LEVEL.none,
|
|
627
|
-
`Running breadth-first search Model-Checking with fp ${args.fingerprintIndex} and seed ${args.seed} with ${workers},
|
|
634
|
+
`Running breadth-first search Model-Checking with fp ${args.fingerprintIndex} and seed ${args.seed} with ${workers}, MSBDiskFPSet, DiskStateQueue).`,
|
|
628
635
|
);
|
|
629
636
|
return;
|
|
630
637
|
}
|
|
@@ -635,7 +642,11 @@ export const printStartupBanner = (printer: MessagePrinter, args: TlcArguments)
|
|
|
635
642
|
);
|
|
636
643
|
};
|
|
637
644
|
|
|
638
|
-
export const printSimulation = (
|
|
645
|
+
export const printSimulation = (
|
|
646
|
+
printer: MessagePrinter,
|
|
647
|
+
output: SimulationOutput,
|
|
648
|
+
startTime: number,
|
|
649
|
+
) => {
|
|
639
650
|
const print = printer.print;
|
|
640
651
|
switch (output.kind) {
|
|
641
652
|
case "message":
|
|
@@ -645,6 +656,9 @@ export const printSimulation = (printer: MessagePrinter, output: SimulationOutpu
|
|
|
645
656
|
printer.isTool ? output.toolMessage : output.message,
|
|
646
657
|
);
|
|
647
658
|
return;
|
|
659
|
+
case "coverage":
|
|
660
|
+
printCoverage(printer, output.coverage, startTime);
|
|
661
|
+
return;
|
|
648
662
|
case "behavior": {
|
|
649
663
|
const last = output.trace[output.trace.length - 1];
|
|
650
664
|
if (!output.isLastStateOnly) {
|
package/src/cli/tlc.ts
CHANGED
|
@@ -29,6 +29,7 @@ import { EXIT_STATUS } from "../exit-codes";
|
|
|
29
29
|
import { check } from "../parallel";
|
|
30
30
|
import { extractModule, parseModule } from "../parser";
|
|
31
31
|
import { simulate } from "../simulate";
|
|
32
|
+
import type { CliSettings } from "../search";
|
|
32
33
|
import type { StateDump } from "../state-graph";
|
|
33
34
|
import {
|
|
34
35
|
getSanyStandardModules,
|
|
@@ -48,7 +49,7 @@ import {
|
|
|
48
49
|
type MessagePrinter,
|
|
49
50
|
zeroPad,
|
|
50
51
|
} from "../tlc/messages";
|
|
51
|
-
import {
|
|
52
|
+
import { getRuntimeInvariants } from "./runtime-invariants";
|
|
52
53
|
import { parseTlcArguments, type TlcArguments } from "./tlc-arguments";
|
|
53
54
|
import {
|
|
54
55
|
getClassPath,
|
|
@@ -279,8 +280,9 @@ const checkSpec = async (
|
|
|
279
280
|
} else {
|
|
280
281
|
printError(error, printer);
|
|
281
282
|
}
|
|
282
|
-
|
|
283
|
-
|
|
283
|
+
const exitCode = getTopLevelExitCode(error);
|
|
284
|
+
if (exitCode !== EXIT_STATUS.abort) printFinished();
|
|
285
|
+
return exitCode;
|
|
284
286
|
};
|
|
285
287
|
const config = (() => {
|
|
286
288
|
try {
|
|
@@ -377,15 +379,14 @@ const checkSpec = async (
|
|
|
377
379
|
}
|
|
378
380
|
const userFile = args.userFile;
|
|
379
381
|
const standardModules = getSanyStandardModules(version);
|
|
380
|
-
const
|
|
382
|
+
const runtimeInvariants = getRuntimeInvariants(
|
|
381
383
|
source,
|
|
382
384
|
specification.root,
|
|
383
385
|
args.invariants,
|
|
384
386
|
(name) => loadModule(name) ?? standardModules.get(name) ?? extractModule(source, name),
|
|
385
387
|
version,
|
|
386
388
|
);
|
|
387
|
-
|
|
388
|
-
const options: CheckOptions = {
|
|
389
|
+
const options: CheckOptions & CliSettings = {
|
|
389
390
|
workers: args.workers,
|
|
390
391
|
livenessCheck:
|
|
391
392
|
livenessCheck === "off"
|
|
@@ -409,10 +410,17 @@ const checkSpec = async (
|
|
|
409
410
|
version,
|
|
410
411
|
onProgress: (progress) => printCheckProgress(printer, progress, timing, directory),
|
|
411
412
|
onPrint: userFile === undefined ? undefined : (text) => appendFileSync(userFile, `${text}\n`),
|
|
412
|
-
source
|
|
413
|
+
source,
|
|
413
414
|
config,
|
|
414
415
|
onPause: () => readSync(0, Buffer.alloc(1)),
|
|
415
|
-
|
|
416
|
+
readLine: readStandardInputLine,
|
|
417
|
+
runtimeInvariants: runtimeInvariants.map((invariant) => ({
|
|
418
|
+
name: invariant.name,
|
|
419
|
+
module: invariant.module,
|
|
420
|
+
})),
|
|
421
|
+
loadModule: (name) =>
|
|
422
|
+
runtimeInvariants.find((invariant) => invariant.module === name)?.source ??
|
|
423
|
+
loadModule(name),
|
|
416
424
|
loadClass: (name) => {
|
|
417
425
|
const classPath = getClassPath(directory, name);
|
|
418
426
|
return existsSync(classPath) ? readFileSync(classPath) : undefined;
|
|
@@ -432,7 +440,7 @@ const checkSpec = async (
|
|
|
432
440
|
aril: args.aril,
|
|
433
441
|
isGenerating: args.mode === "generate",
|
|
434
442
|
scheduler: args.scheduler,
|
|
435
|
-
onSimulation: (output) => printSimulation(printer, output),
|
|
443
|
+
onSimulation: (output) => printSimulation(printer, output, timing.startTime),
|
|
436
444
|
});
|
|
437
445
|
printFinished();
|
|
438
446
|
return status;
|
|
@@ -441,7 +449,7 @@ const checkSpec = async (
|
|
|
441
449
|
const status = checkDepthFirst({
|
|
442
450
|
...options,
|
|
443
451
|
maxDepth: args.dfidDepth,
|
|
444
|
-
onOutput: (output) => printDepthFirst(printer, output),
|
|
452
|
+
onOutput: (output) => printDepthFirst(printer, output, timing.startTime),
|
|
445
453
|
});
|
|
446
454
|
printFinished();
|
|
447
455
|
return status;
|
|
@@ -478,6 +486,18 @@ const checkSpec = async (
|
|
|
478
486
|
}
|
|
479
487
|
};
|
|
480
488
|
|
|
489
|
+
const readStandardInputLine = () => {
|
|
490
|
+
const bytes: number[] = [];
|
|
491
|
+
const byte = Buffer.alloc(1);
|
|
492
|
+
let isRead = false;
|
|
493
|
+
while (readSync(0, byte) === 1) {
|
|
494
|
+
isRead = true;
|
|
495
|
+
if (byte[0] === 0x0a) break;
|
|
496
|
+
bytes.push(byte[0]);
|
|
497
|
+
}
|
|
498
|
+
return isRead ? Buffer.from(bytes).toString().replace(/\r$/, "") : undefined;
|
|
499
|
+
};
|
|
500
|
+
|
|
481
501
|
const formatSanyErrors = (error: TlaSyntaxError, specName: string) => {
|
|
482
502
|
const isFatal = error instanceof TlaSanyFatalError;
|
|
483
503
|
if (!isFatal && !error.failure)
|
|
@@ -572,7 +592,7 @@ export const checkSpecs = async (args: string[], java: JavaProperties) => {
|
|
|
572
592
|
exitCodes.push(
|
|
573
593
|
await reportErrors(async () => {
|
|
574
594
|
const specPath = path.endsWith(".ts") ? await writeTypeScriptSpec(path) : path;
|
|
575
|
-
//
|
|
595
|
+
// An extension: TLC refuses more than one spec, and tla-ts checks each one under its name.
|
|
576
596
|
if (paths.length > 1) {
|
|
577
597
|
console.log(`Checking ${basename(specPath)} with ${basename(specPath, ".tla")}.cfg`);
|
|
578
598
|
}
|
package/src/cli/xml-exporter.ts
CHANGED
|
@@ -52,7 +52,7 @@ const XML_EXPORT_USAGE = (() => {
|
|
|
52
52
|
"",
|
|
53
53
|
getBold("OPTIONS"),
|
|
54
54
|
"",
|
|
55
|
-
...options.map((
|
|
55
|
+
...options.map((option) => `\t${getBold(option[0])}\n\t\t${option[1]}`),
|
|
56
56
|
"",
|
|
57
57
|
getBold("TIPS"),
|
|
58
58
|
"",
|
package/src/codegen.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { getChildren, getReferencedName, isLocallyResolved, type Expression } from "./ast";
|
|
2
|
+
import { isTlcEvalReached } from "./dependencies";
|
|
2
3
|
import {
|
|
3
4
|
bindValue,
|
|
4
5
|
expectBooleanBody,
|
|
@@ -14,6 +15,7 @@ import {
|
|
|
14
15
|
getFunctionBuilder,
|
|
15
16
|
getLazyFilter,
|
|
16
17
|
isKeptLazy,
|
|
18
|
+
isUniformPredicate,
|
|
17
19
|
getDomainOperator,
|
|
18
20
|
getSubsetOperator,
|
|
19
21
|
getEvaluator,
|
|
@@ -161,19 +163,26 @@ const createLocal = (generator: Generator) => `local${generator.counter++}`;
|
|
|
161
163
|
const getFreeNames = (expression: Expression, names = new Set<string>()) => {
|
|
162
164
|
const name = getReferencedName(expression);
|
|
163
165
|
if (name !== undefined) names.add(name);
|
|
164
|
-
|
|
166
|
+
if (expression.kind !== "Selection") {
|
|
167
|
+
getChildren(expression).forEach((child) => getFreeNames(child, names));
|
|
168
|
+
}
|
|
165
169
|
return names;
|
|
166
170
|
};
|
|
167
171
|
|
|
168
172
|
const getDelegateContext = (generator: Generator, expression: Expression, frame: Frame) => {
|
|
173
|
+
if (frame.locals.size === 0) return frame.context;
|
|
174
|
+
// TLC caches a constant TLCEval only where no name is bound, so a delegate that reaches one sees every local.
|
|
175
|
+
const isEveryLocalCaptured = isTlcEvalReached(expression, generator.environment);
|
|
169
176
|
const freeNames = getFreeNames(expression);
|
|
170
|
-
const captured = [...frame.locals].filter(
|
|
177
|
+
const captured = [...frame.locals].filter(
|
|
178
|
+
(entry) => isEveryLocalCaptured || freeNames.has(entry[0]),
|
|
179
|
+
);
|
|
171
180
|
if (captured.length === 0) return frame.context;
|
|
172
181
|
const names = addReference(
|
|
173
182
|
generator,
|
|
174
|
-
captured.map((
|
|
183
|
+
captured.map((entry) => entry[0]),
|
|
175
184
|
);
|
|
176
|
-
return `extend(${frame.context}, ${names}, [${captured.map((
|
|
185
|
+
return `extend(${frame.context}, ${names}, [${captured.map((entry) => entry[1]).join(", ")}])`;
|
|
177
186
|
};
|
|
178
187
|
|
|
179
188
|
const generateDelegate = (generator: Generator, expression: Expression, frame: Frame) =>
|
|
@@ -267,7 +276,8 @@ const generateSetFilter = (
|
|
|
267
276
|
const lazy = `if (!isReducible(${base})) return ${filterLazily}(${base}, ${getDelegateContext(generator, expression, bodyFrame)});`;
|
|
268
277
|
const set = generateExpression(generator, expression.bound.set, bodyFrame);
|
|
269
278
|
bodyFrame.locals.set(name, element);
|
|
270
|
-
const
|
|
279
|
+
const stop = isUniformPredicate(expression, generator.environment) ? " else break;" : "";
|
|
280
|
+
const test = `if (filterPredicate(${generateExpression(generator, expression.predicate, bodyFrame)}, ${node})) addBounded(${kept}, ${element});${stop}`;
|
|
271
281
|
return `const ${base} = ${set}; ${lazy} const ${list} = ${base}.kind === "Interval" ? ${base} : finiteElements(${base}); const ${kept} = []; ${generateLoop(generator, list, element, test)} return normalizedSet(${kept});`;
|
|
272
282
|
});
|
|
273
283
|
|
|
@@ -318,9 +328,8 @@ const generateApply = (
|
|
|
318
328
|
const domain = addReference(generator, getDomainOperator(expression));
|
|
319
329
|
return `${domain}(${generateExpression(generator, args[0], frame)})`;
|
|
320
330
|
}
|
|
321
|
-
if (builtin.name === "
|
|
322
|
-
|
|
323
|
-
const subset = addReference(generator, getSubsetOperator(expression, builtin));
|
|
331
|
+
if (builtin.name === "\\subseteq" && builtin.evaluateBinary && args.length === 2) {
|
|
332
|
+
const subset = addReference(generator, getSubsetOperator(expression, builtin.evaluateBinary));
|
|
324
333
|
return `${subset}(${generateExpression(generator, args[0], frame)}, ${generateExpression(generator, args[1], frame)})`;
|
|
325
334
|
}
|
|
326
335
|
const environment = generator.environment;
|
|
@@ -440,12 +449,16 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
|
|
|
440
449
|
generator,
|
|
441
450
|
fields.map((field) => field.name),
|
|
442
451
|
);
|
|
443
|
-
const values = `[${fields.map((field) => generate(field.value)).join(", ")}]`;
|
|
452
|
+
const values = `[${expression.fields.map((field) => generate(field.value)).join(", ")}]`;
|
|
444
453
|
const writtenNames = expression.fields.map((field) => field.name);
|
|
445
454
|
if (writtenNames.every((name, index) => name === fields[index].name)) {
|
|
446
455
|
return `record(${names}, ${values})`;
|
|
447
456
|
}
|
|
448
|
-
|
|
457
|
+
const writtenIndexes = addReference(
|
|
458
|
+
generator,
|
|
459
|
+
fields.map((field) => expression.fields.indexOf(field)),
|
|
460
|
+
);
|
|
461
|
+
return `writtenRecord(${names}, ${writtenIndexes}, ${values}, ${addReference(generator, writtenNames)})`;
|
|
449
462
|
}
|
|
450
463
|
case "Tuple":
|
|
451
464
|
return `tuple([${expression.elements.map((element) => generate(element)).join(", ")}])`;
|