tla-ts 0.0.10-dev.99796fe03 → 0.0.10-dev.a17d6d9fa

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (226) hide show
  1. package/dist/compile.cjs +3 -3
  2. package/dist/compile.js +1 -1
  3. package/dist/deciders.cjs +36 -36
  4. package/dist/deciders.js +54 -54
  5. package/dist/index.cjs +1 -1
  6. package/dist/index.d.cts +3 -2
  7. package/dist/index.d.ts +3 -2
  8. package/dist/index.js +1 -1
  9. package/dist/parallel-worker.cjs +1 -1
  10. package/dist/parallel-worker.js +1 -1
  11. package/dist/prove-worker.cjs +1 -1
  12. package/dist/prove-worker.js +1 -1
  13. package/dist/prove.cjs +60 -60
  14. package/dist/prove.js +78 -78
  15. package/dist/run.cjs +42 -44
  16. package/dist/run.js +44 -46
  17. package/dist/tlapm.cjs +1 -1
  18. package/dist/tlapm.js +2 -2
  19. package/dist/transfer.cjs +43 -43
  20. package/dist/transfer.js +39 -39
  21. package/dist/worker.cjs +6 -6
  22. package/dist/worker.js +6 -6
  23. package/package.json +1 -1
  24. package/src/ast.ts +1 -0
  25. package/src/bags.ts +50 -29
  26. package/src/builtins.ts +4 -3
  27. package/src/check-failure.ts +1 -1
  28. package/src/check-trace.ts +90 -51
  29. package/src/check.ts +367 -178
  30. package/src/cli/runtime-invariants.ts +20 -56
  31. package/src/cli/tlc-arguments.ts +2 -2
  32. package/src/cli/tlc-output.ts +1 -2
  33. package/src/cli/tlc.ts +16 -10
  34. package/src/cli/xml-exporter.ts +1 -1
  35. package/src/codegen.ts +26 -9
  36. package/src/dependencies.ts +49 -9
  37. package/src/dfid.ts +22 -10
  38. package/src/environment.ts +58 -33
  39. package/src/errors.ts +7 -0
  40. package/src/evaluate.ts +117 -41
  41. package/src/exit-codes.ts +4 -2
  42. package/src/instances.ts +5 -5
  43. package/src/java-hash.ts +14 -0
  44. package/src/java-overrides.ts +2 -2
  45. package/src/levels.ts +138 -90
  46. package/src/liveness-checker.ts +81 -33
  47. package/src/liveness.ts +49 -11
  48. package/src/obligations/index.ts +1 -1
  49. package/src/obligations/normalize.ts +1 -4
  50. package/src/obligations/printer.ts +5 -5
  51. package/src/parallel-worker.ts +8 -2
  52. package/src/parallel.ts +5 -0
  53. package/src/parser.ts +112 -145
  54. package/src/prover/isabelle/isar/attrib.ts +4 -4
  55. package/src/prover/isabelle/isar/rule-cases.ts +8 -6
  56. package/src/prover/isabelle/provers/clasimp.ts +1 -1
  57. package/src/prover/isabelle/provers/hypsubst.ts +2 -2
  58. package/src/prover/isabelle/pure/rewriter.ts +3 -3
  59. package/src/prover/isabelle/pure/term.ts +3 -3
  60. package/src/prover/prep/md5.ts +26 -29
  61. package/src/prover/smt/rewrite.ts +2 -7
  62. package/src/prover/smt/simplify.ts +1 -1
  63. package/src/prover/smt/solver/arith-rewriter.ts +11 -3
  64. package/src/prover/smt/solver/array-rewriter.ts +12 -2
  65. package/src/prover/smt/solver/asserted-formulas.ts +169 -58
  66. package/src/prover/smt/solver/ast-lt.ts +1 -1
  67. package/src/prover/smt/solver/ast.ts +63 -14
  68. package/src/prover/smt/solver/auf-solver.ts +23 -12
  69. package/src/prover/smt/solver/bit-blast-tactic.ts +26 -0
  70. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  71. package/src/prover/smt/solver/bound-simplifier.ts +11 -13
  72. package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
  73. package/src/prover/smt/solver/bv-rewriter.ts +1 -1
  74. package/src/prover/smt/solver/card2bv.ts +32 -18
  75. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
  76. package/src/prover/smt/solver/context.ts +47 -9
  77. package/src/prover/smt/solver/ctx-simplify.ts +1 -2
  78. package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
  79. package/src/prover/smt/solver/dependent-expr-state.ts +9 -4
  80. package/src/prover/smt/solver/diff-neq.ts +1 -2
  81. package/src/prover/smt/solver/elim-bounds.ts +89 -0
  82. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  83. package/src/prover/smt/solver/elim-uncnstr.ts +5 -8
  84. package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
  85. package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
  86. package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
  87. package/src/prover/smt/solver/euf/egraph.ts +4 -11
  88. package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
  89. package/src/prover/smt/solver/euf/mam.ts +1 -5
  90. package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
  91. package/src/prover/smt/solver/euf/th-solver.ts +0 -7
  92. package/src/prover/smt/solver/expr2polynomial.ts +204 -79
  93. package/src/prover/smt/solver/factor.ts +36 -14
  94. package/src/prover/smt/solver/fd-solver.ts +2 -0
  95. package/src/prover/smt/solver/fix-dl-var.ts +1 -2
  96. package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
  97. package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
  98. package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
  99. package/src/prover/smt/solver/goal.ts +6 -3
  100. package/src/prover/smt/solver/goal2nlsat.ts +57 -30
  101. package/src/prover/smt/solver/hashtable.ts +4 -0
  102. package/src/prover/smt/solver/internalizer.ts +1 -1
  103. package/src/prover/smt/solver/logic-tactics.ts +9 -2
  104. package/src/prover/smt/solver/lp/lp-settings.ts +5 -1
  105. package/src/prover/smt/solver/lp/nla-core.ts +1 -1
  106. package/src/prover/smt/solver/lp/nla-grobner.ts +2 -2
  107. package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
  108. package/src/prover/smt/solver/lp/pdd.ts +2 -3
  109. package/src/prover/smt/solver/lp/union-find.ts +1 -1
  110. package/src/prover/smt/solver/mam-compiler.ts +1 -1
  111. package/src/prover/smt/solver/model-based-opt.ts +1 -1
  112. package/src/prover/smt/solver/model-evaluator.ts +2 -0
  113. package/src/prover/smt/solver/model-generator.ts +85 -43
  114. package/src/prover/smt/solver/mpf.ts +2 -4
  115. package/src/prover/smt/solver/mus.ts +2 -3
  116. package/src/prover/smt/solver/muz/dl-context.ts +10 -4
  117. package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
  118. package/src/prover/smt/solver/muz/dl-rule.ts +2 -2
  119. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
  120. package/src/prover/smt/solver/muz/horn-tactic.ts +1 -1
  121. package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
  122. package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
  123. package/src/prover/smt/solver/nlqsat.ts +1 -1
  124. package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
  125. package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
  126. package/src/prover/smt/solver/nlsat/explain.ts +375 -217
  127. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
  128. package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
  129. package/src/prover/smt/solver/nlsat/solver.ts +74 -64
  130. package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
  131. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
  132. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
  133. package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
  134. package/src/prover/smt/solver/nnf.ts +6 -2
  135. package/src/prover/smt/solver/opt-context.ts +20 -7
  136. package/src/prover/smt/solver/opt-nlsat.ts +29 -18
  137. package/src/prover/smt/solver/opt-pareto.ts +19 -0
  138. package/src/prover/smt/solver/opt-preprocess.ts +1 -1
  139. package/src/prover/smt/solver/opt-solver.ts +9 -5
  140. package/src/prover/smt/solver/optsmt.ts +1 -1
  141. package/src/prover/smt/solver/pb-rewriter.ts +1 -4
  142. package/src/prover/smt/solver/poly-rewriter.ts +75 -18
  143. package/src/prover/smt/solver/probes.ts +88 -23
  144. package/src/prover/smt/solver/proto-model.ts +8 -8
  145. package/src/prover/smt/solver/push-app-ite.ts +37 -0
  146. package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
  147. package/src/prover/smt/solver/qe-lite.ts +2 -2
  148. package/src/prover/smt/solver/qe.ts +3 -2
  149. package/src/prover/smt/solver/qsat.ts +16 -6
  150. package/src/prover/smt/solver/quantifier-manager.ts +14 -9
  151. package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
  152. package/src/prover/smt/solver/rewriter.ts +31 -25
  153. package/src/prover/smt/solver/rlimit.ts +4 -0
  154. package/src/prover/smt/solver/sat/config.ts +1 -1
  155. package/src/prover/smt/solver/sat/goal2sat.ts +0 -1
  156. package/src/prover/smt/solver/sat/inc-sat-solver.ts +39 -5
  157. package/src/prover/smt/solver/sat/model-converter.ts +1 -1
  158. package/src/prover/smt/solver/sat/pb-solver.ts +1 -1
  159. package/src/prover/smt/solver/sat/sat-tactic.ts +13 -5
  160. package/src/prover/smt/solver/sat/simplifier.ts +1 -1
  161. package/src/prover/smt/solver/sat/solver.ts +25 -47
  162. package/src/prover/smt/solver/seq-axioms.ts +20 -35
  163. package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
  164. package/src/prover/smt/solver/seq-derive.ts +2 -2
  165. package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
  166. package/src/prover/smt/solver/seq-monadic.ts +7 -5
  167. package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
  168. package/src/prover/smt/solver/seq-re-util.ts +1 -1
  169. package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
  170. package/src/prover/smt/solver/seq-regex-live.ts +2 -2
  171. package/src/prover/smt/solver/seq-rewriter.ts +31 -29
  172. package/src/prover/smt/solver/seq-skolem.ts +0 -23
  173. package/src/prover/smt/solver/seq-view-witness.ts +4 -4
  174. package/src/prover/smt/solver/smt-kernel.ts +39 -5
  175. package/src/prover/smt/solver/smt-setup.ts +96 -10
  176. package/src/prover/smt/solver/smtlib-parser.ts +584 -223
  177. package/src/prover/smt/solver/smtlib-script.ts +509 -154
  178. package/src/prover/smt/solver/solve-eqs.ts +36 -37
  179. package/src/prover/smt/solver/solver.ts +18 -3
  180. package/src/prover/smt/solver/tactic.ts +284 -168
  181. package/src/prover/smt/solver/theory-bv.ts +13 -3
  182. package/src/prover/smt/solver/theory-fpa.ts +1 -1
  183. package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
  184. package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
  185. package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
  186. package/src/prover/smt/solver/theory-lra.ts +1 -1
  187. package/src/prover/smt/solver/theory-pb.ts +24 -7
  188. package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
  189. package/src/prover/smt/solver/theory-seq-state.ts +2 -21
  190. package/src/prover/smt/solver/tseitin-cnf.ts +1 -0
  191. package/src/prover/tlapm/cache.ts +8 -8
  192. package/src/prover/zenon/index-table.ts +5 -2
  193. package/src/prover/zenon/isar-case.ts +1 -1
  194. package/src/prover/zenon/isar.ts +2 -2
  195. package/src/prover/zenon/phrase.ts +1 -1
  196. package/src/resolve.ts +959 -243
  197. package/src/runtime.ts +7 -1
  198. package/src/sany/builtins.ts +10 -10
  199. package/src/sany/generation.ts +2 -13
  200. package/src/sany/generator-definitions.ts +3 -1
  201. package/src/sany/generator-expressions.ts +36 -30
  202. package/src/sany/generator-proofs.ts +5 -3
  203. package/src/sany/generator.ts +2 -1
  204. package/src/sany/lexer.ts +3 -3
  205. package/src/sany/modules.ts +4 -2
  206. package/src/sany/nodes.ts +1 -1
  207. package/src/sany/selectors.ts +11 -6
  208. package/src/sany/xml.ts +2 -3
  209. package/src/search.ts +166 -101
  210. package/src/simulate.ts +110 -50
  211. package/src/spec-description.ts +5 -6
  212. package/src/standard-modules.ts +15 -6
  213. package/src/subexpressions.ts +398 -108
  214. package/src/successors.ts +4 -2
  215. package/src/symmetry.ts +1 -1
  216. package/src/tlc/jar-data.ts +10 -0
  217. package/src/tlc/messages.ts +3 -3
  218. package/src/tlc/order.ts +14 -3
  219. package/src/tlc/random.ts +2 -1
  220. package/src/tlc/replay.ts +3 -2
  221. package/src/tlc/tlc-operators.ts +10 -8
  222. package/src/tlc/tlcext-operators.ts +44 -15
  223. package/src/tlc/trace-spec.ts +9 -22
  224. package/src/typed-tier.ts +32 -25
  225. package/src/typescript/types.ts +2 -2
  226. package/src/values.ts +135 -78
