tla-ts 0.0.10-dev.d618a2d79 → 0.0.10-dev.e3e5dd576

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 (252) 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 +53 -53
  5. package/dist/index.cjs +1 -1
  6. package/dist/index.d.cts +18 -4
  7. package/dist/index.d.ts +18 -4
  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 +56 -56
  14. package/dist/prove.js +78 -78
  15. package/dist/run.cjs +40 -44
  16. package/dist/run.js +42 -46
  17. package/dist/tlapm.cjs +1 -1
  18. package/dist/tlapm.js +2 -2
  19. package/dist/transfer.cjs +49 -44
  20. package/dist/transfer.js +48 -43
  21. package/dist/worker.cjs +7 -7
  22. package/dist/worker.js +7 -7
  23. package/package.json +1 -1
  24. package/src/ast.ts +14 -2
  25. package/src/bags.ts +50 -29
  26. package/src/builtins.ts +4 -3
  27. package/src/check-failure.ts +13 -11
  28. package/src/check-trace.ts +116 -64
  29. package/src/check.ts +516 -280
  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 +18 -4
  33. package/src/cli/tlc.ts +18 -12
  34. package/src/cli/xml-exporter.ts +1 -1
  35. package/src/codegen.ts +23 -10
  36. package/src/coverage.ts +190 -1
  37. package/src/dependencies.ts +68 -15
  38. package/src/dfid.ts +101 -36
  39. package/src/environment.ts +123 -38
  40. package/src/errors.ts +7 -0
  41. package/src/evaluate.ts +370 -99
  42. package/src/exit-codes.ts +28 -14
  43. package/src/instances.ts +135 -11
  44. package/src/java-hash.ts +14 -0
  45. package/src/java-overrides.ts +2 -2
  46. package/src/levels.ts +675 -236
  47. package/src/lexer.ts +12 -2
  48. package/src/liveness-checker.ts +179 -60
  49. package/src/liveness.ts +51 -10
  50. package/src/obligations/index.ts +1 -1
  51. package/src/obligations/normalize.ts +1 -4
  52. package/src/obligations/printer.ts +5 -5
  53. package/src/obligations/source.ts +2 -0
  54. package/src/parallel-worker.ts +8 -2
  55. package/src/parallel.ts +5 -0
  56. package/src/parser.ts +180 -149
  57. package/src/prover/isabelle/isar/attrib.ts +4 -4
  58. package/src/prover/isabelle/isar/rule-cases.ts +8 -6
  59. package/src/prover/isabelle/provers/clasimp.ts +1 -1
  60. package/src/prover/isabelle/provers/hypsubst.ts +2 -2
  61. package/src/prover/isabelle/pure/rewriter.ts +3 -3
  62. package/src/prover/isabelle/pure/term.ts +3 -3
  63. package/src/prover/prep/md5.ts +26 -29
  64. package/src/prover/smt/rewrite.ts +2 -7
  65. package/src/prover/smt/simplify.ts +1 -1
  66. package/src/prover/smt/solver/arith-rewriter.ts +11 -3
  67. package/src/prover/smt/solver/array-rewriter.ts +12 -2
  68. package/src/prover/smt/solver/asserted-formulas.ts +171 -58
  69. package/src/prover/smt/solver/ast-lt.ts +1 -1
  70. package/src/prover/smt/solver/ast.ts +66 -14
  71. package/src/prover/smt/solver/auf-solver.ts +23 -12
  72. package/src/prover/smt/solver/bit-blast-tactic.ts +27 -1
  73. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  74. package/src/prover/smt/solver/bound-simplifier.ts +11 -13
  75. package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
  76. package/src/prover/smt/solver/bv-rewriter.ts +1 -1
  77. package/src/prover/smt/solver/card2bv.ts +35 -18
  78. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
  79. package/src/prover/smt/solver/context.ts +84 -15
  80. package/src/prover/smt/solver/ctx-simplify.ts +1 -2
  81. package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
  82. package/src/prover/smt/solver/dependent-expr-state.ts +28 -16
  83. package/src/prover/smt/solver/diff-neq.ts +1 -2
  84. package/src/prover/smt/solver/dt2bv-tactic.ts +57 -21
  85. package/src/prover/smt/solver/elim-bounds.ts +89 -0
  86. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  87. package/src/prover/smt/solver/elim-uncnstr.ts +5 -8
  88. package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
  89. package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
  90. package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
  91. package/src/prover/smt/solver/euf/egraph.ts +4 -11
  92. package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
  93. package/src/prover/smt/solver/euf/mam.ts +1 -5
  94. package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
  95. package/src/prover/smt/solver/euf/th-solver.ts +0 -7
  96. package/src/prover/smt/solver/expr2polynomial.ts +204 -79
  97. package/src/prover/smt/solver/factor.ts +36 -14
  98. package/src/prover/smt/solver/fd-solver.ts +608 -139
  99. package/src/prover/smt/solver/fix-dl-var.ts +1 -2
  100. package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
  101. package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
  102. package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
  103. package/src/prover/smt/solver/goal.ts +6 -3
  104. package/src/prover/smt/solver/goal2nlsat.ts +57 -30
  105. package/src/prover/smt/solver/hashtable.ts +4 -0
  106. package/src/prover/smt/solver/internalizer.ts +1 -1
  107. package/src/prover/smt/solver/logic-tactics.ts +15 -5
  108. package/src/prover/smt/solver/lp/core-solver.ts +12 -8
  109. package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
  110. package/src/prover/smt/solver/lp/lp-settings.ts +6 -2
  111. package/src/prover/smt/solver/lp/nla-core.ts +1 -1
  112. package/src/prover/smt/solver/lp/nla-grobner.ts +158 -80
  113. package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
  114. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -2
  115. package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -20
  116. package/src/prover/smt/solver/lp/pdd-solver.ts +72 -39
  117. package/src/prover/smt/solver/lp/pdd.ts +725 -290
  118. package/src/prover/smt/solver/lp/union-find.ts +1 -1
  119. package/src/prover/smt/solver/mam-compiler.ts +1 -1
  120. package/src/prover/smt/solver/maxcore.ts +2 -1
  121. package/src/prover/smt/solver/maxsmt-base.ts +1 -0
  122. package/src/prover/smt/solver/model-based-opt.ts +1 -1
  123. package/src/prover/smt/solver/model-checker.ts +1 -1
  124. package/src/prover/smt/solver/model-evaluator.ts +2 -0
  125. package/src/prover/smt/solver/model-generator.ts +85 -43
  126. package/src/prover/smt/solver/mpf.ts +2 -4
  127. package/src/prover/smt/solver/mus.ts +2 -3
  128. package/src/prover/smt/solver/muz/dl-context.ts +22 -44
  129. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
  130. package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
  131. package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
  132. package/src/prover/smt/solver/muz/hnf.ts +2 -2
  133. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
  134. package/src/prover/smt/solver/muz/horn-tactic.ts +15 -2
  135. package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
  136. package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
  137. package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
  138. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -1
  139. package/src/prover/smt/solver/nlqsat.ts +1 -1
  140. package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
  141. package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
  142. package/src/prover/smt/solver/nlsat/explain.ts +375 -217
  143. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
  144. package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
  145. package/src/prover/smt/solver/nlsat/solver.ts +74 -64
  146. package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
  147. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
  148. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
  149. package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
  150. package/src/prover/smt/solver/nnf.ts +6 -2
  151. package/src/prover/smt/solver/opt-context.ts +21 -7
  152. package/src/prover/smt/solver/opt-nlsat.ts +29 -18
  153. package/src/prover/smt/solver/opt-pareto.ts +19 -0
  154. package/src/prover/smt/solver/opt-preprocess.ts +1 -1
  155. package/src/prover/smt/solver/opt-solver.ts +10 -6
  156. package/src/prover/smt/solver/optsmt.ts +1 -1
  157. package/src/prover/smt/solver/parallel-tactic.ts +1 -1
  158. package/src/prover/smt/solver/pb-rewriter.ts +1 -4
  159. package/src/prover/smt/solver/poly-rewriter.ts +75 -18
  160. package/src/prover/smt/solver/probes.ts +88 -23
  161. package/src/prover/smt/solver/proto-model.ts +8 -8
  162. package/src/prover/smt/solver/push-app-ite.ts +37 -0
  163. package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
  164. package/src/prover/smt/solver/qe-lite.ts +2 -2
  165. package/src/prover/smt/solver/qe.ts +3 -2
  166. package/src/prover/smt/solver/qsat.ts +23 -8
  167. package/src/prover/smt/solver/quantifier-manager.ts +14 -9
  168. package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
  169. package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
  170. package/src/prover/smt/solver/rewriter.ts +31 -25
  171. package/src/prover/smt/solver/rlimit.ts +7 -3
  172. package/src/prover/smt/solver/sat/config.ts +1 -1
  173. package/src/prover/smt/solver/sat/goal2sat.ts +65 -12
  174. package/src/prover/smt/solver/sat/inc-sat-solver.ts +129 -43
  175. package/src/prover/smt/solver/sat/model-converter.ts +1 -1
  176. package/src/prover/smt/solver/sat/pb-constraint.ts +7 -0
  177. package/src/prover/smt/solver/sat/pb-solver.ts +26 -7
  178. package/src/prover/smt/solver/sat/sat-tactic.ts +17 -7
  179. package/src/prover/smt/solver/sat/sat2goal.ts +72 -48
  180. package/src/prover/smt/solver/sat/simplifier.ts +1 -1
  181. package/src/prover/smt/solver/sat/solver.ts +27 -47
  182. package/src/prover/smt/solver/seq-axioms.ts +20 -35
  183. package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
  184. package/src/prover/smt/solver/seq-derive.ts +2 -2
  185. package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
  186. package/src/prover/smt/solver/seq-monadic.ts +7 -5
  187. package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
  188. package/src/prover/smt/solver/seq-re-util.ts +1 -1
  189. package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
  190. package/src/prover/smt/solver/seq-regex-live.ts +2 -2
  191. package/src/prover/smt/solver/seq-rewriter.ts +31 -29
  192. package/src/prover/smt/solver/seq-skolem.ts +0 -23
  193. package/src/prover/smt/solver/seq-view-witness.ts +4 -4
  194. package/src/prover/smt/solver/smt-consequences.ts +1 -1
  195. package/src/prover/smt/solver/smt-kernel.ts +48 -7
  196. package/src/prover/smt/solver/smt-setup.ts +106 -13
  197. package/src/prover/smt/solver/smtlib-parser.ts +589 -224
  198. package/src/prover/smt/solver/smtlib-script.ts +713 -210
  199. package/src/prover/smt/solver/solve-eqs.ts +36 -37
  200. package/src/prover/smt/solver/solver.ts +18 -3
  201. package/src/prover/smt/solver/tactic.ts +350 -195
  202. package/src/prover/smt/solver/theory-bv.ts +13 -3
  203. package/src/prover/smt/solver/theory-fpa.ts +1 -1
  204. package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
  205. package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
  206. package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
  207. package/src/prover/smt/solver/theory-lra-state.ts +1 -1
  208. package/src/prover/smt/solver/theory-lra.ts +1 -1
  209. package/src/prover/smt/solver/theory-pb.ts +24 -7
  210. package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
  211. package/src/prover/smt/solver/theory-seq-state.ts +2 -21
  212. package/src/prover/smt/solver/theory-without-terms.ts +24 -0
  213. package/src/prover/smt/solver/tseitin-cnf.ts +1 -0
  214. package/src/prover/tlapm/cache.ts +8 -8
  215. package/src/prover/zenon/index-table.ts +5 -2
  216. package/src/prover/zenon/isar-case.ts +1 -1
  217. package/src/prover/zenon/isar.ts +2 -2
  218. package/src/prover/zenon/phrase.ts +1 -1
  219. package/src/resolve.ts +1274 -257
  220. package/src/runtime.ts +7 -1
  221. package/src/sany/builtins.ts +10 -10
  222. package/src/sany/generation.ts +5 -15
  223. package/src/sany/generator-def-entries.ts +123 -36
  224. package/src/sany/generator-definitions.ts +5 -3
  225. package/src/sany/generator-expressions.ts +60 -37
  226. package/src/sany/generator-proofs.ts +18 -12
  227. package/src/sany/generator.ts +12 -6
  228. package/src/sany/lexer.ts +15 -7
  229. package/src/sany/modules.ts +4 -2
  230. package/src/sany/nodes.ts +1 -1
  231. package/src/sany/selectors.ts +11 -6
  232. package/src/sany/xml.ts +2 -3
  233. package/src/search.ts +319 -135
  234. package/src/simulate.ts +235 -182
  235. package/src/spec-description.ts +8 -6
  236. package/src/standard-definitions.ts +1 -0
  237. package/src/standard-modules.ts +56 -22
  238. package/src/subexpressions.ts +564 -138
  239. package/src/successors.ts +37 -13
  240. package/src/symmetry.ts +2 -1
  241. package/src/tlc/jar-data.ts +10 -0
  242. package/src/tlc/messages.ts +3 -3
  243. package/src/tlc/order.ts +14 -3
  244. package/src/tlc/random.ts +2 -1
  245. package/src/tlc/replay.ts +67 -43
  246. package/src/tlc/tlc-operators.ts +10 -8
  247. package/src/tlc/tlcext-operators.ts +44 -15
  248. package/src/tlc/trace-spec.ts +9 -22
  249. package/src/trace-liveness.ts +529 -0
  250. package/src/typed-tier.ts +52 -31
  251. package/src/typescript/types.ts +2 -2
  252. package/src/values.ts +150 -79
