tla-ts 0.0.4-dev.702eb98 → 0.0.4-dev.7714e32

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 (382) hide show
  1. package/README.md +32 -6
  2. package/dist/cli.cjs +1 -1
  3. package/dist/cli.js +1 -1
  4. package/dist/deciders.cjs +27 -27
  5. package/dist/deciders.js +34 -34
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +12 -14
  8. package/dist/index.d.ts +12 -14
  9. package/dist/index.js +1 -1
  10. package/dist/parallel-worker.cjs +1 -1
  11. package/dist/parallel-worker.js +1 -1
  12. package/dist/prove-worker.cjs +1 -1
  13. package/dist/prove-worker.js +1 -1
  14. package/dist/prove.cjs +516 -25
  15. package/dist/prove.js +518 -27
  16. package/dist/run.cjs +45 -0
  17. package/dist/run.js +45 -0
  18. package/dist/tlapm.cjs +2 -2
  19. package/dist/tlapm.js +2 -2
  20. package/dist/transfer.cjs +76 -86
  21. package/dist/transfer.js +73 -83
  22. package/dist/worker.cjs +6 -6
  23. package/dist/worker.js +6 -6
  24. package/package.json +1 -1
  25. package/src/ast.ts +2 -2
  26. package/src/bags.ts +22 -23
  27. package/src/builtins.ts +16 -8
  28. package/src/check.ts +131 -1154
  29. package/src/{cli-options.ts → cli/options.ts} +54 -9
  30. package/src/cli/run.ts +63 -0
  31. package/src/cli/shared.ts +106 -0
  32. package/src/cli/tlapm.ts +374 -0
  33. package/src/{run-cli.ts → cli/tlc.ts} +112 -761
  34. package/src/cli/xml-exporter.ts +221 -0
  35. package/src/cli.ts +1 -1
  36. package/src/codegen.ts +17 -15
  37. package/src/config.ts +5 -5
  38. package/src/dependencies.ts +4 -6
  39. package/src/environment.ts +55 -60
  40. package/src/errors.ts +12 -36
  41. package/src/evaluate.ts +81 -101
  42. package/src/exit-codes.ts +1 -1
  43. package/src/fingerprints.ts +3 -3
  44. package/src/index.ts +2 -2
  45. package/src/instances.ts +56 -46
  46. package/src/java-overrides.ts +79 -41
  47. package/src/json.ts +31 -36
  48. package/src/levels.ts +10 -13
  49. package/src/{live-check.ts → liveness-checker.ts} +169 -142
  50. package/src/liveness.ts +38 -34
  51. package/src/obligations/action.ts +58 -105
  52. package/src/obligations/{anon.ts → anonymize.ts} +44 -52
  53. package/src/obligations/equality.ts +260 -0
  54. package/src/obligations/expression.ts +42 -530
  55. package/src/obligations/format.ts +7 -8
  56. package/src/obligations/generate.ts +93 -783
  57. package/src/obligations/index.ts +23 -23
  58. package/src/obligations/levels.ts +38 -44
  59. package/src/obligations/module.ts +106 -729
  60. package/src/obligations/normalize.ts +554 -0
  61. package/src/obligations/operators.ts +176 -0
  62. package/src/obligations/pragma.ts +35 -29
  63. package/src/obligations/printer.ts +98 -209
  64. package/src/obligations/proof.ts +0 -1
  65. package/src/obligations/regroup.ts +100 -0
  66. package/src/obligations/simplify.ts +668 -0
  67. package/src/obligations/source.ts +92 -192
  68. package/src/obligations/{deref.ts → subexpression.ts} +82 -113
  69. package/src/obligations/substitution.ts +261 -0
  70. package/src/obligations/temporal.ts +32 -30
  71. package/src/obligations/tuples.ts +37 -53
  72. package/src/parallel-worker.ts +37 -33
  73. package/src/parallel.ts +30 -24
  74. package/src/parser.ts +67 -74
  75. package/src/{pcal-ast.ts → pcal/ast.ts} +2 -17
  76. package/src/{pcal-parse.ts → pcal/parse.ts} +28 -64
  77. package/src/{pcal-tokenize.ts → pcal/tokenize.ts} +10 -39
  78. package/src/{pcal-translate.ts → pcal/translate.ts} +30 -109
  79. package/src/{pcal-validate.ts → pcal/validate.ts} +10 -20
  80. package/src/{prove → prover}/decide-pool.ts +14 -19
  81. package/src/{prove → prover}/deciders.ts +7 -1
  82. package/src/{obligations/pickle.ts → prover/first-order.ts} +79 -4
  83. package/src/{prove → prover}/isabelle/decide.ts +3 -6
  84. package/src/{prove → prover}/isabelle/encode.ts +106 -138
  85. package/src/{prove → prover}/isabelle/isar/inner-syntax.ts +1 -1
  86. package/src/{prove → prover}/isabelle/isar/method.ts +3 -3
  87. package/src/{prove → prover}/isabelle/isar/type-check.ts +1 -1
  88. package/src/{prove → prover}/isabelle/provers/blast/blast.ts +1 -1
  89. package/src/{prove → prover}/isabelle/provers/blast/branch.ts +1 -1
  90. package/src/{prove → prover}/isabelle/provers/blast/term.ts +3 -4
  91. package/src/{prove → prover}/isabelle/provers/clasimp.ts +1 -1
  92. package/src/{prove → prover}/isabelle/provers/classical.ts +3 -3
  93. package/src/{prove → prover}/isabelle/provers/hypsubst.ts +1 -9
  94. package/src/{prove → prover}/isabelle/pure/conv.ts +1 -1
  95. package/src/{prove → prover}/isabelle/pure/drule.ts +2 -2
  96. package/src/{prove → prover}/isabelle/pure/envir.ts +3 -35
  97. package/src/{prove → prover}/isabelle/pure/logic.ts +4 -76
  98. package/src/{prove → prover}/isabelle/pure/name.ts +1 -13
  99. package/src/{prove → prover}/isabelle/pure/net.ts +2 -49
  100. package/src/{prove → prover}/isabelle/pure/pattern.ts +3 -22
  101. package/src/{prove → prover}/isabelle/pure/raw-simplifier.ts +3 -18
  102. package/src/{prove → prover}/isabelle/pure/seq.ts +0 -23
  103. package/src/{prove → prover}/isabelle/pure/simplifier.ts +2 -8
  104. package/src/{prove → prover}/isabelle/pure/table.ts +1 -8
  105. package/src/{prove → prover}/isabelle/pure/tactic.ts +5 -113
  106. package/src/{prove → prover}/isabelle/pure/tactical.ts +1 -84
  107. package/src/{prove → prover}/isabelle/pure/term-ord.ts +1 -55
  108. package/src/{prove → prover}/isabelle/pure/term.ts +8 -128
  109. package/src/{prove → prover}/isabelle/pure/thm.ts +4 -27
  110. package/src/{prove → prover}/isabelle/pure/type.ts +0 -12
  111. package/src/{prove → prover}/isabelle/pure/unify.ts +1 -1
  112. package/src/{prove → prover}/isabelle/tla/classical-setup.ts +1 -1
  113. package/src/{prove → prover}/ocaml.ts +1 -1
  114. package/src/{prove → prover}/prep/action.ts +54 -66
  115. package/src/{prove → prover}/prep/enabled-axioms.ts +2 -2
  116. package/src/{prove → prover}/prep/fingerprint.ts +3 -3
  117. package/src/{prove → prover}/prep/level-comparison.ts +15 -38
  118. package/src/{prove → prover}/prep/md5.ts +2 -9
  119. package/src/{prove/prep/pragma.ts → prover/prep/methods.ts} +4 -4
  120. package/src/prover/prep/normalize.ts +309 -0
  121. package/src/{prove → prover}/prove-worker.ts +4 -11
  122. package/src/prover/prove.ts +492 -0
  123. package/src/{prove → prover}/ptl/encode.ts +19 -31
  124. package/src/{prove → prover}/smt/axioms.ts +78 -79
  125. package/src/{prove → prover}/smt/data.ts +16 -45
  126. package/src/{prove → prover}/smt/encode.ts +134 -28
  127. package/src/{prove → prover}/smt/extensionality.ts +14 -12
  128. package/src/{prove → prover}/smt/flatten.ts +3 -18
  129. package/src/{prove → prover}/smt/format.ts +14 -3
  130. package/src/{prove → prover}/smt/instances.ts +4 -5
  131. package/src/{prove → prover}/smt/rewrite.ts +41 -59
  132. package/src/{prove → prover}/smt/solver/ast-util.ts +0 -56
  133. package/src/{prove → prover}/smt/solver/case-split-queue.ts +1 -1
  134. package/src/{prove → prover}/smt/solver/enode.ts +1 -1
  135. package/src/{prove → prover}/smt/solver/lp/dep-intervals.ts +0 -14
  136. package/src/{prove → prover}/smt/solver/model-macro-solver.ts +1 -1
  137. package/src/{prove → prover}/smt/solver/nlsat/algebraic.ts +3 -3
  138. package/src/{prove → prover}/smt/solver/nlsat/atoms.ts +1 -1
  139. package/src/{prove → prover}/smt/solver/nlsat/explain.ts +1 -1
  140. package/src/{prove → prover}/smt/solver/nlsat/interval-set.ts +1 -1
  141. package/src/{prove → prover}/smt/solver/nlsat/levelwise.ts +4 -7
  142. package/src/{prove → prover}/smt/solver/nlsat/polynomial.ts +4 -4
  143. package/src/{prove → prover}/smt/solver/nlsat/upolynomial.ts +2 -2
  144. package/src/{prove → prover}/smt/solver/pattern-inference.ts +1 -1
  145. package/src/{prove → prover}/smt/solver/relevancy.ts +2 -2
  146. package/src/{prove → prover}/smt/solver/rewriter.ts +1 -1
  147. package/src/{prove → prover}/smt/solver/solver.ts +2 -2
  148. package/src/prover/tlapm/cache.ts +236 -0
  149. package/src/prover/tlapm/ocaml-marshal.ts +166 -0
  150. package/src/{prove → prover}/tlapm/tlapm.ts +1 -2
  151. package/src/prover/verdict.ts +13 -0
  152. package/src/{prove → prover}/zenon/decide.ts +5 -11
  153. package/src/{prove → prover}/zenon/encode.ts +40 -106
  154. package/src/{prove → prover}/zenon/eqrel.ts +1 -1
  155. package/src/{prove → prover}/zenon/equality-rules.ts +1 -1
  156. package/src/{prove → prover}/zenon/expr.ts +2 -2
  157. package/src/{prove → prover}/zenon/index-table.ts +1 -1
  158. package/src/{prove → prover}/zenon/isar.ts +1 -1
  159. package/src/{prove → prover}/zenon/llproof.ts +1 -1
  160. package/src/{prove → prover}/zenon/mltoll.ts +1 -1
  161. package/src/{prove → prover}/zenon/node.ts +1 -1
  162. package/src/{prove → prover}/zenon/search.ts +1 -1
  163. package/src/{prove → prover}/zenon/tla/terms.ts +1 -20
  164. package/src/{prove → prover}/zenon/tla/tla.ts +1 -1
  165. package/src/randomization.ts +19 -24
  166. package/src/resolve.ts +15 -22
  167. package/src/runtime.ts +8 -8
  168. package/src/{sany-builtins.ts → sany/builtins.ts} +1 -1
  169. package/src/{sany-generator.ts → sany/generator.ts} +38 -55
  170. package/src/{sany-levels.ts → sany/levels.ts} +45 -48
  171. package/src/{sany-lexer.ts → sany/lexer.ts} +2 -3
  172. package/src/{sany-linter.ts → sany/linter.ts} +1 -1
  173. package/src/{sany-modules.ts → sany/modules.ts} +2 -2
  174. package/src/{sany-nodes.ts → sany/nodes.ts} +2 -2
  175. package/src/{sany-parse-error.ts → sany/parse-error.ts} +2 -2
  176. package/src/{sany-report.ts → sany/report.ts} +16 -17
  177. package/src/{sany-selectors.ts → sany/selectors.ts} +3 -5
  178. package/src/{sany-source.ts → sany/source.ts} +6 -7
  179. package/src/{sany-xml.ts → sany/xml.ts} +5 -6
  180. package/src/search.ts +969 -0
  181. package/src/spec-description.ts +26 -20
  182. package/src/{standard-levels.ts → standard-definitions.ts} +118 -2
  183. package/src/standard-modules.ts +16 -20
  184. package/src/state-graph.ts +9 -8
  185. package/src/substitution-levels.ts +2 -2
  186. package/src/successors.ts +16 -19
  187. package/src/symmetry.ts +1 -1
  188. package/src/tableau.ts +6 -7
  189. package/src/tlc/fingerprint.ts +214 -0
  190. package/src/{tlc-messages.ts → tlc/messages.ts} +119 -7
  191. package/src/{tlc-order.ts → tlc/order.ts} +7 -7
  192. package/src/{tlc-random.ts → tlc/random.ts} +3 -213
  193. package/src/{tlc-replay.ts → tlc/replay.ts} +40 -36
  194. package/src/{tlc-module.ts → tlc/tlc-operators.ts} +9 -9
  195. package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +30 -25
  196. package/src/transfer.ts +32 -32
  197. package/src/values.ts +72 -67
  198. package/src/worker.ts +1 -4
  199. package/dist/run-cli.cjs +0 -38
  200. package/dist/run-cli.js +0 -38
  201. package/src/canonical.ts +0 -40
  202. package/src/obligations/ctx.ts +0 -64
  203. package/src/prove/prep/defs.ts +0 -27
  204. package/src/prove/prep/elab.ts +0 -156
  205. package/src/prove/prep/enabled.ts +0 -43
  206. package/src/prove/prep/flatten.ts +0 -70
  207. package/src/prove/prep/trivial.ts +0 -22
  208. package/src/prove/prove.ts +0 -417
  209. package/src/prove/smt/axiomatize.ts +0 -69
  210. package/src/prove/smt/simplify.ts +0 -57
  211. package/src/prove/verdict.ts +0 -13
  212. package/src/standard-ranges.ts +0 -116
  213. package/src/value-sources.ts +0 -29
  214. /package/src/{prove → prover}/isabelle/LICENSE +0 -0
  215. /package/src/{prove → prover}/isabelle/LICENSE-tlapm +0 -0
  216. /package/src/{prove → prover}/isabelle/isar/proof.ts +0 -0
  217. /package/src/{prove → prover}/isabelle/isar/statement.ts +0 -0
  218. /package/src/{prove → prover}/isabelle/isar/theory.ts +0 -0
  219. /package/src/{prove → prover}/isabelle/provers/blast/prove.ts +0 -0
  220. /package/src/{prove → prover}/isabelle/provers/blast/rules.ts +0 -0
  221. /package/src/{prove → prover}/isabelle/provers/blast/state.ts +0 -0
  222. /package/src/{prove → prover}/isabelle/pure/bicompose.ts +0 -0
  223. /package/src/{prove → prover}/isabelle/pure/consts.ts +0 -0
  224. /package/src/{prove → prover}/isabelle/pure/goal.ts +0 -0
  225. /package/src/{prove → prover}/isabelle/pure/interrupt.ts +0 -0
  226. /package/src/{prove → prover}/isabelle/pure/list.ts +0 -0
  227. /package/src/{prove → prover}/isabelle/pure/object-logic.ts +0 -0
  228. /package/src/{prove → prover}/isabelle/pure/rewriter.ts +0 -0
  229. /package/src/{prove → prover}/isabelle/pure/search.ts +0 -0
  230. /package/src/{prove → prover}/isabelle/pure/variable.ts +0 -0
  231. /package/src/{prove → prover}/isabelle/tla/context.ts +0 -0
  232. /package/src/{prove → prover}/isabelle/tla/logic-data.ts +0 -0
  233. /package/src/{prove → prover}/isabelle/tla/logic.ts +0 -0
  234. /package/src/{prove → prover}/isabelle/tla/simpdata.ts +0 -0
  235. /package/src/{prove → prover}/isabelle/tools/intuitionistic.ts +0 -0
  236. /package/src/{prove → prover}/ptl/decide.ts +0 -0
  237. /package/src/{prove → prover}/ptl/sat.ts +0 -0
  238. /package/src/{prove → prover}/ptl/tableau.ts +0 -0
  239. /package/src/{prove → prover}/smt/context.ts +0 -0
  240. /package/src/{prove → prover}/smt/solver/act-cache.ts +0 -0
  241. /package/src/{prove → prover}/smt/solver/arith-rewriter.ts +0 -0
  242. /package/src/{prove → prover}/smt/solver/array.ts +0 -0
  243. /package/src/{prove → prover}/smt/solver/asserted-formulas.ts +0 -0
  244. /package/src/{prove → prover}/smt/solver/ast-lt.ts +0 -0
  245. /package/src/{prove → prover}/smt/solver/ast.ts +0 -0
  246. /package/src/{prove → prover}/smt/solver/auf-solver.ts +0 -0
  247. /package/src/{prove → prover}/smt/solver/cg-table.ts +0 -0
  248. /package/src/{prove → prover}/smt/solver/clause.ts +0 -0
  249. /package/src/{prove → prover}/smt/solver/conflict-resolution.ts +0 -0
  250. /package/src/{prove → prover}/smt/solver/context.ts +0 -0
  251. /package/src/{prove → prover}/smt/solver/ctx-simplify.ts +0 -0
  252. /package/src/{prove → prover}/smt/solver/der.ts +0 -0
  253. /package/src/{prove → prover}/smt/solver/dyn-ack.ts +0 -0
  254. /package/src/{prove → prover}/smt/solver/e-matching.ts +0 -0
  255. /package/src/{prove → prover}/smt/solver/expr-ref.ts +0 -0
  256. /package/src/{prove → prover}/smt/solver/expr-safe-replace.ts +0 -0
  257. /package/src/{prove → prover}/smt/solver/fingerprints.ts +0 -0
  258. /package/src/{prove → prover}/smt/solver/flat-literals.ts +0 -0
  259. /package/src/{prove → prover}/smt/solver/goal.ts +0 -0
  260. /package/src/{prove → prover}/smt/solver/hash.ts +0 -0
  261. /package/src/{prove → prover}/smt/solver/hashtable.ts +0 -0
  262. /package/src/{prove → prover}/smt/solver/internalizer.ts +0 -0
  263. /package/src/{prove → prover}/smt/solver/lbool.ts +0 -0
  264. /package/src/{prove → prover}/smt/solver/literal.ts +0 -0
  265. /package/src/{prove → prover}/smt/solver/lp/bound-propagator.ts +0 -0
  266. /package/src/{prove → prover}/smt/solver/lp/constraints.ts +0 -0
  267. /package/src/{prove → prover}/smt/solver/lp/containers.ts +0 -0
  268. /package/src/{prove → prover}/smt/solver/lp/core-solver.ts +0 -0
  269. /package/src/{prove → prover}/smt/solver/lp/cross-nested.ts +0 -0
  270. /package/src/{prove → prover}/smt/solver/lp/dependency.ts +0 -0
  271. /package/src/{prove → prover}/smt/solver/lp/dioph-eq.ts +0 -0
  272. /package/src/{prove → prover}/smt/solver/lp/explanation.ts +0 -0
  273. /package/src/{prove → prover}/smt/solver/lp/gomory.ts +0 -0
  274. /package/src/{prove → prover}/smt/solver/lp/hnf-cutter.ts +0 -0
  275. /package/src/{prove → prover}/smt/solver/lp/hnf.ts +0 -0
  276. /package/src/{prove → prover}/smt/solver/lp/int-cube.ts +0 -0
  277. /package/src/{prove → prover}/smt/solver/lp/int-solver.ts +0 -0
  278. /package/src/{prove → prover}/smt/solver/lp/lar-solver.ts +0 -0
  279. /package/src/{prove → prover}/smt/solver/lp/lar-term.ts +0 -0
  280. /package/src/{prove → prover}/smt/solver/lp/lp-settings.ts +0 -0
  281. /package/src/{prove → prover}/smt/solver/lp/maximize-term.ts +0 -0
  282. /package/src/{prove → prover}/smt/solver/lp/nex-creator.ts +0 -0
  283. /package/src/{prove → prover}/smt/solver/lp/nex.ts +0 -0
  284. /package/src/{prove → prover}/smt/solver/lp/nla-backoff.ts +0 -0
  285. /package/src/{prove → prover}/smt/solver/lp/nla-basics.ts +0 -0
  286. /package/src/{prove → prover}/smt/solver/lp/nla-core.ts +0 -0
  287. /package/src/{prove → prover}/smt/solver/lp/nla-divisions.ts +0 -0
  288. /package/src/{prove → prover}/smt/solver/lp/nla-emonics.ts +0 -0
  289. /package/src/{prove → prover}/smt/solver/lp/nla-factorization.ts +0 -0
  290. /package/src/{prove → prover}/smt/solver/lp/nla-grobner.ts +0 -0
  291. /package/src/{prove → prover}/smt/solver/lp/nla-horner.ts +0 -0
  292. /package/src/{prove → prover}/smt/solver/lp/nla-intervals.ts +0 -0
  293. /package/src/{prove → prover}/smt/solver/lp/nla-monomial-bounds.ts +0 -0
  294. /package/src/{prove → prover}/smt/solver/lp/nla-monotone.ts +0 -0
  295. /package/src/{prove → prover}/smt/solver/lp/nla-order.ts +0 -0
  296. /package/src/{prove → prover}/smt/solver/lp/nla-patcher.ts +0 -0
  297. /package/src/{prove → prover}/smt/solver/lp/nla-tangents.ts +0 -0
  298. /package/src/{prove → prover}/smt/solver/lp/nla-throttle.ts +0 -0
  299. /package/src/{prove → prover}/smt/solver/lp/nla-types.ts +0 -0
  300. /package/src/{prove → prover}/smt/solver/lp/nla-var-eqs.ts +0 -0
  301. /package/src/{prove → prover}/smt/solver/lp/nra-solver.ts +0 -0
  302. /package/src/{prove → prover}/smt/solver/lp/numeric-pair.ts +0 -0
  303. /package/src/{prove → prover}/smt/solver/lp/pdd-interval.ts +0 -0
  304. /package/src/{prove → prover}/smt/solver/lp/pdd-simplifier.ts +0 -0
  305. /package/src/{prove → prover}/smt/solver/lp/pdd-solver.ts +0 -0
  306. /package/src/{prove → prover}/smt/solver/lp/pdd.ts +0 -0
  307. /package/src/{prove → prover}/smt/solver/lp/random-updater.ts +0 -0
  308. /package/src/{prove → prover}/smt/solver/lp/static-matrix.ts +0 -0
  309. /package/src/{prove → prover}/smt/solver/lp/union-find.ts +0 -0
  310. /package/src/{prove → prover}/smt/solver/mam-compiler.ts +0 -0
  311. /package/src/{prove → prover}/smt/solver/mam-interpreter.ts +0 -0
  312. /package/src/{prove → prover}/smt/solver/maximize-ac-sharing.ts +0 -0
  313. /package/src/{prove → prover}/smt/solver/model-checker.ts +0 -0
  314. /package/src/{prove → prover}/smt/solver/model-evaluator.ts +0 -0
  315. /package/src/{prove → prover}/smt/solver/model-finder.ts +0 -0
  316. /package/src/{prove → prover}/smt/solver/model-generator.ts +0 -0
  317. /package/src/{prove → prover}/smt/solver/nlsat/evaluator.ts +0 -0
  318. /package/src/{prove → prover}/smt/solver/nlsat/mpbq.ts +0 -0
  319. /package/src/{prove → prover}/smt/solver/nlsat/solver.ts +0 -0
  320. /package/src/{prove → prover}/smt/solver/nlsat/types.ts +0 -0
  321. /package/src/{prove → prover}/smt/solver/nlsat/upolynomial-factorization.ts +0 -0
  322. /package/src/{prove → prover}/smt/solver/nnf.ts +0 -0
  323. /package/src/{prove → prover}/smt/solver/poly-rewriter.ts +0 -0
  324. /package/src/{prove → prover}/smt/solver/propagate-values.ts +0 -0
  325. /package/src/{prove → prover}/smt/solver/proto-model.ts +0 -0
  326. /package/src/{prove → prover}/smt/solver/pull-quant.ts +0 -0
  327. /package/src/{prove → prover}/smt/solver/qe-lite-der.ts +0 -0
  328. /package/src/{prove → prover}/smt/solver/qe-lite-fm.ts +0 -0
  329. /package/src/{prove → prover}/smt/solver/qe-lite.ts +0 -0
  330. /package/src/{prove → prover}/smt/solver/qi-queue.ts +0 -0
  331. /package/src/{prove → prover}/smt/solver/quant-tactics.ts +0 -0
  332. /package/src/{prove → prover}/smt/solver/quantifier-analyzer.ts +0 -0
  333. /package/src/{prove → prover}/smt/solver/quantifier-manager.ts +0 -0
  334. /package/src/{prove → prover}/smt/solver/random-gen.ts +0 -0
  335. /package/src/{prove → prover}/smt/solver/rational.ts +0 -0
  336. /package/src/{prove → prover}/smt/solver/ref-vector.ts +0 -0
  337. /package/src/{prove → prover}/smt/solver/rewriter-tpl.ts +0 -0
  338. /package/src/{prove → prover}/smt/solver/rlimit.ts +0 -0
  339. /package/src/{prove → prover}/smt/solver/smtlib-parser.ts +0 -0
  340. /package/src/{prove → prover}/smt/solver/sort.ts +0 -0
  341. /package/src/{prove → prover}/smt/solver/sticky-generations.ts +0 -0
  342. /package/src/{prove → prover}/smt/solver/theory-lra-axioms.ts +0 -0
  343. /package/src/{prove → prover}/smt/solver/theory-lra-bounds.ts +0 -0
  344. /package/src/{prove → prover}/smt/solver/theory-lra-final-check.ts +0 -0
  345. /package/src/{prove → prover}/smt/solver/theory-lra-internalize.ts +0 -0
  346. /package/src/{prove → prover}/smt/solver/theory-lra-model.ts +0 -0
  347. /package/src/{prove → prover}/smt/solver/theory-lra-propagate.ts +0 -0
  348. /package/src/{prove → prover}/smt/solver/theory-lra-state.ts +0 -0
  349. /package/src/{prove → prover}/smt/solver/theory-lra.ts +0 -0
  350. /package/src/{prove → prover}/smt/solver/var-subst.ts +0 -0
  351. /package/src/{prove → prover}/smt/solver/z3-license.txt +0 -0
  352. /package/src/{prove → prover}/smt/table.ts +0 -0
  353. /package/src/{prove → prover}/tlaps-module.ts +0 -0
  354. /package/src/{prove → prover}/zenon/LICENSE +0 -0
  355. /package/src/{prove → prover}/zenon/check/check.ts +0 -0
  356. /package/src/{prove → prover}/zenon/check/definitions.ts +0 -0
  357. /package/src/{prove → prover}/zenon/check/equality.ts +0 -0
  358. /package/src/{prove → prover}/zenon/check/functions.ts +0 -0
  359. /package/src/{prove → prover}/zenon/check/keys.ts +0 -0
  360. /package/src/{prove → prover}/zenon/check/propositional.ts +0 -0
  361. /package/src/{prove → prover}/zenon/check/records.ts +0 -0
  362. /package/src/{prove → prover}/zenon/check/relations.ts +0 -0
  363. /package/src/{prove → prover}/zenon/check/rewrites.ts +0 -0
  364. /package/src/{prove → prover}/zenon/check/sets.ts +0 -0
  365. /package/src/{prove → prover}/zenon/check/terms.ts +0 -0
  366. /package/src/{prove → prover}/zenon/check/tla.ts +0 -0
  367. /package/src/{prove → prover}/zenon/isar-case.ts +0 -0
  368. /package/src/{prove → prover}/zenon/limits.ts +0 -0
  369. /package/src/{prove → prover}/zenon/ocaml.ts +0 -0
  370. /package/src/{prove → prover}/zenon/parse.ts +0 -0
  371. /package/src/{prove → prover}/zenon/phrase.ts +0 -0
  372. /package/src/{prove → prover}/zenon/proof.ts +0 -0
  373. /package/src/{prove → prover}/zenon/propositional-rules.ts +0 -0
  374. /package/src/{prove → prover}/zenon/rules.ts +0 -0
  375. /package/src/{prove → prover}/zenon/tla/functions.ts +0 -0
  376. /package/src/{prove → prover}/zenon/tla/llproof.ts +0 -0
  377. /package/src/{prove → prover}/zenon/tla/records.ts +0 -0
  378. /package/src/{prove → prover}/zenon/tla/rewrites.ts +0 -0
  379. /package/src/{prove → prover}/zenon/tla/sets.ts +0 -0
  380. /package/src/{tlc-modules.ts → tlc/jar-data.ts} +0 -0
  381. /package/src/{tlc-summary.ts → tlc/summary.ts} +0 -0
  382. /package/src/{tlc-version.ts → tlc/version.ts} +0 -0
