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
package/src/exit-codes.ts CHANGED
@@ -1,7 +1,8 @@
1
- import type { LivenessChecker } from "./liveness-checker";
1
+ import type { LivenessChecker, LivenessChecks } from "./liveness-checker";
2
2
 
3
3
  export const EXIT_STATUS = {
4
4
  success: 0,
5
+ abort: 1,
5
6
  assumptionViolation: 10,
6
7
  deadlock: 11,
7
8
  safetyViolation: 12,
@@ -17,13 +18,13 @@ export const EXIT_STATUS = {
17
18
 
18
19
  const MESSAGE_EXIT_STATUSES = new Map<number, number>([
19
20
  ...[
20
- ...Array.from({ length: 24 }, (_, index) => 2222 + index),
21
+ ...Array.from({ length: 24 }, (_value, index) => 2222 + index),
21
22
  2272,
22
23
  2273,
23
24
  2274,
24
25
  2280,
25
26
  2281,
26
- ...Array.from({ length: 7 }, (_, index) => 5001 + index),
27
+ ...Array.from({ length: 7 }, (_value, index) => 5001 + index),
27
28
  ].map((code): [number, number] => [code, EXIT_STATUS.configParseError]),
28
29
  [2253, EXIT_STATUS.livenessEvaluationFailure],
29
30
  [2109, EXIT_STATUS.specEvaluationFailure],
@@ -69,22 +70,35 @@ const withErrorExitCode = <Result>(run: () => Result) => {
69
70
  }
70
71
  };
71
72
 
73
+ const withCheckerExitCode = (checker: LivenessChecker): LivenessChecker => ({
74
+ branches: checker.branches,
75
+ solutions: checker.solutions,
76
+ addInitialState: checker.addInitialState,
77
+ addState: (index, state, successors, tracing) =>
78
+ withErrorExitCode(() => checker.addState(index, state, successors, tracing)),
79
+ storeState: checker.storeState,
80
+ getStateCounts: checker.getStateCounts,
81
+ findViolation: () => withErrorExitCode(() => checker.findViolation()),
82
+ getViolatedProperties: (path, cycleStart) =>
83
+ withErrorExitCode(() => checker.getViolatedProperties(path, cycleStart)),
84
+ });
85
+
72
86
  export const withLivenessExitCode = (
73
87
  create: () => LivenessChecker | undefined,
74
88
  ): LivenessChecker | undefined => {
75
89
  const checker = withErrorExitCode(create);
90
+ return checker && withCheckerExitCode(checker);
91
+ };
92
+
93
+ export const withLivenessChecksExitCode = (
94
+ create: () => LivenessChecks | undefined,
95
+ ): LivenessChecks | undefined => {
96
+ const checks = withErrorExitCode(create);
76
97
  return (
77
- checker && {
78
- branches: checker.branches,
79
- solutions: checker.solutions,
80
- addInitialState: (index, state, tracing) =>
81
- withErrorExitCode(() => checker.addInitialState(index, state, tracing)),
82
- addState: (index, state, successors, tracing) =>
83
- withErrorExitCode(() => checker.addState(index, state, successors, tracing)),
84
- storeState: checker.storeState,
85
- findViolation: () => withErrorExitCode(() => checker.findViolation()),
86
- getViolatedProperties: (path, cycleStart) =>
87
- withErrorExitCode(() => checker.getViolatedProperties(path, cycleStart)),
98
+ checks && {
99
+ solutions: checks.solutions,
100
+ findTraceViolation: (trace, fingerprints) =>
101
+ withErrorExitCode(() => checks.findTraceViolation(trace, fingerprints)),
88
102
  }
89
103
  );
90
104
  };
package/src/instances.ts CHANGED
@@ -185,8 +185,9 @@ export const mapChildren = (
185
185
  ...expression,
186
186
  function: mapUnbound(expression.function),
187
187
  updates: expression.updates.map((update) => ({
188
+ ...update,
188
189
  path: update.path.map((step) =>
189
- step.kind === "Index" ? { kind: "Index", args: step.args.map(mapUnbound) } : step,
190
+ step.kind === "Index" ? { ...step, args: step.args.map(mapUnbound) } : step,
190
191
  ),
191
192
  value: mapUnbound(update.value),
192
193
  })),
@@ -219,6 +220,8 @@ export const mapChildren = (
219
220
  };
220
221
  case "Label":
221
222
  return { ...expression, body: mapUnbound(expression.body) };
223
+ case "Selection":
224
+ return { ...expression, expression: mapUnbound(expression.expression) };
222
225
  case "Subexpression":
223
226
  return {
224
227
  ...expression,
@@ -229,14 +232,127 @@ export const mapChildren = (
229
232
  }
230
233
  };
231
234
 
235
+ const NO_NAMES: string[] = [];
236
+
237
+ const visitAll = (children: Expression[], visit: (child: Expression, bound: string[]) => void) => {
238
+ for (let index = 0; index < children.length; index++) visit(children[index], NO_NAMES);
239
+ };
240
+
241
+ const visitBoundSets = (bounds: Bound[], visit: (child: Expression, bound: string[]) => void) => {
242
+ for (let index = 0; index < bounds.length; index++) visit(bounds[index].set, NO_NAMES);
243
+ };
244
+
232
245
  export const forEachChild = (
233
246
  expression: Expression,
234
247
  visit: (child: Expression, bound: string[]) => void,
235
248
  ): void => {
236
- mapChildren(expression, (child, bound) => {
237
- visit(child, bound);
238
- return child;
239
- });
249
+ switch (expression.kind) {
250
+ case "Number":
251
+ case "Decimal":
252
+ case "String":
253
+ case "Identifier":
254
+ case "OperatorReference":
255
+ case "ExceptAt":
256
+ return;
257
+ case "Apply":
258
+ case "Bracket":
259
+ return visitAll(expression.args, visit);
260
+ case "Lambda":
261
+ return visit(expression.body, expression.params);
262
+ case "And":
263
+ case "Or":
264
+ return visitAll(expression.operands, visit);
265
+ case "Prime":
266
+ case "Unchanged":
267
+ case "Enabled":
268
+ case "Always":
269
+ case "Eventually":
270
+ case "Selection":
271
+ return visit(expression.expression, NO_NAMES);
272
+ case "If":
273
+ visit(expression.condition, NO_NAMES);
274
+ visit(expression.consequent, NO_NAMES);
275
+ return visit(expression.alternative, NO_NAMES);
276
+ case "Case":
277
+ for (let index = 0; index < expression.arms.length; index++) {
278
+ visit(expression.arms[index].condition, NO_NAMES);
279
+ visit(expression.arms[index].body, NO_NAMES);
280
+ }
281
+ if (expression.other) visit(expression.other, NO_NAMES);
282
+ return;
283
+ case "Let": {
284
+ const names = expression.definitions.map((definition) => definition.name);
285
+ expression.definitions.forEach((definition) => {
286
+ if (definition.kind === "Function") {
287
+ visitBoundSets(definition.bounds, (child) => visit(child, names));
288
+ visit(definition.body, [...names, ...getBoundNames(definition.bounds)]);
289
+ } else {
290
+ visit(definition.body, [...names, ...definition.params.map((param) => param.name)]);
291
+ }
292
+ });
293
+ return visit(expression.body, names);
294
+ }
295
+ case "Forall":
296
+ case "Exists":
297
+ case "FunctionConstruction":
298
+ visitBoundSets(expression.bounds, visit);
299
+ return visit(expression.body, getBoundNames(expression.bounds));
300
+ case "UnboundedQuantifier":
301
+ return visit(expression.body, expression.names);
302
+ case "Choose":
303
+ if (expression.set) visit(expression.set, NO_NAMES);
304
+ return visit(expression.body, getPatternNames(expression.pattern));
305
+ case "SetEnumeration":
306
+ case "Tuple":
307
+ return visitAll(expression.elements, visit);
308
+ case "SetFilter":
309
+ visit(expression.bound.set, NO_NAMES);
310
+ return visit(expression.predicate, getPatternNames(expression.bound.pattern));
311
+ case "SetMap":
312
+ visitBoundSets(expression.bounds, visit);
313
+ return visit(expression.expression, getBoundNames(expression.bounds));
314
+ case "FunctionSet":
315
+ visit(expression.domain, NO_NAMES);
316
+ return visit(expression.range, NO_NAMES);
317
+ case "Record":
318
+ case "RecordSet":
319
+ for (let index = 0; index < expression.fields.length; index++) {
320
+ visit(expression.fields[index].value, NO_NAMES);
321
+ }
322
+ return;
323
+ case "Except":
324
+ visit(expression.function, NO_NAMES);
325
+ for (let index = 0; index < expression.updates.length; index++) {
326
+ const update = expression.updates[index];
327
+ for (let step = 0; step < update.path.length; step++) {
328
+ const component = update.path[step];
329
+ if (component.kind === "Index") visitAll(component.args, visit);
330
+ }
331
+ visit(update.value, NO_NAMES);
332
+ }
333
+ return;
334
+ case "FunctionApplication":
335
+ visit(expression.function, NO_NAMES);
336
+ return visitAll(expression.args, visit);
337
+ case "FieldAccess":
338
+ return visit(expression.record, NO_NAMES);
339
+ case "Product":
340
+ return visitAll(expression.factors, visit);
341
+ case "BoxAction":
342
+ case "AngleAction":
343
+ visit(expression.action, NO_NAMES);
344
+ return visit(expression.subscript, NO_NAMES);
345
+ case "WeakFairness":
346
+ case "StrongFairness":
347
+ visit(expression.subscript, NO_NAMES);
348
+ return visit(expression.action, NO_NAMES);
349
+ case "Label":
350
+ return visit(expression.body, NO_NAMES);
351
+ case "Subexpression":
352
+ expression.selectors.forEach((selector) => {
353
+ if ("args" in selector) visitAll(selector.args, visit);
354
+ });
355
+ }
240
356
  };
241
357
 
242
358
  interface Instantiation {
@@ -262,6 +378,7 @@ interface Rewrite {
262
378
  mode: RewriteMode;
263
379
  modes: Map<RewriteMode, Rewrite>;
264
380
  bindings?: Map<string, Expression>;
381
+ selections: Map<Expression, Expression>;
265
382
  }
266
383
 
267
384
  const getSubstitutionName = (name: string) => `${name}@SUBSTITUTION`;
@@ -522,7 +639,7 @@ const getInstanceOperator = (
522
639
  arity: number,
523
640
  location: SourceLocation,
524
641
  ): Expression => {
525
- const names = Array.from({ length: arity }, (_, index) => `argument${index}`);
642
+ const names = Array.from({ length: arity }, (_value, index) => `argument${index}`);
526
643
  return {
527
644
  kind: "Lambda",
528
645
  params: names,
@@ -548,6 +665,12 @@ const substitute = (
548
665
  bound: Map<string, string>,
549
666
  ): Expression => {
550
667
  const recurse = (node: Expression) => substitute(node, rewrite, bound);
668
+ if (expression.kind === "Selection" && [...bound].every((entry) => entry[0] === entry[1])) {
669
+ const selected = expression.expression;
670
+ const substituted = rewrite.selections.get(selected) ?? recurse(selected);
671
+ rewrite.selections.set(selected, substituted);
672
+ return { ...expression, expression: substituted };
673
+ }
551
674
  const instantiation = rewrite.instantiation;
552
675
  const params = instantiation.params;
553
676
  const isFree = (name: string) => !bound.has(name) && !isLocallyResolved(expression);
@@ -731,7 +854,7 @@ const copyDefinition = (rewrite: Rewrite, key: string): string => {
731
854
  const bindings = new Map<string, Expression>();
732
855
  const bodyRewrite =
733
856
  definition.kind === "Operator" && rewrite.mode === "Normal"
734
- ? { ...rewrite, bindings }
857
+ ? { ...rewrite, bindings, selections: new Map<Expression, Expression>() }
735
858
  : rewrite;
736
859
  const mapped = renameParams(
737
860
  mapDefinition(definition, (child, bound) =>
@@ -744,14 +867,14 @@ const copyDefinition = (rewrite: Rewrite, key: string): string => {
744
867
  ? mapped.body
745
868
  : {
746
869
  kind: "Let",
747
- definitions: [...bindings].map(([name, replacement]): Definition => ({
870
+ definitions: [...bindings].map((entry): Definition => ({
748
871
  kind: "Operator",
749
- name,
872
+ name: entry[0],
750
873
  params: [],
751
- body: replacement,
874
+ body: entry[1],
752
875
  isLocal: true,
753
876
  isRecursive: false,
754
- location: replacement.location,
877
+ location: entry[1].location,
755
878
  })),
756
879
  body: mapped.body,
757
880
  // TLC has no such LET, so the call stack it prints has no position for it.
@@ -777,6 +900,7 @@ export const createInstantiation = (instantiation: Instantiation) => {
777
900
  copies: new Map<string, string>(),
778
901
  mode,
779
902
  modes,
903
+ selections: new Map<Expression, Expression>(),
780
904
  };
781
905
  modes.set(mode, created);
782
906
  return created;
package/src/java-hash.ts CHANGED
@@ -5,3 +5,17 @@ export const getJavaHashCode = (text: string): number => {
5
5
  }
6
6
  return hash;
7
7
  };
8
+
9
+ const getHashMapHash = (text: string) => {
10
+ const hash = getJavaHashCode(text);
11
+ return hash ^ (hash >>> 16);
12
+ };
13
+
14
+ export const getHashMapOrder = (names: string[]) => {
15
+ const unique = [...new Set(names)];
16
+ const capacity = 2 ** Math.max(4, Math.ceil(Math.log2(unique.length / 0.75)));
17
+ return unique
18
+ .map((name, index) => ({ name, index, bucket: getHashMapHash(name) & (capacity - 1) }))
19
+ .sort((left, right) => left.bucket - right.bucket || left.index - right.index)
20
+ .map((entry) => entry.name);
21
+ };
@@ -184,8 +184,8 @@ const readClassFile = (bytes: Uint8Array) => {
184
184
  getJavaClassName(pool, thrown.readUint16()),
185
185
  )
186
186
  : [];
187
- const modifiers = METHOD_MODIFIERS.filter(([flag]) => (access & flag) !== 0).map(
188
- ([, modifier]) => modifier,
187
+ const modifiers = METHOD_MODIFIERS.filter((entry) => (access & entry[0]) !== 0).map(
188
+ (entry) => entry[1],
189
189
  );
190
190
  const returnType = getTypeNames(descriptor.slice(parametersEnd + 1))[0];
191
191
  const throwsClause = exceptions.length === 0 ? "" : ` throws ${exceptions.join(",")}`;