@@ -15,6 +15,7 @@ import {
15
15
  TlaUnsupportedError,
16
16
  } from "../errors";
17
17
  import { getTlcFingerprint } from "./fingerprint";
18
+ import { prettyPrint } from "../pretty-print";
18
19
  import { formatMessage, formatNestedMessage, MESSAGE_CODE, MESSAGE_LEVEL } from "./messages";
19
20
  import {
20
21
  describeRange,
@@ -37,11 +38,14 @@ import {
37
38
  createRecord,
38
39
  createSet,
39
40
  createTuple,
41
+ createWrittenFunction,
40
42
  formatState,
41
43
  formatValue,
42
44
  getFingerprintError,
43
45
  getSequenceElements,
44
46
  getValueKey,
47
+ rankString,
48
+ setFunctionClass,
45
49
  toFiniteSet,
46
50
  type Value,
47
51
  } from "../values";
@@ -63,19 +67,31 @@ export const createActionRecord = (action: string | undefined) =>
63
67
 
64
68
  const counterExamples = new WeakSet<Value & object>();
65
69
 
66
- const createCounterExampleRecord = (action: Value[], states: Value[]) => {
67
- const counterExample = createRecord([
70
+ export const createTlcRecord = (fields: [string, Value][]) =>
71
+ setFunctionClass(createWrittenFunction(fields), "record");
72
+
73
+ const createCounterExampleRecord = (action: Value[], states: Value[], isConsole = true) => {
74
+ // TLC's CounterExample interns its field names as the class loads, which orders them as strings.
75
+ ["state", "action", "console"].forEach(rankString);
76
+ const fields: [string, Value][] = [
68
77
  ["action", createSet(action)],
69
78
  ["state", createSet(states)],
70
- ]);
79
+ ];
80
+ const counterExample = createTlcRecord(isConsole ? fields : [...fields, ["console", false]]);
71
81
  counterExamples.add(counterExample);
72
82
  return counterExample;
73
83
  };
74
84
 
85
+ export interface CounterExampleLoop {
86
+ start: number;
87
+ action: Value;
88
+ }
89
+
75
90
  export const createCounterExample = (
76
91
  stateRecords: Record<string, Value>[],
77
92
  actions: Value[],
78
- loop: { start: number; action: Value } | undefined,
93
+ loop: CounterExampleLoop | undefined,
94
+ isConsole = true,
79
95
  ) => {
80
96
  const states = stateRecords.map((state, index) =>
81
97
  createTuple([index + 1, createRecord(Object.entries(state))]),
@@ -86,7 +102,7 @@ export const createCounterExample = (
86
102
  const closing = loop
87
103
  ? [createTuple([states[states.length - 1], loop.action, states[loop.start]])]
88
104
  : [];
89
- return createCounterExampleRecord([...steps, ...closing], states);
105
+ return createCounterExampleRecord([...steps, ...closing], states, isConsole);
90
106
  };
91
107
 
92
108
  const getRegister = (runtime: CheckerRuntime, key: Value) => {
@@ -126,7 +142,7 @@ export const setTlcValue = (
126
142
  return;
127
143
  }
128
144
  throw new TlaModuleError(
129
- `The first argument of TLCSet should be a nonnegative integer, but instead it is:\n${formatValue(key)}`,
145
+ `The first argument of TLCSet should be a nonnegative integer, but instead it is:\n${prettyPrint(formatValue(key))}`,
130
146
  );
131
147
  };
132
148
 
@@ -232,7 +248,7 @@ export const createTlcExtOperators = (
232
248
  const counterExample = getValue(args, 0, "ToTrace");
233
249
  if (typeof counterExample !== "object" || !counterExamples.has(counterExample)) {
234
250
  throw new TlaModuleError(
235
- `The argument of ToTrace should be a CounterExample, but instead it is:\n${formatValue(counterExample)}`,
251
+ `The argument of ToTrace should be a CounterExample, but instead it is:\n${prettyPrint(formatValue(counterExample))}`,
236
252
  );
237
253
  }
238
254
  const states = toFiniteSet(applyFunction(counterExample, "state")).elements.map(
@@ -246,7 +262,7 @@ export const createTlcExtOperators = (
246
262
  const name = getValue(args, 0, "TLCModelValue");
247
263
  if (typeof name !== "string") {
248
264
  throw new TlaModuleError(
249
- `The argument of ModelValue should be a string, but instead it is:\n${formatValue(name)}`,
265
+ `The argument of ModelValue should be a string, but instead it is:\n${prettyPrint(formatValue(name))}`,
250
266
  );
251
267
  }
252
268
  return createModelValue(name);
@@ -263,10 +279,13 @@ export const createTlcExtOperators = (
263
279
  defineOperator("TLCNoOp", 1, (args) => getValue(args, 0, "TLCNoOp")),
264
280
  {
265
281
  ...defineLazyOperator("PickSuccessor", 1, (args, context) => {
266
- // Deviation from TLC: TLCExt#pickSuccessor fingerprints a partial successor and fails, where TLCExt.tla promises TRUE.
267
282
  const next = context?.next ?? (context?.environment.variables ?? []).map(() => undefined);
268
- if (!isCompleteState(next)) return true;
269
- if (context?.next && runtime.isSeen(next)) return true;
283
+ // A simulation remembers no states, so TLC evaluates the guard before it looks at the successor.
284
+ if (runtime.getSimulationValue === undefined) {
285
+ // Deviation from TLC: TLCExt#pickSuccessor fingerprints a partial successor and fails, where TLCExt.tla promises TRUE.
286
+ if (!isCompleteState(next)) return true;
287
+ if (context?.next && runtime.isSeen(next)) return true;
288
+ }
270
289
  const guard = getOperator(args, 0, "PickSuccessor");
271
290
  const isPicked = guard.call([]);
272
291
  if (typeof isPicked !== "boolean") {
@@ -274,7 +293,13 @@ export const createTlcExtOperators = (
274
293
  `In evaluating TLCExt!PickSuccessor, a non-boolean expression (${getKindString(isPicked)}) was used as the condition of an IF.\n${guard.expression ? describeNode(guard.expression) : ""}`,
275
294
  );
276
295
  }
277
- if (isPicked || !context?.next || !context.state || !isCompleteState(context.state)) {
296
+ if (
297
+ isPicked ||
298
+ !context?.next ||
299
+ !isCompleteState(next) ||
300
+ !context.state ||
301
+ !isCompleteState(context.state)
302
+ ) {
278
303
  return true;
279
304
  }
280
305
  const state = context.state;
@@ -303,9 +328,13 @@ export const createTlcExtOperators = (
303
328
  } else if (answer[0] === "d") {
304
329
  printOverride(formatState(runtime.toRecord(next), runtime.toRecord(state)));
305
330
  } else if (answer[0] === "e") {
331
+ if (runtime.markExplored) {
332
+ runtime.markExplored(next);
333
+ return true;
334
+ }
306
335
  if (runtime.getSimulationValue === undefined) {
307
336
  throw new TlaUnsupportedError(
308
- "tla-ts can't mark a state explored while it checks a model.",
337
+ "tla-ts can't mark a state explored while it searches depth first.",
309
338
  );
310
339
  }
311
340
  printOverride(
@@ -348,7 +377,7 @@ export const createTlcExtOperators = (
348
377
  const name = getThunk(args, 0, "TLCEvalDefinition")();
349
378
  if (typeof name !== "string") {
350
379
  throw new TlaModuleError(
351
- `The argument of TLCEvalDefinition should be a string, but instead it is:\n${formatValue(name)}`,
380
+ `The argument of TLCEvalDefinition should be a string, but instead it is:\n${prettyPrint(formatValue(name))}`,
352
381
  );
353
382
  }
354
383
  const definition = context ? getDefinition(name, context.environment) : undefined;
@@ -356,7 +385,7 @@ export const createTlcExtOperators = (
356
385
  if (builtin?.arity === 0) return builtin.evaluate([], context);
357
386
  if (!definition || !context) {
358
387
  throw new TlaModuleError(
359
- `The argument of TLCEvalDefinition should be a name of a definition reachable from the root module, but instead it is:\n${formatValue(name)}`,
388
+ `The argument of TLCEvalDefinition should be a name of a definition reachable from the root module, but instead it is:\n${prettyPrint(formatValue(name))}`,
360
389
  );
361
390
  }
362
391
  if (definition.kind === "Operator" && definition.params.length > 0) {
@@ -1,4 +1,4 @@
1
- import { getJavaHashCode } from "../java-hash";
1
+ import { getHashMapOrder } from "../java-hash";
2
2
  import { formatValue, type Value } from "../values";
3
3
  import { zeroPad } from "./messages";
4
4
 
@@ -18,20 +18,6 @@ const CLOSING_TAG = `${"=".repeat(77)}\n`;
18
18
  const LASSO_START = "_TTraceLassoStart";
19
19
  const LASSO_END = "_TTraceLassoEnd";
20
20
 
21
- const getHashMapHash = (text: string) => {
22
- const hash = getJavaHashCode(text);
23
- return hash ^ (hash >>> 16);
24
- };
25
-
26
- const getHashOrder = (names: string[]) => {
27
- const unique = [...new Set(names)];
28
- const capacity = 2 ** Math.max(4, Math.ceil(Math.log2(unique.length / 0.75)));
29
- return unique
30
- .map((name, index) => ({ name, index, bucket: getHashMapHash(name) & (capacity - 1) }))
31
- .sort((left, right) => left.bucket - right.bucket || left.index - right.index)
32
- .map((entry) => entry.name);
33
- };
34
-
35
21
  const formatJavaDate = (date: Date) => {
36
22
  const getPart = (options: Intl.DateTimeFormatOptions, type: Intl.DateTimeFormatPartTypes) =>
37
23
  new Intl.DateTimeFormat("en-US", options).formatToParts(date).find((part) => part.type === type)
@@ -57,7 +43,7 @@ const getConjunction = (state: [string, string][], prefix?: string) =>
57
43
  indent(
58
44
  [
59
45
  ...(prefix === undefined ? [] : [prefix]),
60
- ...state.map(([name, value]) => `${name} = (${value})`),
46
+ ...state.map((assignment) => `${assignment[0]} = (${assignment[1]})`),
61
47
  ].join("\n/\\\n"),
62
48
  2,
63
49
  );
@@ -102,7 +88,7 @@ ${examples}`;
102
88
  export const writeTraceSpec = (input: TraceSpecInput) => {
103
89
  const loopStart = input.loopStart;
104
90
  const states = input.states.map((state) =>
105
- getHashOrder(Object.keys(state)).map((name): [string, string] => [
91
+ getHashMapOrder(Object.keys(state)).map((name): [string, string] => [
106
92
  name,
107
93
  formatValue(state[name]),
108
94
  ]),
@@ -127,11 +113,11 @@ export const writeTraceSpec = (input: TraceSpecInput) => {
127
113
  ...(isLasso ? [LASSO_START, LASSO_END] : []),
128
114
  ];
129
115
  const teConstantsModule = `${specName}_TEConstants`;
130
- const constantModules = getHashOrder([
116
+ const constantModules = getHashMapOrder([
131
117
  "TLC",
132
118
  ...(teConstants.length > 0 ? [teConstantsModule] : []),
133
119
  ]);
134
- const extendedModules = getHashOrder([
120
+ const extendedModules = getHashMapOrder([
135
121
  "Toolbox",
136
122
  "TLCExt",
137
123
  "Naturals",
@@ -187,10 +173,11 @@ ${lassoStep}${variables
187
173
  definition: `\n_view ==\n${INDENT}<<${variables.join(", ")}, IF TLCGet("level") = ${LASSO_END} + 1 THEN ${LASSO_START} ELSE TLCGet("level")>>\n`,
188
174
  }
189
175
  : { config: "", definition: "" };
190
- const deserializedTrace = `\n${getPrimer(traceModule, getHashOrder(["IOUtils", ...constantModules, specName]))}trace == IODeserialize("${input.module}.bin", TRUE)\n\n${CLOSING_TAG}`;
176
+ const deserializedTrace = `\n${getPrimer(traceModule, getHashMapOrder(["IOUtils", ...constantModules, specName]))}trace == IODeserialize("${input.module}.bin", TRUE)\n\n${CLOSING_TAG}`;
191
177
  const traceFunction = `${INDENT}<<\n${states
192
178
  .map(
193
- (state) => `${INDENT}([${state.map(([name, value]) => `${name} |-> ${value}`).join(",")}])`,
179
+ (state) =>
180
+ `${INDENT}([${state.map((assignment) => `${assignment[0]} |-> ${assignment[1]}`).join(",")}])`,
194
181
  )
195
182
  .join(",\n")}\n${INDENT}>>${SEPARATOR}\n`;
196
183
 
@@ -217,7 +204,7 @@ ${lassoStep}${variables
217
204
  " In this case, it is advised to uncomment the module below to deserialize the\n",
218
205
  " trace from a generated binary file.\n",
219
206
  `\n\\*${deserializedTrace.replaceAll("\n", "\n\\*")}\n\n`,
220
- getPrimer(traceModule, getHashOrder([...constantModules, specName])),
207
+ getPrimer(traceModule, getHashMapOrder([...constantModules, specName])),
221
208
  `trace == \n${traceFunction}\n`,
222
209
  ...(teConstants.length > 0
223
210
  ? [