package/src/instances.ts CHANGED
@@ -12,7 +12,7 @@ import {
12
12
  type Theorem,
13
13
  } from "./ast";
14
14
  import { TlaSyntaxError } from "./errors";
15
- import { getArity, getBoundNames, getPatternNames, isBefore } from "./resolve";
15
+ import { getArity, getBoundNames, getPatternNames, isBefore, LOCAL_RESOLUTION } from "./resolve";
16
16
 
17
17
  export const substitutedExpressions = new WeakSet<Expression>();
18
18
 
@@ -79,7 +79,7 @@ export const mapChildren = (
79
79
  expression: Expression,
80
80
  map: (child: Expression, bound: string[]) => Expression,
81
81
  ): Expression => {
82
- const plain = (child: Expression) => map(child, []);
82
+ const mapUnbound = (child: Expression) => map(child, []);
83
83
  switch (expression.kind) {
84
84
  case "Number":
85
85
  case "Decimal":
@@ -89,33 +89,33 @@ export const mapChildren = (
89
89
  case "ExceptAt":
90
90
  return expression;
91
91
  case "Apply":
92
- return { ...expression, args: expression.args.map(plain) };
92
+ return { ...expression, args: expression.args.map(mapUnbound) };
93
93
  case "Lambda":
94
94
  return { ...expression, body: map(expression.body, expression.params) };
95
95
  case "And":
96
96
  case "Or":
97
- return { ...expression, operands: expression.operands.map(plain) };
97
+ return { ...expression, operands: expression.operands.map(mapUnbound) };
98
98
  case "Prime":
99
99
  case "Unchanged":
100
100
  case "Enabled":
101
101
  case "Always":
102
102
  case "Eventually":
103
- return { ...expression, expression: plain(expression.expression) };
103
+ return { ...expression, expression: mapUnbound(expression.expression) };
104
104
  case "If":
105
105
  return {
106
106
  ...expression,
107
- condition: plain(expression.condition),
108
- consequent: plain(expression.consequent),
109
- alternative: plain(expression.alternative),
107
+ condition: mapUnbound(expression.condition),
108
+ consequent: mapUnbound(expression.consequent),
109
+ alternative: mapUnbound(expression.alternative),
110
110
  };
111
111
  case "Case":
112
112
  return {
113
113
  ...expression,
114
114
  arms: expression.arms.map((arm) => ({
115
- condition: plain(arm.condition),
116
- body: plain(arm.body),
115
+ condition: mapUnbound(arm.condition),
116
+ body: mapUnbound(arm.body),
117
117
  })),
118
- other: expression.other ? plain(expression.other) : undefined,
118
+ other: expression.other ? mapUnbound(expression.other) : undefined,
119
119
  };
120
120
  case "Let": {
121
121
  const names = expression.definitions.map((definition) => definition.name);
@@ -132,7 +132,7 @@ export const mapChildren = (
132
132
  case "FunctionConstruction":
133
133
  return {
134
134
  ...expression,
135
- bounds: mapBounds(expression.bounds, plain),
135
+ bounds: mapBounds(expression.bounds, mapUnbound),
136
136
  body: map(expression.body, getBoundNames(expression.bounds)),
137
137
  };
138
138
  case "UnboundedQuantifier":
@@ -140,76 +140,80 @@ export const mapChildren = (
140
140
  case "Choose":
141
141
  return {
142
142
  ...expression,
143
- set: expression.set ? plain(expression.set) : undefined,
143
+ set: expression.set ? mapUnbound(expression.set) : undefined,
144
144
  body: map(expression.body, getPatternNames(expression.pattern)),
145
145
  };
146
146
  case "SetEnumeration":
147
147
  case "Tuple":
148
- return { ...expression, elements: expression.elements.map(plain) };
148
+ return { ...expression, elements: expression.elements.map(mapUnbound) };
149
149
  case "SetFilter":
150
150
  return {
151
151
  ...expression,
152
- bound: { pattern: expression.bound.pattern, set: plain(expression.bound.set) },
152
+ bound: { pattern: expression.bound.pattern, set: mapUnbound(expression.bound.set) },
153
153
  predicate: map(expression.predicate, getPatternNames(expression.bound.pattern)),
154
154
  };
155
155
  case "SetMap":
156
156
  return {
157
157
  ...expression,
158
- bounds: mapBounds(expression.bounds, plain),
158
+ bounds: mapBounds(expression.bounds, mapUnbound),
159
159
  expression: map(expression.expression, getBoundNames(expression.bounds)),
160
160
  };
161
161
  case "FunctionSet":
162
- return { ...expression, domain: plain(expression.domain), range: plain(expression.range) };
162
+ return {
163
+ ...expression,
164
+ domain: mapUnbound(expression.domain),
165
+ range: mapUnbound(expression.range),
166
+ };
163
167
  case "Record":
164
168
  case "RecordSet":
165
169
  return {
166
170
  ...expression,
167
- fields: expression.fields.map((field) => ({ ...field, value: plain(field.value) })),
171
+ fields: expression.fields.map((field) => ({ ...field, value: mapUnbound(field.value) })),
168
172
  };
169
173
  case "Except":
170
174
  return {
171
175
  ...expression,
172
- function: plain(expression.function),
176
+ function: mapUnbound(expression.function),
173
177
  updates: expression.updates.map((update) => ({
174
178
  path: update.path.map((step) =>
175
- step.kind === "Index" ? { kind: "Index", args: step.args.map(plain) } : step,
179
+ step.kind === "Index" ? { kind: "Index", args: step.args.map(mapUnbound) } : step,
176
180
  ),
177
- value: plain(update.value),
181
+ value: mapUnbound(update.value),
178
182
  })),
179
183
  };
180
184
  case "FunctionApplication":
181
185
  return {
182
186
  ...expression,
183
- function: plain(expression.function),
184
- args: expression.args.map(plain),
187
+ function: mapUnbound(expression.function),
188
+ args: expression.args.map(mapUnbound),
185
189
  };
186
190
  case "Bracket":
187
- return { ...expression, args: expression.args.map(plain) };
191
+ return { ...expression, args: expression.args.map(mapUnbound) };
188
192
  case "FieldAccess":
189
- return { ...expression, record: plain(expression.record) };
193
+ return { ...expression, record: mapUnbound(expression.record) };
190
194
  case "Product":
191
- return { ...expression, factors: expression.factors.map(plain) };
195
+ return { ...expression, factors: expression.factors.map(mapUnbound) };
192
196
  case "BoxAction":
193
197
  case "AngleAction":
194
198
  return {
195
199
  ...expression,
196
- action: plain(expression.action),
197
- subscript: plain(expression.subscript),
200
+ action: mapUnbound(expression.action),
201
+ subscript: mapUnbound(expression.subscript),
198
202
  };
199
203
  case "WeakFairness":
200
204
  case "StrongFairness":
201
205
  return {
202
206
  ...expression,
203
- subscript: plain(expression.subscript),
204
- action: plain(expression.action),
207
+ subscript: mapUnbound(expression.subscript),
208
+ action: mapUnbound(expression.action),
205
209
  };
206
210
  case "Label":
207
- return { ...expression, body: plain(expression.body) };
211
+ return { ...expression, body: mapUnbound(expression.body) };
208
212
  case "Subexpression":
209
213
  return {
210
214
  ...expression,
211
215
  selectors: expression.selectors.map((selector) =>
212
- "args" in selector ? { ...selector, args: selector.args.map(plain) } : selector,
216
+ "args" in selector ? { ...selector, args: selector.args.map(mapUnbound) } : selector,
213
217
  ),
214
218
  };
215
219
  }
@@ -436,14 +440,14 @@ const substituteInEnabled = (
436
440
  };
437
441
  };
438
442
 
439
- const createLocalIdentifier = (name: string, location: SourceLocation): Expression => ({
443
+ export const createLocalIdentifier = (name: string, location: SourceLocation): Expression => ({
440
444
  kind: "Identifier",
441
445
  name,
442
446
  location,
443
- resolution: { kind: "Local" },
447
+ resolution: LOCAL_RESOLUTION,
444
448
  });
445
449
 
446
- const getParamArguments = (params: OperatorParam[], location: SourceLocation) =>
450
+ export const createLocalArguments = (params: OperatorParam[], location: SourceLocation) =>
447
451
  params.map((param) => createLocalIdentifier(param.name, location));
448
452
 
449
453
  const getInstanceOperator = (
@@ -460,7 +464,7 @@ const getInstanceOperator = (
460
464
  kind: "Apply",
461
465
  operator: key,
462
466
  args: [
463
- ...getParamArguments(params, location),
467
+ ...createLocalArguments(params, location),
464
468
  ...names.map((name) => createLocalIdentifier(name, location)),
465
469
  ],
466
470
  location,
@@ -525,7 +529,7 @@ const substitute = (
525
529
  return {
526
530
  kind: "Apply",
527
531
  operator: copy,
528
- args: getParamArguments(params, expression.location),
532
+ args: createLocalArguments(params, expression.location),
529
533
  location: expression.location,
530
534
  };
531
535
  }
@@ -536,13 +540,13 @@ const substitute = (
536
540
  instantiation.substitutions.size > 0 ||
537
541
  params.length > 0 ||
538
542
  contextualApplications.has(expression);
539
- const mark = (rewritten: Expression) => {
543
+ const markContextual = (rewritten: Expression) => {
540
544
  if (isContextual) contextualApplications.add(rewritten);
541
545
  return rewritten;
542
546
  };
543
547
  if (replacement?.kind === "Identifier" || replacement?.kind === "OperatorReference") {
544
548
  const operator = replacement.kind === "Identifier" ? replacement.name : replacement.operator;
545
- return mark({
549
+ return markContextual({
546
550
  ...expression,
547
551
  operator,
548
552
  args,
@@ -550,7 +554,7 @@ const substitute = (
550
554
  });
551
555
  }
552
556
  if (replacement?.kind === "Apply") {
553
- return mark({
557
+ return markContextual({
554
558
  ...expression,
555
559
  operator: replacement.operator,
556
560
  args: [...replacement.args, ...args],
@@ -575,7 +579,7 @@ const substitute = (
575
579
  ...expression,
576
580
  operator: LAMBDA_NAME,
577
581
  args,
578
- resolution: { kind: "Local" },
582
+ resolution: LOCAL_RESOLUTION,
579
583
  },
580
584
  location: expression.location,
581
585
  };
@@ -586,11 +590,11 @@ const substitute = (
586
590
  );
587
591
  }
588
592
  const copy = getCopy(rewrite, expression.operator);
589
- if (copy === undefined) return mark({ ...expression, args });
593
+ if (copy === undefined) return markContextual({ ...expression, args });
590
594
  return {
591
595
  ...expression,
592
596
  operator: copy,
593
- args: [...getParamArguments(params, expression.location), ...args],
597
+ args: [...createLocalArguments(params, expression.location), ...args],
594
598
  };
595
599
  }
596
600
  if (expression.kind === "OperatorReference" && isFree(expression.operator)) {
@@ -697,15 +701,21 @@ const expandLetInstances = (
697
701
  instantiate: (instance: Instance, lets: Definition[]) => Definition[],
698
702
  lets: Definition[],
699
703
  ): Expression => {
700
- const inner = expression.kind === "Let" ? [...lets, ...expression.definitions] : lets;
701
- const mapped = mapChildren(expression, (child) => expandLetInstances(child, instantiate, inner));
704
+ const visibleLets = expression.kind === "Let" ? [...lets, ...expression.definitions] : lets;
705
+ const mapped = mapChildren(expression, (child) =>
706
+ expandLetInstances(child, instantiate, visibleLets),
707
+ );
702
708
  if (mapped.kind !== "Let" || !mapped.instances) return mapped;
703
709
  const definitions = mapped.instances.reduce((current, instance) => {
704
710
  const position = current.findIndex((definition) =>
705
711
  isBefore(instance.location, definition.location),
706
712
  );
707
713
  const index = position === -1 ? current.length : position;
708
- return [...current.slice(0, index), ...instantiate(instance, inner), ...current.slice(index)];
714
+ return [
715
+ ...current.slice(0, index),
716
+ ...instantiate(instance, visibleLets),
717
+ ...current.slice(index),
718
+ ];
709
719
  }, mapped.definitions);
710
720
  return { ...mapped, definitions };
711
721
  };
@@ -38,6 +38,38 @@ const ACCESS_PUBLIC = 0x0001;
38
38
  const ACCESS_STATIC = 0x0008;
39
39
  const VALUE_PACKAGE = "tlc2/value/impl/";
40
40
 
41
+ // The constant pool tags of the JVM specification, section 4.4.
42
+ const POOL_TAG = {
43
+ utf8: 1,
44
+ integer: 3,
45
+ float: 4,
46
+ long: 5,
47
+ double: 6,
48
+ class: 7,
49
+ string: 8,
50
+ methodHandle: 15,
51
+ methodType: 16,
52
+ module: 19,
53
+ package: 20,
54
+ };
55
+
56
+ // The JVM opcodes that an override returning a constant value uses.
57
+ const OPCODE = {
58
+ iconstM1: 0x02,
59
+ iconst0: 0x03,
60
+ iconst5: 0x08,
61
+ bipush: 0x10,
62
+ sipush: 0x11,
63
+ ldc: 0x12,
64
+ ldcW: 0x13,
65
+ dup: 0x59,
66
+ areturn: 0xb0,
67
+ getstatic: 0xb2,
68
+ invokespecial: 0xb7,
69
+ invokestatic: 0xb8,
70
+ new: 0xbb,
71
+ };
72
+
41
73
  const createReader = (bytes: Uint8Array) => {
42
74
  const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
43
75
  const cursor = { offset: 0 };
@@ -93,28 +125,34 @@ const getJavaClassName = (pool: PoolEntry[], index: number) =>
93
125
 
94
126
  // The public static methods of a class file and their bytecode, in the order of the class file.
95
127
  // Class#getDeclaredMethods orders them by where HotSpot allocated the symbols of their names.
96
- const readMethods = (bytes: Uint8Array) => {
128
+ const readClassFile = (bytes: Uint8Array) => {
97
129
  const reader = createReader(bytes);
98
130
  if (reader.readUint32() !== CLASS_MAGIC)
99
131
  throw new TlaSyntaxError("A module override is not a class file");
100
132
  reader.readUint16();
101
133
  reader.readUint16();
102
134
  const pool: PoolEntry[] = [];
103
- const count = reader.readUint16();
135
+ const poolSize = reader.readUint16();
104
136
  const decoder = new TextDecoder();
105
- for (let index = 1; index < count; index++) {
137
+ for (let index = 1; index < poolSize; index++) {
106
138
  const tag = reader.readUint8();
107
139
  const entry = { tag, text: "", value: 0, first: 0, second: 0 };
108
140
  pool[index] = entry;
109
- if (tag === 1) entry.text = decoder.decode(reader.readBytes(reader.readUint16()));
110
- else if (tag === 3) entry.value = reader.readInt32();
111
- else if (tag === 4) reader.readUint32();
112
- else if (tag === 5 || tag === 6) {
141
+ if (tag === POOL_TAG.utf8) entry.text = decoder.decode(reader.readBytes(reader.readUint16()));
142
+ else if (tag === POOL_TAG.integer) entry.value = reader.readInt32();
143
+ else if (tag === POOL_TAG.float) reader.readUint32();
144
+ else if (tag === POOL_TAG.long || tag === POOL_TAG.double) {
113
145
  reader.readBytes(8);
114
146
  index++;
115
- } else if (tag === 7 || tag === 8 || tag === 16 || tag === 19 || tag === 20) {
147
+ } else if (
148
+ tag === POOL_TAG.class ||
149
+ tag === POOL_TAG.string ||
150
+ tag === POOL_TAG.methodType ||
151
+ tag === POOL_TAG.module ||
152
+ tag === POOL_TAG.package
153
+ ) {
116
154
  entry.first = reader.readUint16();
117
- } else if (tag === 15) {
155
+ } else if (tag === POOL_TAG.methodHandle) {
118
156
  reader.readUint8();
119
157
  entry.first = reader.readUint16();
120
158
  } else {
@@ -170,7 +208,7 @@ const readMethods = (bytes: Uint8Array) => {
170
208
  return { pool, methods };
171
209
  };
172
210
 
173
- const getMember = (pool: PoolEntry[], index: number) => {
211
+ const getMemberReference = (pool: PoolEntry[], index: number) => {
174
212
  const reference = pool[index];
175
213
  const nameAndType = pool[reference.second];
176
214
  return {
@@ -188,70 +226,70 @@ const getReturnedLiteral = (
188
226
  className: string,
189
227
  location: SourceLocation,
190
228
  ) => {
191
- const unsupported = () =>
229
+ const createUnsupportedError = () =>
192
230
  new TlaUnsupportedError(
193
231
  `The Java override ${className}.${method.name} computes its value, which tla-ts cannot run`,
194
232
  );
195
233
  const code = method.code;
196
- if (!code) throw unsupported();
234
+ if (!code) throw createUnsupportedError();
197
235
  const stack: StackItem[] = [];
198
236
  const pop = () => {
199
237
  const item = stack.pop();
200
- if (item === undefined) throw unsupported();
238
+ if (item === undefined) throw createUnsupportedError();
201
239
  return item;
202
240
  };
203
241
  const getConstant = (index: number) => {
204
242
  const entry = pool[index];
205
- if (entry.tag === 3) return entry.value;
206
- if (entry.tag === 8) return pool[entry.first].text;
207
- throw unsupported();
243
+ if (entry.tag === POOL_TAG.integer) return entry.value;
244
+ if (entry.tag === POOL_TAG.string) return pool[entry.first].text;
245
+ throw createUnsupportedError();
208
246
  };
209
247
  for (let offset = 0; offset < code.length;) {
210
248
  const opcode = code[offset];
211
249
  const getIndex = () => (code[offset + 1] << 8) | code[offset + 2];
212
- if (opcode >= 0x02 && opcode <= 0x08) {
213
- stack.push(opcode - 0x03);
250
+ if (opcode >= OPCODE.iconstM1 && opcode <= OPCODE.iconst5) {
251
+ stack.push(opcode - OPCODE.iconst0);
214
252
  offset += 1;
215
- } else if (opcode === 0x10) {
253
+ } else if (opcode === OPCODE.bipush) {
216
254
  stack.push((code[offset + 1] << 24) >> 24);
217
255
  offset += 2;
218
- } else if (opcode === 0x11) {
256
+ } else if (opcode === OPCODE.sipush) {
219
257
  stack.push((getIndex() << 16) >> 16);
220
258
  offset += 3;
221
- } else if (opcode === 0x12) {
259
+ } else if (opcode === OPCODE.ldc) {
222
260
  stack.push(getConstant(code[offset + 1]));
223
261
  offset += 2;
224
- } else if (opcode === 0x13) {
262
+ } else if (opcode === OPCODE.ldcW) {
225
263
  stack.push(getConstant(getIndex()));
226
264
  offset += 3;
227
- } else if (opcode === 0x59) {
265
+ } else if (opcode === OPCODE.dup) {
228
266
  const top = pop();
229
267
  stack.push(top, top);
230
268
  offset += 1;
231
- } else if (opcode === 0xb2) {
232
- const field = getMember(pool, getIndex());
233
- if (field.className !== `${VALUE_PACKAGE}BoolValue`) throw unsupported();
234
- if (field.name !== "ValTrue" && field.name !== "ValFalse") throw unsupported();
269
+ } else if (opcode === OPCODE.getstatic) {
270
+ const field = getMemberReference(pool, getIndex());
271
+ if (field.className !== `${VALUE_PACKAGE}BoolValue`) throw createUnsupportedError();
272
+ if (field.name !== "ValTrue" && field.name !== "ValFalse") throw createUnsupportedError();
235
273
  stack.push({
236
274
  kind: "Identifier",
237
275
  name: field.name === "ValTrue" ? "TRUE" : "FALSE",
238
276
  location,
239
277
  });
240
278
  offset += 3;
241
- } else if (opcode === 0xb8) {
242
- const callee = getMember(pool, getIndex());
279
+ } else if (opcode === OPCODE.invokestatic) {
280
+ const callee = getMemberReference(pool, getIndex());
243
281
  const value = pop();
244
282
  if (callee.className !== `${VALUE_PACKAGE}IntValue` || callee.name !== "gen") {
245
- throw unsupported();
283
+ throw createUnsupportedError();
246
284
  }
247
- if (typeof value !== "number") throw unsupported();
285
+ if (typeof value !== "number") throw createUnsupportedError();
248
286
  stack.push({ kind: "Number", value, location });
249
287
  offset += 3;
250
- } else if (opcode === 0xbb) {
288
+ } else if (opcode === OPCODE.new) {
251
289
  stack.push({ className: getClassName(pool, getIndex()), value: undefined });
252
290
  offset += 3;
253
- } else if (opcode === 0xb7) {
254
- const constructor = getMember(pool, getIndex());
291
+ } else if (opcode === OPCODE.invokespecial) {
292
+ const constructor = getMemberReference(pool, getIndex());
255
293
  const text = pop();
256
294
  const instance = pop();
257
295
  const isStringValue =
@@ -260,22 +298,22 @@ const getReturnedLiteral = (
260
298
  typeof text === "string" &&
261
299
  typeof instance === "object" &&
262
300
  "className" in instance;
263
- if (!isStringValue) throw unsupported();
301
+ if (!isStringValue) throw createUnsupportedError();
264
302
  instance.value = { kind: "String", value: text, location };
265
303
  offset += 3;
266
- } else if (opcode === 0xb0) {
304
+ } else if (opcode === OPCODE.areturn) {
267
305
  const returned = pop();
268
- if (typeof returned !== "object") throw unsupported();
306
+ if (typeof returned !== "object") throw createUnsupportedError();
269
307
  if ("className" in returned) {
270
- if (!returned.value) throw unsupported();
308
+ if (!returned.value) throw createUnsupportedError();
271
309
  return returned.value;
272
310
  }
273
311
  return returned;
274
312
  } else {
275
- throw unsupported();
313
+ throw createUnsupportedError();
276
314
  }
277
315
  }
278
- throw unsupported();
316
+ throw createUnsupportedError();
279
317
  };
280
318
 
281
319
  // TLC loads a class named after each module and replaces each operator of the module that the
@@ -287,7 +325,7 @@ export const overrideDefinitions = (
287
325
  isRoot: boolean,
288
326
  ): { module: Module; overrides: JavaOverride[] } => {
289
327
  if (!bytes) return { module, overrides: [] };
290
- const classFile = readMethods(bytes);
328
+ const classFile = readClassFile(bytes);
291
329
  const arities = new Map(
292
330
  module.definitions
293
331
  .filter((definition) => isRoot || !definition.isLocal)
package/src/json.ts CHANGED
@@ -1,10 +1,10 @@
1
1
  import {
2
2
  createJavaOverrideError,
3
+ createModuleArgumentError,
3
4
  defineStateOperator,
4
5
  getJavaClassName,
5
6
  getValue,
6
7
  } from "./builtins";
7
- import { TlaModuleError } from "./errors";
8
8
  import type { Builtin } from "./evaluate";
9
9
  import {
10
10
  createRecord,
@@ -28,19 +28,19 @@ interface ParseContext {
28
28
  source?: string;
29
29
  }
30
30
 
31
- const TO_JSON =
31
+ const TO_JSON_SIGNATURE =
32
32
  "public static tlc2.value.impl.StringValue tlc2.module.Json.toJson(tlc2.value.IValue) throws java.io.IOException";
33
- const TO_JSON_ARRAY =
33
+ const TO_JSON_ARRAY_SIGNATURE =
34
34
  "public static tlc2.value.impl.StringValue tlc2.module.Json.toJsonArray(tlc2.value.IValue) throws java.io.IOException";
35
- const TO_JSON_OBJECT =
35
+ const TO_JSON_OBJECT_SIGNATURE =
36
36
  "public static tlc2.value.impl.StringValue tlc2.module.Json.toJsonObject(tlc2.value.IValue) throws java.io.IOException";
37
- const SERIALIZE =
37
+ const SERIALIZE_SIGNATURE =
38
38
  "public static synchronized tlc2.value.impl.BoolValue tlc2.module.Json.serialize(tlc2.value.impl.StringValue,tlc2.value.impl.Value) throws java.io.IOException";
39
- const ND_SERIALIZE =
39
+ const ND_SERIALIZE_SIGNATURE =
40
40
  "public static synchronized tlc2.value.impl.BoolValue tlc2.module.Json.ndSerialize(tlc2.value.impl.StringValue,tlc2.value.impl.Value) throws java.io.IOException";
41
- const DESERIALIZE =
41
+ const DESERIALIZE_SIGNATURE =
42
42
  "public static tlc2.value.IValue tlc2.module.Json.deserialize(tlc2.value.impl.StringValue) throws java.io.IOException";
43
- const ND_DESERIALIZE =
43
+ const ND_DESERIALIZE_SIGNATURE =
44
44
  "public static tlc2.value.IValue tlc2.module.Json.ndDeserialize(tlc2.value.impl.StringValue) throws java.io.IOException";
45
45
 
46
46
  const isRecord = (value: Value) => {
@@ -55,12 +55,6 @@ const createUnsupportedError = (method: string, value: Value) =>
55
55
  `Cannot convert value: unsupported value type tlc2.value.impl.${getJavaClassName(value)}`,
56
56
  );
57
57
 
58
- const createCastError = (method: string, value: Value) =>
59
- createJavaOverrideError(
60
- method,
61
- `Cannot cast tlc2.value.impl.${getJavaClassName(value)} to tlc2.value.impl.StringValue`,
62
- );
63
-
64
58
  const toJsonString = (text: string) =>
65
59
  JSON.stringify(text).replaceAll("\u2028", "\\u2028").replaceAll("\u2029", "\\u2029");
66
60
 
@@ -94,15 +88,15 @@ const toJson = (value: Value, method: string): string => {
94
88
  };
95
89
 
96
90
  const toJsonArray = (value: Value) => {
97
- if (isSetValue(value)) return toSetJson(value, TO_JSON_ARRAY);
91
+ if (isSetValue(value)) return toSetJson(value, TO_JSON_ARRAY_SIGNATURE);
98
92
  if (!isFunctionValue(value) || isRecord(value))
99
- throw createUnsupportedError(TO_JSON_ARRAY, value);
100
- return toFunctionJson(value, TO_JSON_ARRAY);
93
+ throw createUnsupportedError(TO_JSON_ARRAY_SIGNATURE, value);
94
+ return toFunctionJson(value, TO_JSON_ARRAY_SIGNATURE);
101
95
  };
102
96
 
103
97
  const toJsonObject = (value: Value) => {
104
- if (!isFunctionValue(value)) throw createUnsupportedError(TO_JSON_OBJECT, value);
105
- return toFunctionJson(value, TO_JSON_OBJECT);
98
+ if (!isFunctionValue(value)) throw createUnsupportedError(TO_JSON_OBJECT_SIGNATURE, value);
99
+ return toFunctionJson(value, TO_JSON_OBJECT_SIGNATURE);
106
100
  };
107
101
 
108
102
  // TLC reads a JSON number with Gson's intValue, which truncates the exact decimal toward zero and
@@ -150,7 +144,12 @@ const parseJson = (text: string, method: string) => {
150
144
  };
151
145
 
152
146
  const getPath = (value: Value, method: string) => {
153
- if (typeof value !== "string") throw createCastError(method, value);
147
+ if (typeof value !== "string") {
148
+ throw createJavaOverrideError(
149
+ method,
150
+ `Cannot cast tlc2.value.impl.${getJavaClassName(value)} to tlc2.value.impl.StringValue`,
151
+ );
152
+ }
154
153
  return value;
155
154
  };
156
155
 
@@ -164,7 +163,7 @@ const readText = (files: FileSystem, path: string, method: string) => {
164
163
 
165
164
  export const createJsonOperators = (files: FileSystem): Builtin[] => [
166
165
  defineStateOperator("ToJson", 1, (args) =>
167
- rankString(toJson(getValue(args, 0, "ToJson"), TO_JSON)),
166
+ rankString(toJson(getValue(args, 0, "ToJson"), TO_JSON_SIGNATURE)),
168
167
  ),
169
168
  defineStateOperator("ToJsonArray", 1, (args) =>
170
169
  rankString(toJsonArray(getValue(args, 0, "ToJsonArray"))),
@@ -173,43 +172,39 @@ export const createJsonOperators = (files: FileSystem): Builtin[] => [
173
172
  rankString(toJsonObject(getValue(args, 0, "ToJsonObject"))),
174
173
  ),
175
174
  defineStateOperator("JsonSerialize", 2, (args) => {
176
- const path = getPath(getValue(args, 0, "JsonSerialize"), SERIALIZE);
175
+ const path = getPath(getValue(args, 0, "JsonSerialize"), SERIALIZE_SIGNATURE);
177
176
  const value = getValue(args, 1, "JsonSerialize");
178
177
  if (!getSequenceElements(value) && !isRecord(value)) {
179
- throw new TlaModuleError(
180
- `The second argument of JsonSerialize should be a sequence or record, but instead it is:\n${formatValue(value)}`,
181
- );
178
+ throw createModuleArgumentError("second", "JsonSerialize", "sequence or record", value);
182
179
  }
183
- files.writeFile?.(path, toJson(value, SERIALIZE));
180
+ files.writeFile?.(path, toJson(value, SERIALIZE_SIGNATURE));
184
181
  return true;
185
182
  }),
186
183
  defineStateOperator("ndJsonSerialize", 2, (args) => {
187
- const path = getPath(getValue(args, 0, "ndJsonSerialize"), ND_SERIALIZE);
184
+ const path = getPath(getValue(args, 0, "ndJsonSerialize"), ND_SERIALIZE_SIGNATURE);
188
185
  const value = getValue(args, 1, "ndJsonSerialize");
189
186
  const elements = getSequenceElements(value);
190
187
  if (!elements) {
191
- throw new TlaModuleError(
192
- `The second argument of ndJsonSerialize should be a sequence, but instead it is:\n${formatValue(value)}`,
193
- );
188
+ throw createModuleArgumentError("second", "ndJsonSerialize", "sequence", value);
194
189
  }
195
190
  files.writeFile?.(
196
191
  path,
197
- elements.map((element) => `${toJson(element, ND_SERIALIZE)}\n`).join(""),
192
+ elements.map((element) => `${toJson(element, ND_SERIALIZE_SIGNATURE)}\n`).join(""),
198
193
  );
199
194
  return true;
200
195
  }),
201
196
  defineStateOperator("JsonDeserialize", 1, (args) => {
202
- const path = getPath(getValue(args, 0, "JsonDeserialize"), DESERIALIZE);
203
- return parseJson(readText(files, path, DESERIALIZE), DESERIALIZE);
197
+ const path = getPath(getValue(args, 0, "JsonDeserialize"), DESERIALIZE_SIGNATURE);
198
+ return parseJson(readText(files, path, DESERIALIZE_SIGNATURE), DESERIALIZE_SIGNATURE);
204
199
  }),
205
200
  defineStateOperator("ndJsonDeserialize", 1, (args) => {
206
- const path = getPath(getValue(args, 0, "ndJsonDeserialize"), ND_DESERIALIZE);
201
+ const path = getPath(getValue(args, 0, "ndJsonDeserialize"), ND_DESERIALIZE_SIGNATURE);
207
202
  return createTuple(
208
- readText(files, path, ND_DESERIALIZE)
203
+ readText(files, path, ND_DESERIALIZE_SIGNATURE)
209
204
  .split(/\r\n|\r|\n/)
210
205
  .map((line) => line.trim())
211
206
  .filter((line) => line !== "")
212
- .map((line) => parseJson(line, ND_DESERIALIZE)),
207
+ .map((line) => parseJson(line, ND_DESERIALIZE_SIGNATURE)),
213
208
  );
214
209
  }),
215
210
  ];