@@ -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 { RuntimeInvariant } from "./tlc-arguments";
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 getDebuggerExpressionLevel = (
35
- root: string,
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(text);
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(text, loadModule, {
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
- // Deviation from TLC: TLC puts a generated operator in a module that extends the root module.
88
- export const addRuntimeInvariants = (
80
+ export const getRuntimeInvariants = (
89
81
  source: string,
90
82
  root: ModuleNode,
91
- invariants: RuntimeInvariant[],
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
- const variable = root.context.symbols.find(
107
- (symbol) => symbol.kind === "OpDecl" && symbol.declKind === VARIABLE_DECL_KIND,
108
- );
109
- const definitions = generated.map((invariant) => {
110
- const head = `${invariant.name} == `;
111
- const level = getDebuggerExpressionLevel(
112
- root.name,
113
- invariant.name,
114
- invariant.expression,
115
- loadDependency,
116
- version,
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
  };
@@ -35,11 +35,11 @@ export interface TlcArguments {
35
35
  suppressedCodes: number[];
36
36
  errorCodes: number[];
37
37
  userFile: string | undefined;
38
- invariants: RuntimeInvariant[];
38
+ invariants: RuntimeInvariantTemplate[];
39
39
  moduleOperators: ModuleOperator[];
40
40
  }
41
41
 
42
- export interface RuntimeInvariant {
42
+ export interface RuntimeInvariantTemplate {
43
43
  modules: string[];
44
44
  expression: string;
45
45
  }
@@ -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
  }
package/src/cli/tlc.ts CHANGED
@@ -29,7 +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 { StandardInput } from "../search";
32
+ import type { CliSettings } from "../search";
33
33
  import type { StateDump } from "../state-graph";
34
34
  import {
35
35
  getSanyStandardModules,
@@ -49,7 +49,7 @@ import {
49
49
  type MessagePrinter,
50
50
  zeroPad,
51
51
  } from "../tlc/messages";
52
- import { addRuntimeInvariants } from "./runtime-invariants";
52
+ import { getRuntimeInvariants } from "./runtime-invariants";
53
53
  import { parseTlcArguments, type TlcArguments } from "./tlc-arguments";
54
54
  import {
55
55
  getClassPath,
@@ -280,8 +280,9 @@ const checkSpec = async (
280
280
  } else {
281
281
  printError(error, printer);
282
282
  }
283
- printFinished();
284
- return getTopLevelExitCode(error);
283
+ const exitCode = getTopLevelExitCode(error);
284
+ if (exitCode !== EXIT_STATUS.abort) printFinished();
285
+ return exitCode;
285
286
  };
286
287
  const config = (() => {
287
288
  try {
@@ -378,15 +379,14 @@ const checkSpec = async (
378
379
  }
379
380
  const userFile = args.userFile;
380
381
  const standardModules = getSanyStandardModules(version);
381
- const invariants = addRuntimeInvariants(
382
+ const runtimeInvariants = getRuntimeInvariants(
382
383
  source,
383
384
  specification.root,
384
385
  args.invariants,
385
386
  (name) => loadModule(name) ?? standardModules.get(name) ?? extractModule(source, name),
386
387
  version,
387
388
  );
388
- config.invariants.push(...invariants.names);
389
- const options: CheckOptions & StandardInput = {
389
+ const options: CheckOptions & CliSettings = {
390
390
  workers: args.workers,
391
391
  livenessCheck:
392
392
  livenessCheck === "off"
@@ -410,11 +410,17 @@ const checkSpec = async (
410
410
  version,
411
411
  onProgress: (progress) => printCheckProgress(printer, progress, timing, directory),
412
412
  onPrint: userFile === undefined ? undefined : (text) => appendFileSync(userFile, `${text}\n`),
413
- source: invariants.source,
413
+ source,
414
414
  config,
415
415
  onPause: () => readSync(0, Buffer.alloc(1)),
416
416
  readLine: readStandardInputLine,
417
- loadModule,
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),
418
424
  loadClass: (name) => {
419
425
  const classPath = getClassPath(directory, name);
420
426
  return existsSync(classPath) ? readFileSync(classPath) : undefined;
@@ -586,7 +592,7 @@ export const checkSpecs = async (args: string[], java: JavaProperties) => {
586
592
  exitCodes.push(
587
593
  await reportErrors(async () => {
588
594
  const specPath = path.endsWith(".ts") ? await writeTypeScriptSpec(path) : path;
589
- // Deviation from TLC: TLC checks one spec, so tla-ts names each of several it checks.
595
+ // An extension: TLC refuses more than one spec, and tla-ts checks each one under its name.
590
596
  if (paths.length > 1) {
591
597
  console.log(`Checking ${basename(specPath)} with ${basename(specPath, ".tla")}.cfg`);
592
598
  }
@@ -52,7 +52,7 @@ const XML_EXPORT_USAGE = (() => {
52
52
  "",
53
53
  getBold("OPTIONS"),
54
54
  "",
55
- ...options.map(([flag, description]) => `\t${getBold(flag)}\n\t\t${description}`),
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
@@ -165,19 +165,31 @@ const getFreeNames = (expression: Expression, names = new Set<string>()) => {
165
165
  return names;
166
166
  };
167
167
 
168
- const getDelegateContext = (generator: Generator, expression: Expression, frame: Frame) => {
168
+ const getDelegateContext = (
169
+ generator: Generator,
170
+ expression: Expression,
171
+ frame: Frame,
172
+ isEveryLocalCaptured = false,
173
+ ) => {
169
174
  const freeNames = getFreeNames(expression);
170
- const captured = [...frame.locals].filter(([name]) => freeNames.has(name));
175
+ const captured = [...frame.locals].filter(
176
+ (entry) => isEveryLocalCaptured || freeNames.has(entry[0]),
177
+ );
171
178
  if (captured.length === 0) return frame.context;
172
179
  const names = addReference(
173
180
  generator,
174
- captured.map(([name]) => name),
181
+ captured.map((entry) => entry[0]),
175
182
  );
176
- return `extend(${frame.context}, ${names}, [${captured.map(([, local]) => local).join(", ")}])`;
183
+ return `extend(${frame.context}, ${names}, [${captured.map((entry) => entry[1]).join(", ")}])`;
177
184
  };
178
185
 
179
- const generateDelegate = (generator: Generator, expression: Expression, frame: Frame) =>
180
- `${addReference(generator, getEvaluator(expression, generator.environment))}(${getDelegateContext(generator, expression, frame)})`;
186
+ const generateDelegate = (
187
+ generator: Generator,
188
+ expression: Expression,
189
+ frame: Frame,
190
+ isEveryLocalCaptured = false,
191
+ ) =>
192
+ `${addReference(generator, getEvaluator(expression, generator.environment))}(${getDelegateContext(generator, expression, frame, isEveryLocalCaptured)})`;
181
193
 
182
194
  const generateHelper = (
183
195
  generator: Generator,
@@ -318,7 +330,8 @@ const generateApply = (
318
330
  const domain = addReference(generator, getDomainOperator(expression));
319
331
  return `${domain}(${generateExpression(generator, args[0], frame)})`;
320
332
  }
321
- if (builtin.name === "TLCEval") return generateDelegate(generator, expression, frame);
333
+ // TLC caches a constant TLCEval only where no name is bound, so the delegate sees every local.
334
+ if (builtin.name === "TLCEval") return generateDelegate(generator, expression, frame, true);
322
335
  if (builtin.name === "\\subseteq" && args.length === 2) {
323
336
  const subset = addReference(generator, getSubsetOperator(expression, builtin));
324
337
  return `${subset}(${generateExpression(generator, args[0], frame)}, ${generateExpression(generator, args[1], frame)})`;
@@ -440,12 +453,16 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
440
453
  generator,
441
454
  fields.map((field) => field.name),
442
455
  );
443
- const values = `[${fields.map((field) => generate(field.value)).join(", ")}]`;
456
+ const values = `[${expression.fields.map((field) => generate(field.value)).join(", ")}]`;
444
457
  const writtenNames = expression.fields.map((field) => field.name);
445
458
  if (writtenNames.every((name, index) => name === fields[index].name)) {
446
459
  return `record(${names}, ${values})`;
447
460
  }
448
- return `writtenRecord(${names}, ${values}, ${addReference(generator, writtenNames)})`;
461
+ const writtenIndexes = addReference(
462
+ generator,
463
+ fields.map((field) => expression.fields.indexOf(field)),
464
+ );
465
+ return `writtenRecord(${names}, ${writtenIndexes}, ${values}, ${addReference(generator, writtenNames)})`;
449
466
  }
450
467
  case "Tuple":
451
468
  return `tuple([${expression.elements.map((element) => generate(element)).join(", ")}])`;
@@ -29,6 +29,7 @@ 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;
32
33
 
33
34
  const ACTION_KINDS = new Set<Expression["kind"]>([
34
35
  "Prime",
@@ -80,6 +81,7 @@ interface Edge {
80
81
  callee: Definition;
81
82
  isOverridden: boolean;
82
83
  isLevelCounted: boolean;
84
+ isOperatorArgument: boolean;
83
85
  }
84
86
 
85
87
  const collectLocalFacts = (
@@ -104,20 +106,27 @@ const collectLocalFacts = (
104
106
  }
105
107
  return undefined;
106
108
  };
107
- const visit = (node: Expression, isLevelCounted: boolean) => {
109
+ const visit = (node: Expression, isLevelCounted: boolean, isOperatorArgument: boolean) => {
108
110
  const kind = node.kind;
111
+ // TLC's getLevelBound takes an operator argument for a constant.
112
+ const nonconstantFlags = isOperatorArgument ? NONCONSTANT : NONCONSTANT | ABOVE_CONSTANT_BOUND;
109
113
  if (
110
114
  NONCONSTANT_KINDS.has(kind) ||
111
115
  (kind === "UnboundedQuantifier" && node.isTemporal === true) ||
112
116
  (kind === "Apply" && NONCONSTANT_OPERATORS.has(node.operator))
113
117
  ) {
114
- row[0] |= NONCONSTANT;
118
+ row[0] |= nonconstantFlags;
115
119
  }
116
120
  if (NONCONSTANT_KINDS.has(kind)) row[0] |= READS_IMPURE;
117
121
  const ownLevelFlags = getOwnLevelFlags(node);
118
122
  if (isLevelCounted && ownLevelFlags !== undefined) row[0] |= ownLevelFlags;
119
123
  const isInnerLevelCounted = isLevelCounted && ownLevelFlags === undefined;
120
124
  const name = getReferencedName(node);
125
+ // TLC's getLevelBound takes a parameter named like a variable for that variable.
126
+ if (name !== undefined && isLocallyResolved(node) && environment.variableIndex.has(name)) {
127
+ if (!isOperatorArgument) row[0] |= ABOVE_CONSTANT_BOUND;
128
+ if (isInnerLevelCounted) row[0] |= VARIABLE_LEVEL_FLAGS;
129
+ }
121
130
  if (name !== undefined && !isLocallyResolved(node)) {
122
131
  const target = environment.substitutions.get(name) ?? name;
123
132
  const definition = environment.definitions.get(target);
@@ -128,14 +137,24 @@ const collectLocalFacts = (
128
137
  environment.builtins.get(name)?.isStateLevel ||
129
138
  (definition && environment.variableIndex.has(definition.name))
130
139
  ) {
131
- row[0] |= NONCONSTANT;
140
+ row[0] |= nonconstantFlags;
132
141
  }
133
142
  if (variableIndex !== undefined) {
134
143
  if (isInnerLevelCounted) row[0] |= VARIABLE_LEVEL_FLAGS;
135
144
  if (!isOverridden) row[1 + (variableIndex >>> 5)] |= 1 << (variableIndex & 31);
136
145
  }
137
146
  if (definition) {
138
- edges.push({ callee: definition, isOverridden, isLevelCounted: isInnerLevelCounted });
147
+ edges.push({
148
+ callee: definition,
149
+ isOverridden,
150
+ isLevelCounted: isInnerLevelCounted,
151
+ isOperatorArgument:
152
+ isOperatorArgument ||
153
+ kind === "OperatorReference" ||
154
+ (kind === "Identifier" &&
155
+ definition.kind === "Operator" &&
156
+ definition.params.length > 0),
157
+ });
139
158
  } else {
140
159
  if (isImpureBuiltin(name, environment)) {
141
160
  row[0] |= IMPURE | (name === "Assert" ? 0 : REPEATED_EFFECT);
@@ -155,9 +174,11 @@ const collectLocalFacts = (
155
174
  }
156
175
  }
157
176
  }
158
- getChildren(node).forEach((child) => visit(child, isInnerLevelCounted));
177
+ getChildren(node).forEach((child) =>
178
+ visit(child, isInnerLevelCounted, isOperatorArgument || kind === "Lambda"),
179
+ );
159
180
  };
160
- expressions.forEach((expression) => visit(expression, true));
181
+ expressions.forEach((expression) => visit(expression, true, false));
161
182
  return { row, edges };
162
183
  };
163
184
 
@@ -230,9 +251,10 @@ const closeRows = (local: Uint32Array, words: number, edges: Int32Array[], mask:
230
251
 
231
252
  const PURITY_MASK = IMPURE | REPEATED_EFFECT | STREAMED | RANDOM;
232
253
  const READ_MASK = NONCONSTANT | READS_IMPURE;
254
+ const STARTUP_MASK = NONCONSTANT | ABOVE_CONSTANT_BOUND;
233
255
 
234
256
  const isEvaluatedOnce = (definition: Definition, flags: number) =>
235
- definition.kind === "Operator" && definition.params.length === 0 && (flags & NONCONSTANT) === 0;
257
+ definition.kind === "Operator" && definition.params.length === 0 && (flags & STARTUP_MASK) === 0;
236
258
 
237
259
  export const createDefinitionFacts = (environment: DefinitionNames): DefinitionFacts => {
238
260
  const definitions = [...new Set(environment.definitions.values())];
@@ -256,18 +278,32 @@ export const createDefinitionFacts = (environment: DefinitionNames): DefinitionF
256
278
  new Int32Array(own.filter((edge) => !edge.isOverridden && edge.isLevelCounted).map(getId)),
257
279
  );
258
280
  const levels = closeRows(local, words, levelEdges, TEMPORAL_LEVEL_FLAGS);
281
+ const startupEdges = edges.map(
282
+ (own) =>
283
+ new Int32Array(
284
+ own.filter((edge) => !edge.isOverridden && !edge.isOperatorArgument).map(getId),
285
+ ),
286
+ );
287
+ const startup = closeRows(local, words, startupEdges, ABOVE_CONSTANT_BOUND);
259
288
  const purityEdges = edges.map(
260
289
  (own) =>
261
290
  new Int32Array(
262
291
  own
263
292
  .map(getId)
264
- .filter((callee) => !isEvaluatedOnce(definitions[callee], reads[callee * words])),
293
+ .filter(
294
+ (callee) =>
295
+ !isEvaluatedOnce(
296
+ definitions[callee],
297
+ reads[callee * words] | startup[callee * words],
298
+ ),
299
+ ),
265
300
  ),
266
301
  );
267
302
  const purity = closeRows(localImpurity, words, purityEdges, PURITY_MASK);
268
303
  const rows = reads.map((word, position) =>
269
304
  position % words === 0
270
305
  ? (word & READ_MASK) |
306
+ (startup[position] & ABOVE_CONSTANT_BOUND) |
271
307
  (levels[position] & TEMPORAL_LEVEL_FLAGS) |
272
308
  (purity[position] & PURITY_MASK)
273
309
  : word,
@@ -291,6 +327,7 @@ const getExpressionsRow = (expressions: Expression[], environment: Environment)
291
327
  const callee = getRow(edge.callee, environment);
292
328
  if (!edge.isOverridden) {
293
329
  row[0] |= callee[0] & READ_MASK;
330
+ if (!edge.isOperatorArgument) row[0] |= callee[0] & ABOVE_CONSTANT_BOUND;
294
331
  if (edge.isLevelCounted) row[0] |= callee[0] & TEMPORAL_LEVEL_FLAGS;
295
332
  for (let word = 1; word < words; word++) row[word] |= callee[word];
296
333
  }
@@ -300,7 +337,10 @@ const getExpressionsRow = (expressions: Expression[], environment: Environment)
300
337
  };
301
338
 
302
339
  export const isConstantLevel = (definition: Definition, environment: Environment) =>
303
- (getRow(definition, environment)[0] & NONCONSTANT) === 0;
340
+ (getRow(definition, environment)[0] & STARTUP_MASK) === 0;
341
+
342
+ export const isEvaluatedAtStartup = (definition: Definition, environment: Environment) =>
343
+ (getRow(definition, environment)[0] & ABOVE_CONSTANT_BOUND) === 0;
304
344
 
305
345
  const EFFECT_FLAGS = {
306
346
  any: IMPURE,
package/src/dfid.ts CHANGED
@@ -15,7 +15,7 @@ import { EXIT_STATUS, getMessageExitStatus, withLivenessExitCode } from "./exit-
15
15
  import { createLivenessChecker } from "./liveness-checker";
16
16
  import { getIncompleteSuccessorMessage, prepareSearch, reportAssumptionViolation } from "./search";
17
17
  import type { SpecAction } from "./spec-description";
18
- import { forEachInitialState, forEachSuccessor } from "./successors";
18
+ import { forEachInitialState, forEachSuccessor, getSuccessors } from "./successors";
19
19
  import {
20
20
  formatNestedMessage,
21
21
  formatTlcDate,
@@ -28,7 +28,7 @@ import {
28
28
  import { getTlcFingerprint } from "./tlc/fingerprint";
29
29
  import { replaySuccessors } from "./tlc/replay";
30
30
  import { getOptimisticProbability, getActualProbability } from "./tlc/summary";
31
- import { createModelValue, formatState, getSetBound, type Value } from "./values";
31
+ import { createModelValue, formatState, getSetBound, isSameValue, type Value } from "./values";
32
32
 
33
33
  export interface DepthFirstOptions extends CheckOptions {
34
34
  maxDepth: number;
@@ -131,7 +131,7 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
131
131
  withUnexpectedException(() =>
132
132
  createLivenessChecker(temporalProperties, search.spec.temporals, environment, {
133
133
  getFingerprint: () => 0,
134
- getSuccessors: () => [],
134
+ forEachActionSuccessors: () => {},
135
135
  }),
136
136
  ),
137
137
  )?.branches;
@@ -165,6 +165,13 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
165
165
  if (assumptionStatus !== undefined) return assumptionStatus;
166
166
 
167
167
  const nextActions = prepared.getDescription().actions;
168
+ // Deviation from TLC: TLCExt#pickSuccessor casts the DFID checker to ModelChecker and fails, so tla-ts asks as model checking does.
169
+ runtime.getSuccessorAction = (state, next) =>
170
+ nextActions.find((action) =>
171
+ getSuccessors(action.expression, state, environment, action.scope).some((successor) =>
172
+ successor.state.every((value, index) => isSameValue(value, next[index])),
173
+ ),
174
+ );
168
175
  const statuses = new Map<bigint, number>();
169
176
  const fingerprintSet = { level: 1, leveled: 0, buckets: INITIAL_BUCKETS };
170
177
  const setStatus = (fingerprint: bigint, status: number) => {
@@ -261,16 +268,21 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
261
268
  config.alias === undefined
262
269
  ? search.toRecord(state)
263
270
  : search.evaluateAlias(config.alias, state, state, isTool);
264
- const violated = isContinued
265
- ? search.getViolatedInvariants(state)
266
- : [search.findViolatedInvariant(state)].filter((invariant) => invariant !== undefined);
267
- for (const invariant of violated) {
271
+ const reportInvariant = (name: string) =>
268
272
  message(
269
273
  MESSAGE_CODE.invariantViolatedInitial,
270
- `Invariant ${invariant.name} is violated by the initial state:\n${formatState(alias())}`,
274
+ `Invariant ${name} is violated by the initial state:\n${formatState(alias())}`,
271
275
  );
272
- if (!isContinued) return MESSAGE_CODE.invariantViolatedInitial;
273
- checker.continuedCode = MESSAGE_CODE.invariantViolatedInitial;
276
+ if (isContinued) {
277
+ search.forEachViolatedInvariant(state, (invariant) => {
278
+ reportInvariant(invariant.name);
279
+ checker.continuedCode = MESSAGE_CODE.invariantViolatedInitial;
280
+ });
281
+ }
282
+ const violated = isContinued ? undefined : search.findViolatedInvariant(state);
283
+ if (violated) {
284
+ reportInvariant(violated.name);
285
+ return MESSAGE_CODE.invariantViolatedInitial;
274
286
  }
275
287
  const predicate = search.findFailedInitialPredicate(state);
276
288
  if (predicate) {