tla-ts 0.0.9 → 0.0.10-dev.06b481ee0

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 (631) hide show
  1. package/README.md +30 -1
  2. package/dist/compile.cjs +23 -0
  3. package/dist/compile.js +23 -0
  4. package/dist/deciders.cjs +41 -37
  5. package/dist/deciders.js +48 -44
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +122 -12
  8. package/dist/index.d.ts +122 -12
  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 +2746 -410
  15. package/dist/prove.js +2745 -409
  16. package/dist/run.cjs +144 -31
  17. package/dist/run.js +144 -31
  18. package/dist/tlapm.cjs +2 -2
  19. package/dist/tlapm.js +2 -2
  20. package/dist/transfer.cjs +134 -104
  21. package/dist/transfer.js +134 -104
  22. package/dist/worker.cjs +7 -7
  23. package/dist/worker.js +7 -7
  24. package/package.json +3 -1
  25. package/src/ast.ts +56 -60
  26. package/src/bags.ts +128 -110
  27. package/src/builtins.ts +31 -77
  28. package/src/bundled-modules.ts +1 -8
  29. package/src/check-failure.ts +118 -0
  30. package/src/check-trace.ts +320 -0
  31. package/src/check.ts +1156 -888
  32. package/src/cli/options.ts +12 -32
  33. package/src/cli/run.ts +0 -2
  34. package/src/cli/runtime-invariants.ts +100 -0
  35. package/src/cli/shared.ts +19 -12
  36. package/src/cli/tlapm.ts +433 -82
  37. package/src/cli/tlc-arguments.ts +652 -0
  38. package/src/cli/tlc-output.ts +701 -0
  39. package/src/cli/tlc-usage.ts +360 -0
  40. package/src/cli/tlc.ts +330 -659
  41. package/src/cli/typescript.ts +23 -0
  42. package/src/cli/xml-exporter.ts +27 -49
  43. package/src/cli.ts +0 -1
  44. package/src/codegen.ts +217 -82
  45. package/src/config.ts +140 -109
  46. package/src/coverage.ts +1019 -0
  47. package/src/dependencies.ts +101 -66
  48. package/src/dfid.ts +683 -0
  49. package/src/environment-config.ts +315 -0
  50. package/src/environment.ts +263 -370
  51. package/src/errors.ts +107 -57
  52. package/src/evaluate.ts +898 -369
  53. package/src/exit-codes.ts +63 -13
  54. package/src/fingerprints.ts +75 -11
  55. package/src/index.ts +3 -0
  56. package/src/instances.ts +137 -22
  57. package/src/java-hash.ts +21 -0
  58. package/src/java-overrides.ts +6 -21
  59. package/src/json-reader.ts +455 -0
  60. package/src/json.ts +252 -139
  61. package/src/levels.ts +231 -154
  62. package/src/lexer.ts +83 -101
  63. package/src/liveness-checker.ts +743 -322
  64. package/src/liveness.ts +230 -133
  65. package/src/obligations/action.ts +17 -44
  66. package/src/obligations/anonymize.ts +120 -95
  67. package/src/obligations/enabled-axioms.ts +218 -0
  68. package/src/obligations/equality.ts +1 -3
  69. package/src/obligations/expression.ts +37 -26
  70. package/src/obligations/format.ts +0 -10
  71. package/src/obligations/generate.ts +66 -64
  72. package/src/obligations/index.ts +39 -20
  73. package/src/obligations/levels.ts +27 -18
  74. package/src/obligations/module.ts +28 -55
  75. package/src/obligations/normalize.ts +31 -41
  76. package/src/obligations/operators.ts +0 -3
  77. package/src/obligations/pragma.ts +52 -24
  78. package/src/obligations/printer.ts +94 -63
  79. package/src/obligations/proof.ts +3 -6
  80. package/src/obligations/regroup.ts +0 -5
  81. package/src/obligations/simplify.ts +57 -63
  82. package/src/obligations/source.ts +121 -95
  83. package/src/obligations/subexpression.ts +49 -28
  84. package/src/obligations/substitution.ts +1 -5
  85. package/src/obligations/temporal.ts +12 -20
  86. package/src/obligations/tuples.ts +2 -10
  87. package/src/parallel-worker.ts +36 -60
  88. package/src/parallel.ts +64 -73
  89. package/src/parser.ts +1184 -531
  90. package/src/pcal/ast.ts +53 -86
  91. package/src/pcal/parse.ts +144 -219
  92. package/src/pcal/tokenize.ts +91 -131
  93. package/src/pcal/translate.ts +83 -130
  94. package/src/pcal/validate.ts +48 -68
  95. package/src/pretty-print.ts +7 -8
  96. package/src/prover/decide-pool.ts +8 -13
  97. package/src/prover/deciders.ts +12 -13
  98. package/src/prover/first-order.ts +0 -11
  99. package/src/prover/isabelle/decide.ts +3 -31
  100. package/src/prover/isabelle/encode.ts +82 -64
  101. package/src/prover/isabelle/isar/attrib.ts +250 -0
  102. package/src/prover/isabelle/isar/context.ts +335 -0
  103. package/src/prover/isabelle/isar/induct.ts +382 -0
  104. package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
  105. package/src/prover/isabelle/isar/method.ts +510 -226
  106. package/src/prover/isabelle/isar/proof.ts +570 -23
  107. package/src/prover/isabelle/isar/rule-cases.ts +226 -0
  108. package/src/prover/isabelle/isar/theory.ts +488 -88
  109. package/src/prover/isabelle/isar/toplevel.ts +331 -0
  110. package/src/prover/isabelle/isar/type-check.ts +99 -38
  111. package/src/prover/isabelle/provers/blast/blast.ts +16 -105
  112. package/src/prover/isabelle/provers/blast/branch.ts +0 -33
  113. package/src/prover/isabelle/provers/blast/prove.ts +0 -36
  114. package/src/prover/isabelle/provers/blast/rules.ts +5 -45
  115. package/src/prover/isabelle/provers/blast/state.ts +1 -29
  116. package/src/prover/isabelle/provers/blast/term.ts +8 -37
  117. package/src/prover/isabelle/provers/clasimp.ts +1 -15
  118. package/src/prover/isabelle/provers/classical.ts +58 -61
  119. package/src/prover/isabelle/provers/hypsubst.ts +29 -54
  120. package/src/prover/isabelle/pure/bicompose.ts +24 -39
  121. package/src/prover/isabelle/pure/consts.ts +0 -8
  122. package/src/prover/isabelle/pure/conv.ts +2 -18
  123. package/src/prover/isabelle/pure/drule.ts +95 -45
  124. package/src/prover/isabelle/pure/envir.ts +2 -53
  125. package/src/prover/isabelle/pure/goal.ts +1 -9
  126. package/src/prover/isabelle/pure/interrupt.ts +0 -5
  127. package/src/prover/isabelle/pure/list.ts +0 -3
  128. package/src/prover/isabelle/pure/logic.ts +1 -16
  129. package/src/prover/isabelle/pure/name.ts +1 -10
  130. package/src/prover/isabelle/pure/net.ts +2 -60
  131. package/src/prover/isabelle/pure/object-logic.ts +15 -16
  132. package/src/prover/isabelle/pure/pattern.ts +1 -20
  133. package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
  134. package/src/prover/isabelle/pure/rewriter.ts +34 -77
  135. package/src/prover/isabelle/pure/search.ts +2 -11
  136. package/src/prover/isabelle/pure/seq.ts +0 -11
  137. package/src/prover/isabelle/pure/simplifier.ts +27 -16
  138. package/src/prover/isabelle/pure/table.ts +2 -33
  139. package/src/prover/isabelle/pure/tactic.ts +11 -23
  140. package/src/prover/isabelle/pure/tactical.ts +47 -48
  141. package/src/prover/isabelle/pure/term-ord.ts +1 -7
  142. package/src/prover/isabelle/pure/term.ts +4 -47
  143. package/src/prover/isabelle/pure/thm.ts +26 -48
  144. package/src/prover/isabelle/pure/type.ts +1 -16
  145. package/src/prover/isabelle/pure/unify.ts +19 -31
  146. package/src/prover/isabelle/pure/variable.ts +2 -8
  147. package/src/prover/isabelle/tla/classical-setup.ts +17 -25
  148. package/src/prover/isabelle/tla/context.ts +65 -26
  149. package/src/prover/isabelle/tla/logic-data.ts +1 -1
  150. package/src/prover/isabelle/tla/logic.ts +53 -32
  151. package/src/prover/isabelle/tla/simpdata.ts +45 -44
  152. package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
  153. package/src/prover/ocaml.ts +4 -7
  154. package/src/prover/prep/action.ts +33 -66
  155. package/src/prover/prep/enabled-axioms.ts +22 -20
  156. package/src/prover/prep/fingerprint.ts +2 -21
  157. package/src/prover/prep/level-comparison.ts +8 -12
  158. package/src/prover/prep/md5.ts +26 -31
  159. package/src/prover/prep/methods.ts +189 -86
  160. package/src/prover/prep/normalize.ts +42 -37
  161. package/src/prover/prove-worker.ts +0 -2
  162. package/src/prover/prove.ts +398 -133
  163. package/src/prover/ptl/decide.ts +96 -56
  164. package/src/prover/ptl/encode.ts +15 -38
  165. package/src/prover/ptl/sat.ts +24 -32
  166. package/src/prover/ptl/tableau.ts +40 -28
  167. package/src/prover/smt/arithmetic.ts +310 -0
  168. package/src/prover/smt/axioms.ts +12 -15
  169. package/src/prover/smt/context.ts +60 -32
  170. package/src/prover/smt/data.ts +517 -401
  171. package/src/prover/smt/encode.ts +155 -85
  172. package/src/prover/smt/extensionality.ts +5 -13
  173. package/src/prover/smt/flatten.ts +7 -28
  174. package/src/prover/smt/format.ts +33 -14
  175. package/src/prover/smt/instances.ts +7 -11
  176. package/src/prover/smt/layout.ts +91 -0
  177. package/src/prover/smt/rewrite.ts +1021 -658
  178. package/src/prover/smt/simplify.ts +441 -0
  179. package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
  180. package/src/prover/smt/solver/ackr-helper.ts +179 -0
  181. package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
  182. package/src/prover/smt/solver/act-cache.ts +0 -16
  183. package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
  184. package/src/prover/smt/solver/aig-tactic.ts +52 -0
  185. package/src/prover/smt/solver/aig.ts +889 -0
  186. package/src/prover/smt/solver/arith-rewriter.ts +626 -56
  187. package/src/prover/smt/solver/arith-terms.ts +121 -0
  188. package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
  189. package/src/prover/smt/solver/array-rewriter.ts +319 -0
  190. package/src/prover/smt/solver/array.ts +1 -3
  191. package/src/prover/smt/solver/asserted-formulas.ts +241 -99
  192. package/src/prover/smt/solver/ast-lt.ts +165 -21
  193. package/src/prover/smt/solver/ast-util.ts +160 -7
  194. package/src/prover/smt/solver/ast.ts +1480 -184
  195. package/src/prover/smt/solver/auf-solver.ts +30 -56
  196. package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
  197. package/src/prover/smt/solver/bit-blaster.ts +871 -0
  198. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  199. package/src/prover/smt/solver/bound-manager.ts +196 -0
  200. package/src/prover/smt/solver/bound-simplifier.ts +598 -0
  201. package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
  202. package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
  203. package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
  204. package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
  205. package/src/prover/smt/solver/bv1-blast.ts +214 -0
  206. package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
  207. package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
  208. package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
  209. package/src/prover/smt/solver/card2bv.ts +127 -0
  210. package/src/prover/smt/solver/case-split-queue.ts +0 -10
  211. package/src/prover/smt/solver/cg-table.ts +39 -42
  212. package/src/prover/smt/solver/check-logic.ts +330 -0
  213. package/src/prover/smt/solver/clause.ts +0 -27
  214. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
  215. package/src/prover/smt/solver/conflict-resolution.ts +78 -11
  216. package/src/prover/smt/solver/context.ts +600 -187
  217. package/src/prover/smt/solver/ctx-simplify.ts +34 -52
  218. package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
  219. package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
  220. package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
  221. package/src/prover/smt/solver/demodulator.ts +786 -0
  222. package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
  223. package/src/prover/smt/solver/der.ts +39 -30
  224. package/src/prover/smt/solver/diff-neq.ts +205 -0
  225. package/src/prover/smt/solver/distribute-forall.ts +57 -0
  226. package/src/prover/smt/solver/dom-simplify.ts +511 -0
  227. package/src/prover/smt/solver/dt2bv-tactic.ts +296 -0
  228. package/src/prover/smt/solver/dyn-ack.ts +0 -11
  229. package/src/prover/smt/solver/e-matching.ts +9 -41
  230. package/src/prover/smt/solver/elim-bounds.ts +89 -0
  231. package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
  232. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  233. package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
  234. package/src/prover/smt/solver/enode.ts +100 -23
  235. package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
  236. package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
  237. package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
  238. package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
  239. package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
  240. package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
  241. package/src/prover/smt/solver/euf/array-solver.ts +306 -0
  242. package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
  243. package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
  244. package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
  245. package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
  246. package/src/prover/smt/solver/euf/egraph.ts +901 -0
  247. package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
  248. package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
  249. package/src/prover/smt/solver/euf/mam.ts +1046 -0
  250. package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
  251. package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
  252. package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
  253. package/src/prover/smt/solver/euf/q-solver.ts +361 -0
  254. package/src/prover/smt/solver/euf/th-solver.ts +328 -0
  255. package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
  256. package/src/prover/smt/solver/expr-ref.ts +0 -5
  257. package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
  258. package/src/prover/smt/solver/expr2polynomial.ts +271 -0
  259. package/src/prover/smt/solver/factor.ts +163 -0
  260. package/src/prover/smt/solver/fd-solver.ts +734 -0
  261. package/src/prover/smt/solver/fingerprints.ts +15 -26
  262. package/src/prover/smt/solver/fix-dl-var.ts +147 -0
  263. package/src/prover/smt/solver/flat-literals.ts +0 -9
  264. package/src/prover/smt/solver/fm-tactic.ts +884 -0
  265. package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
  266. package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
  267. package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
  268. package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
  269. package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
  270. package/src/prover/smt/solver/goal.ts +179 -28
  271. package/src/prover/smt/solver/goal2nlsat.ts +216 -0
  272. package/src/prover/smt/solver/guard-set.ts +219 -0
  273. package/src/prover/smt/solver/hash.ts +0 -9
  274. package/src/prover/smt/solver/hashtable.ts +30 -23
  275. package/src/prover/smt/solver/inf-eps.ts +63 -0
  276. package/src/prover/smt/solver/inj-axiom.ts +101 -0
  277. package/src/prover/smt/solver/internalizer.ts +113 -133
  278. package/src/prover/smt/solver/lackr.ts +381 -0
  279. package/src/prover/smt/solver/lbool.ts +0 -2
  280. package/src/prover/smt/solver/lia2card.ts +268 -0
  281. package/src/prover/smt/solver/lia2pb.ts +154 -0
  282. package/src/prover/smt/solver/literal.ts +0 -4
  283. package/src/prover/smt/solver/logic-tactics.ts +355 -0
  284. package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
  285. package/src/prover/smt/solver/lp/constraints.ts +1 -8
  286. package/src/prover/smt/solver/lp/containers.ts +18 -31
  287. package/src/prover/smt/solver/lp/core-solver.ts +35 -37
  288. package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
  289. package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
  290. package/src/prover/smt/solver/lp/dependency.ts +0 -5
  291. package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
  292. package/src/prover/smt/solver/lp/explanation.ts +0 -6
  293. package/src/prover/smt/solver/lp/gomory.ts +8 -22
  294. package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
  295. package/src/prover/smt/solver/lp/hnf.ts +10 -28
  296. package/src/prover/smt/solver/lp/int-cube.ts +17 -39
  297. package/src/prover/smt/solver/lp/int-solver.ts +3 -35
  298. package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
  299. package/src/prover/smt/solver/lp/lar-term.ts +0 -5
  300. package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
  301. package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
  302. package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
  303. package/src/prover/smt/solver/lp/nex.ts +2 -7
  304. package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
  305. package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
  306. package/src/prover/smt/solver/lp/nla-core.ts +92 -136
  307. package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
  308. package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
  309. package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
  310. package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
  311. package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
  312. package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
  313. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
  314. package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
  315. package/src/prover/smt/solver/lp/nla-order.ts +0 -13
  316. package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
  317. package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
  318. package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
  319. package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
  320. package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
  321. package/src/prover/smt/solver/lp/nla-types.ts +0 -12
  322. package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
  323. package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
  324. package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
  325. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
  326. package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
  327. package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
  328. package/src/prover/smt/solver/lp/pdd.ts +730 -358
  329. package/src/prover/smt/solver/lp/random-updater.ts +0 -9
  330. package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
  331. package/src/prover/smt/solver/lp/union-find.ts +5 -5
  332. package/src/prover/smt/solver/macro-finder.ts +530 -0
  333. package/src/prover/smt/solver/mam-compiler.ts +129 -139
  334. package/src/prover/smt/solver/mam-interpreter.ts +0 -21
  335. package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
  336. package/src/prover/smt/solver/max-cliques.ts +105 -0
  337. package/src/prover/smt/solver/maxcore.ts +310 -0
  338. package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
  339. package/src/prover/smt/solver/maxlex.ts +115 -0
  340. package/src/prover/smt/solver/maxsmt-base.ts +106 -0
  341. package/src/prover/smt/solver/maxsmt.ts +92 -0
  342. package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
  343. package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
  344. package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
  345. package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
  346. package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
  347. package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
  348. package/src/prover/smt/solver/model-based-opt.ts +844 -0
  349. package/src/prover/smt/solver/model-checker.ts +20 -63
  350. package/src/prover/smt/solver/model-evaluator.ts +192 -40
  351. package/src/prover/smt/solver/model-finder.ts +14 -32
  352. package/src/prover/smt/solver/model-generator.ts +104 -46
  353. package/src/prover/smt/solver/model-macro-solver.ts +60 -114
  354. package/src/prover/smt/solver/model-printer.ts +214 -0
  355. package/src/prover/smt/solver/mpf.ts +709 -0
  356. package/src/prover/smt/solver/mus.ts +50 -0
  357. package/src/prover/smt/solver/muz/dl-context.ts +382 -0
  358. package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
  359. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
  360. package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
  361. package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
  362. package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
  363. package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
  364. package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
  365. package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
  366. package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
  367. package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
  368. package/src/prover/smt/solver/muz/hnf.ts +201 -0
  369. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
  370. package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
  371. package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
  372. package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
  373. package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
  374. package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
  375. package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
  376. package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
  377. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
  378. package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
  379. package/src/prover/smt/solver/muz/substitution.ts +203 -0
  380. package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
  381. package/src/prover/smt/solver/nlqsat.ts +484 -0
  382. package/src/prover/smt/solver/nlsat/algebraic.ts +357 -236
  383. package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
  384. package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
  385. package/src/prover/smt/solver/nlsat/explain.ts +429 -275
  386. package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
  387. package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
  388. package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
  389. package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
  390. package/src/prover/smt/solver/nlsat/solver.ts +297 -156
  391. package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
  392. package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
  393. package/src/prover/smt/solver/nlsat/types.ts +0 -9
  394. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
  395. package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
  396. package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
  397. package/src/prover/smt/solver/nnf.ts +112 -61
  398. package/src/prover/smt/solver/normalize-bounds.ts +53 -0
  399. package/src/prover/smt/solver/occf.ts +97 -0
  400. package/src/prover/smt/solver/opt-context.ts +801 -0
  401. package/src/prover/smt/solver/opt-nlsat.ts +386 -0
  402. package/src/prover/smt/solver/opt-pareto.ts +301 -0
  403. package/src/prover/smt/solver/opt-preprocess.ts +101 -0
  404. package/src/prover/smt/solver/opt-solver.ts +312 -0
  405. package/src/prover/smt/solver/opt-value.ts +55 -0
  406. package/src/prover/smt/solver/optsmt.ts +692 -0
  407. package/src/prover/smt/solver/parallel-tactic.ts +299 -0
  408. package/src/prover/smt/solver/pattern-inference.ts +21 -26
  409. package/src/prover/smt/solver/pb-rewriter.ts +281 -0
  410. package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
  411. package/src/prover/smt/solver/poly-rewriter.ts +261 -79
  412. package/src/prover/smt/solver/probes.ts +577 -0
  413. package/src/prover/smt/solver/propagate-values.ts +37 -30
  414. package/src/prover/smt/solver/proto-model.ts +650 -66
  415. package/src/prover/smt/solver/pull-quant.ts +28 -23
  416. package/src/prover/smt/solver/purify-arith.ts +632 -0
  417. package/src/prover/smt/solver/push-app-ite.ts +37 -0
  418. package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
  419. package/src/prover/smt/solver/qe-lite-der.ts +2 -31
  420. package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
  421. package/src/prover/smt/solver/qe-lite.ts +41 -51
  422. package/src/prover/smt/solver/qe-mbp.ts +270 -0
  423. package/src/prover/smt/solver/qe.ts +1499 -0
  424. package/src/prover/smt/solver/qel.ts +25 -0
  425. package/src/prover/smt/solver/qi-queue.ts +0 -16
  426. package/src/prover/smt/solver/qsat.ts +829 -0
  427. package/src/prover/smt/solver/quant-hoist.ts +196 -0
  428. package/src/prover/smt/solver/quant-tactics.ts +17 -74
  429. package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
  430. package/src/prover/smt/solver/quantifier-manager.ts +22 -32
  431. package/src/prover/smt/solver/quasi-macros.ts +243 -0
  432. package/src/prover/smt/solver/random-gen.ts +0 -2
  433. package/src/prover/smt/solver/rational.ts +45 -8
  434. package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
  435. package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
  436. package/src/prover/smt/solver/reduce-args.ts +225 -0
  437. package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
  438. package/src/prover/smt/solver/ref-vector.ts +0 -6
  439. package/src/prover/smt/solver/relevancy.ts +2 -16
  440. package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
  441. package/src/prover/smt/solver/rewriter.ts +507 -144
  442. package/src/prover/smt/solver/rlimit.ts +46 -24
  443. package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
  444. package/src/prover/smt/solver/sat/big.ts +177 -0
  445. package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
  446. package/src/prover/smt/solver/sat/clause.ts +203 -0
  447. package/src/prover/smt/solver/sat/cleaner.ts +94 -0
  448. package/src/prover/smt/solver/sat/config.ts +122 -0
  449. package/src/prover/smt/solver/sat/consequences.ts +203 -0
  450. package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
  451. package/src/prover/smt/solver/sat/goal2sat.ts +579 -0
  452. package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
  453. package/src/prover/smt/solver/sat/model-converter.ts +136 -0
  454. package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
  455. package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
  456. package/src/prover/smt/solver/sat/probing.ts +170 -0
  457. package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
  458. package/src/prover/smt/solver/sat/sat2goal.ts +189 -0
  459. package/src/prover/smt/solver/sat/scc.ts +142 -0
  460. package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
  461. package/src/prover/smt/solver/sat/solver.ts +2107 -0
  462. package/src/prover/smt/solver/sat/var-queue.ts +117 -0
  463. package/src/prover/smt/solver/sat/watch-list.ts +140 -0
  464. package/src/prover/smt/solver/search-tree.ts +284 -0
  465. package/src/prover/smt/solver/seq-axioms.ts +995 -0
  466. package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
  467. package/src/prover/smt/solver/seq-derive.ts +1298 -0
  468. package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
  469. package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
  470. package/src/prover/smt/solver/seq-factory.ts +89 -0
  471. package/src/prover/smt/solver/seq-monadic.ts +730 -0
  472. package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
  473. package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
  474. package/src/prover/smt/solver/seq-re-util.ts +758 -0
  475. package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
  476. package/src/prover/smt/solver/seq-regex-live.ts +200 -0
  477. package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
  478. package/src/prover/smt/solver/seq-skolem.ts +294 -0
  479. package/src/prover/smt/solver/seq-subset.ts +165 -0
  480. package/src/prover/smt/solver/seq-view-witness.ts +353 -0
  481. package/src/prover/smt/solver/smt-consequences.ts +297 -0
  482. package/src/prover/smt/solver/smt-kernel.ts +124 -0
  483. package/src/prover/smt/solver/smt-logics.ts +66 -0
  484. package/src/prover/smt/solver/smt-setup.ts +589 -0
  485. package/src/prover/smt/solver/smt2-printer.ts +765 -0
  486. package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
  487. package/src/prover/smt/solver/smtlib-script.ts +2134 -0
  488. package/src/prover/smt/solver/solve-eqs.ts +928 -0
  489. package/src/prover/smt/solver/solver.ts +135 -40
  490. package/src/prover/smt/solver/sort.ts +1 -5
  491. package/src/prover/smt/solver/static-features.ts +314 -0
  492. package/src/prover/smt/solver/sticky-generations.ts +0 -6
  493. package/src/prover/smt/solver/tactic.ts +2141 -0
  494. package/src/prover/smt/solver/term-enumeration.ts +205 -0
  495. package/src/prover/smt/solver/theory-array.ts +1240 -0
  496. package/src/prover/smt/solver/theory-bv.ts +1210 -0
  497. package/src/prover/smt/solver/theory-char.ts +355 -0
  498. package/src/prover/smt/solver/theory-datatype.ts +598 -0
  499. package/src/prover/smt/solver/theory-finite-set.ts +30 -0
  500. package/src/prover/smt/solver/theory-fpa.ts +389 -0
  501. package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
  502. package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
  503. package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
  504. package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
  505. package/src/prover/smt/solver/theory-lra-model.ts +23 -53
  506. package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
  507. package/src/prover/smt/solver/theory-lra-state.ts +7 -28
  508. package/src/prover/smt/solver/theory-lra.ts +189 -9
  509. package/src/prover/smt/solver/theory-pb.ts +951 -0
  510. package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
  511. package/src/prover/smt/solver/theory-recfun.ts +307 -0
  512. package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
  513. package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
  514. package/src/prover/smt/solver/theory-seq-state.ts +852 -0
  515. package/src/prover/smt/solver/theory-seq.ts +961 -0
  516. package/src/prover/smt/solver/theory-without-terms.ts +24 -0
  517. package/src/prover/smt/solver/theory.ts +189 -0
  518. package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
  519. package/src/prover/smt/solver/var-subst.ts +37 -39
  520. package/src/prover/smt/table.ts +3 -10
  521. package/src/prover/smt/types.ts +146 -0
  522. package/src/prover/tlapm/cache.ts +74 -48
  523. package/src/prover/tlapm/ocaml-marshal.ts +19 -21
  524. package/src/prover/tlapm/tlapm.ts +21 -20
  525. package/src/prover/tlapm-library.ts +3208 -0
  526. package/src/prover/verdict.ts +9 -2
  527. package/src/prover/zenon/check/check.ts +1 -11
  528. package/src/prover/zenon/check/definitions.ts +5 -15
  529. package/src/prover/zenon/check/equality.ts +0 -8
  530. package/src/prover/zenon/check/functions.ts +0 -4
  531. package/src/prover/zenon/check/keys.ts +0 -7
  532. package/src/prover/zenon/check/propositional.ts +0 -3
  533. package/src/prover/zenon/check/records.ts +1 -6
  534. package/src/prover/zenon/check/relations.ts +2 -14
  535. package/src/prover/zenon/check/rewrites.ts +2 -21
  536. package/src/prover/zenon/check/sets.ts +40 -61
  537. package/src/prover/zenon/check/terms.ts +1 -19
  538. package/src/prover/zenon/check/tla.ts +0 -6
  539. package/src/prover/zenon/decide.ts +10 -19
  540. package/src/prover/zenon/encode.ts +0 -9
  541. package/src/prover/zenon/eqrel.ts +2 -15
  542. package/src/prover/zenon/equality-rules.ts +24 -6
  543. package/src/prover/zenon/expr.ts +29 -28
  544. package/src/prover/zenon/index-table.ts +33 -61
  545. package/src/prover/zenon/isar-case.ts +9 -21
  546. package/src/prover/zenon/isar.ts +37 -67
  547. package/src/prover/zenon/limits.ts +0 -4
  548. package/src/prover/zenon/llproof.ts +2 -22
  549. package/src/prover/zenon/mltoll.ts +66 -106
  550. package/src/prover/zenon/node.ts +20 -15
  551. package/src/prover/zenon/ocaml.ts +1 -17
  552. package/src/prover/zenon/parse.ts +9 -13
  553. package/src/prover/zenon/phrase.ts +2 -14
  554. package/src/prover/zenon/proof.ts +0 -11
  555. package/src/prover/zenon/propositional-rules.ts +0 -7
  556. package/src/prover/zenon/rules.ts +3 -8
  557. package/src/prover/zenon/search.ts +11 -35
  558. package/src/prover/zenon/tla/functions.ts +59 -33
  559. package/src/prover/zenon/tla/llproof.ts +67 -78
  560. package/src/prover/zenon/tla/records.ts +57 -35
  561. package/src/prover/zenon/tla/rewrites.ts +12 -21
  562. package/src/prover/zenon/tla/sets.ts +88 -59
  563. package/src/prover/zenon/tla/terms.ts +0 -8
  564. package/src/prover/zenon/tla/tla.ts +66 -66
  565. package/src/randomization.ts +81 -35
  566. package/src/resolve.ts +1132 -430
  567. package/src/runtime.ts +33 -23
  568. package/src/sany/builtins.ts +11 -14
  569. package/src/sany/generation.ts +383 -0
  570. package/src/sany/generator-def-entries.ts +210 -0
  571. package/src/sany/generator-definitions.ts +688 -0
  572. package/src/sany/generator-expressions.ts +1108 -0
  573. package/src/sany/generator-proofs.ts +665 -0
  574. package/src/sany/generator.ts +192 -2764
  575. package/src/sany/levels.ts +5 -35
  576. package/src/sany/lexer.ts +61 -80
  577. package/src/sany/linter.ts +0 -10
  578. package/src/sany/modules.ts +5 -7
  579. package/src/sany/nodes.ts +6 -44
  580. package/src/sany/parse-error.ts +39 -117
  581. package/src/sany/report.ts +32 -69
  582. package/src/sany/selectors.ts +60 -82
  583. package/src/sany/source.ts +1 -17
  584. package/src/sany/xml.ts +37 -120
  585. package/src/search.ts +913 -227
  586. package/src/simulate.ts +765 -0
  587. package/src/spec-description.ts +198 -104
  588. package/src/standard-definitions.ts +4 -4
  589. package/src/standard-modules.ts +302 -99
  590. package/src/state-graph.ts +52 -33
  591. package/src/subexpressions.ts +578 -166
  592. package/src/substitution-levels.ts +7 -7
  593. package/src/successors.ts +299 -108
  594. package/src/symmetry.ts +37 -28
  595. package/src/tableau.ts +29 -26
  596. package/src/tlc/fingerprint.ts +267 -79
  597. package/src/tlc/jar-data.ts +122 -6
  598. package/src/tlc/messages.ts +127 -56
  599. package/src/tlc/order.ts +53 -72
  600. package/src/tlc/random.ts +38 -49
  601. package/src/tlc/replay.ts +579 -230
  602. package/src/tlc/summary.ts +64 -60
  603. package/src/tlc/tlc-operators.ts +83 -47
  604. package/src/tlc/tlcext-operators.ts +205 -127
  605. package/src/tlc/trace-spec.ts +235 -0
  606. package/src/tlc/value-stream.ts +139 -0
  607. package/src/tlc/version.ts +1 -4
  608. package/src/trace-liveness.ts +529 -0
  609. package/src/transfer.ts +22 -25
  610. package/src/typed-tier.ts +6556 -0
  611. package/src/typescript/actions.ts +479 -0
  612. package/src/typescript/collections.ts +614 -0
  613. package/src/typescript/compile.ts +63 -0
  614. package/src/typescript/context.ts +94 -0
  615. package/src/typescript/emit.ts +121 -0
  616. package/src/typescript/expressions.ts +496 -0
  617. package/src/typescript/formula.ts +154 -0
  618. package/src/typescript/functions.ts +284 -0
  619. package/src/typescript/model.ts +162 -0
  620. package/src/typescript/names.ts +114 -0
  621. package/src/typescript/program.ts +48 -0
  622. package/src/typescript/properties.ts +139 -0
  623. package/src/typescript/scope.ts +112 -0
  624. package/src/typescript/steps.ts +167 -0
  625. package/src/typescript/types.ts +171 -0
  626. package/src/values.ts +945 -526
  627. package/src/worker.ts +7 -8
  628. package/src/prover/isabelle/isar/statement.ts +0 -57
  629. package/src/prover/smt/solver/z3-license.txt +0 -10
  630. package/src/prover/tlaps-module.ts +0 -510
  631. package/src/prover/zenon/LICENSE +0 -32
package/src/pcal/ast.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  import { PcalBugError, PcalError, PcalRuntimeError } from "../errors";
2
2
  import type { TlcVersion } from "../tlc/version";
3
3
 
4
- // TLAToken's types.
5
4
  export const PCAL_TOKEN = { builtin: 1, number: 2, string: 3, ident: 4, added: 5 } as const;
6
5
 
7
6
  export interface PcalToken {
@@ -10,22 +9,17 @@ export interface PcalToken {
10
9
  type: number;
11
10
  }
12
11
 
13
- // TLAExpr: the tokens of an expression, line by line, and for each line the token of an earlier
14
- // line it is aligned under, with that token's column when the expression was normalized.
15
12
  export interface PcalExpr {
16
13
  tokens: PcalToken[][];
17
14
  anchorTokens: (PcalToken | undefined)[] | undefined;
18
15
  anchorTokCol: number[] | undefined;
19
16
  }
20
17
 
21
- // IntPair, as the "Java coordinates" of a token in an expression.
22
18
  interface PcalCoord {
23
19
  line: number;
24
20
  item: number;
25
21
  }
26
22
 
27
- // PcalParams: the translator's options, which the Java keeps in static fields that SANY never
28
- // resets, so options one module sets carry over to the modules SANY validates after it.
29
23
  export interface PcalParams {
30
24
  labelFlag: boolean;
31
25
  labelRoot: string;
@@ -36,7 +30,6 @@ export interface PcalParams {
36
30
  inputVersionNumber: number;
37
31
  }
38
32
 
39
- // PcalParams.versionWeight.
40
33
  export const PCAL_VERSION_WEIGHT = 1903;
41
34
 
42
35
  export const createPcalParams = (): PcalParams => ({
@@ -49,20 +42,21 @@ export const createPcalParams = (): PcalParams => ({
49
42
  inputVersionNumber: PCAL_VERSION_WEIGHT,
50
43
  });
51
44
 
52
- // PcalParams.VersionToNumber: "1.5" is 1500, and -1 means a malformed version.
53
45
  export const getPcalVersionNumber = (text: string) => {
54
- const state = { result: 0, digitsAfterDecimal: 0, isAfterDecimal: false };
46
+ let result = 0;
47
+ let digitsAfterDecimal = 0;
48
+ let isAfterDecimal = false;
55
49
  for (const char of text) {
56
50
  if (char === ".") {
57
- state.isAfterDecimal = true;
51
+ isAfterDecimal = true;
58
52
  continue;
59
53
  }
60
54
  if (char < "0" || char > "9") return -1;
61
- state.result = 10 * state.result + Number(char);
62
- if (state.isAfterDecimal) state.digitsAfterDecimal += 1;
63
- if (state.digitsAfterDecimal > 3) return -1;
55
+ result = 10 * result + Number(char);
56
+ if (isAfterDecimal) digitsAfterDecimal += 1;
57
+ if (digitsAfterDecimal > 3) return -1;
64
58
  }
65
- return state.result * 10 ** Math.max(0, 3 - state.digitsAfterDecimal);
59
+ return result * 10 ** Math.max(0, 3 - digitsAfterDecimal);
66
60
  };
67
61
 
68
62
  interface PcalBase {
@@ -104,7 +98,6 @@ export interface PcalProcedure extends PcalBase {
104
98
  body: PcalStmt[];
105
99
  }
106
100
 
107
- // AST.UNFAIR_PROC, WF_PROC and SF_PROC index FairnessString.
108
101
  const PCAL_FAIRNESS = ["unfair", "wf", "sf"];
109
102
 
110
103
  export interface PcalProcess extends PcalBase {
@@ -229,7 +222,6 @@ export interface PcalCall extends PcalBase {
229
222
  args: PcalExpr[];
230
223
  }
231
224
 
232
- // A Return or CallReturn outside a procedure has a null from, which Java prints as "null".
233
225
  export interface PcalReturn extends PcalBase {
234
226
  kind: "Return";
235
227
  from: string | undefined;
@@ -309,20 +301,17 @@ export const createPcalBase = (): PcalBase => ({
309
301
  lbl: "",
310
302
  });
311
303
 
312
- // AST.location.
313
304
  export const getPcalLocation = (node: PcalBase) =>
314
305
  node.macroLine < 0
315
306
  ? `line ${node.line}, column ${node.col}`
316
307
  : `line ${node.line}, column ${node.col} of macro called at line ${node.macroLine}, column ${node.macroCol}`;
317
308
 
318
- // A Java cast of a statement to AST.LabeledStmt.
319
309
  export const toLabeledStmt = (node: PcalStmt) => {
320
310
  if (node.kind !== "LabeledStmt") throw new PcalRuntimeError(`ClassCastException: ${node.kind}`);
321
311
  return node;
322
312
  };
323
313
 
324
- // Vector.elementAt, which throws for an index out of bounds.
325
- export const getElement = <T>(vector: T[], index: number) => {
314
+ export const getElement = <Item>(vector: Item[], index: number) => {
326
315
  if (index < 0 || index >= vector.length) {
327
316
  throw new PcalRuntimeError(`ArrayIndexOutOfBoundsException: ${index}`);
328
317
  }
@@ -335,7 +324,6 @@ export const createPcalToken = (string: string, column: number, type: number): P
335
324
  type,
336
325
  });
337
326
 
338
- // TLAToken.getWidth: a string token's width counts its quotes.
339
327
  export const getPcalTokenWidth = (token: PcalToken) =>
340
328
  token.type === PCAL_TOKEN.string ? token.string.length + 2 : token.string.length;
341
329
 
@@ -345,8 +333,6 @@ export const createPcalExpr = (tokens: PcalToken[][] = []): PcalExpr => ({
345
333
  anchorTokCol: undefined,
346
334
  });
347
335
 
348
- // TLAExpr.normalize: drops empty first and last lines, shifts the tokens left as far as they go,
349
- // and records the token each line is aligned under.
350
336
  export const normalizePcalExpr = (expr: PcalExpr) => {
351
337
  while (expr.tokens.length > 0 && expr.tokens[0].length === 0) expr.tokens.shift();
352
338
  while (expr.tokens.length > 0 && expr.tokens[expr.tokens.length - 1].length === 0) {
@@ -387,7 +373,6 @@ export const createNormalizedPcalExpr = (tokens: PcalToken[][]) => {
387
373
  return expr;
388
374
  };
389
375
 
390
- // TLAExpr.renormalize: shifts each line right by as much as its anchor token has moved.
391
376
  const renormalizePcalExpr = (expr: PcalExpr) => {
392
377
  const anchorTokens = expr.anchorTokens;
393
378
  const anchorTokCol = expr.anchorTokCol;
@@ -409,7 +394,6 @@ const renormalizePcalExpr = (expr: PcalExpr) => {
409
394
  export const clonePcalExpr = (expr: PcalExpr) =>
410
395
  createNormalizedPcalExpr(expr.tokens.map((line) => line.map((token) => ({ ...token }))));
411
396
 
412
- // TLAExpr.prepend: puts prefix in front of the expression, spaces columns before its first token.
413
397
  export const prependPcalExpr = (expr: PcalExpr, prefix: PcalExpr, spaces: number) => {
414
398
  const prefixLines = prefix.tokens.length;
415
399
  expr.tokens.splice(0, 0, ...prefix.tokens.slice(0, prefixLines - 1));
@@ -438,7 +422,6 @@ export const isOneTokenPcalExpr = (expr: PcalExpr) =>
438
422
  export const getPcalTokenAt = (expr: PcalExpr, coord: PcalCoord) =>
439
423
  getElement(getElement(expr.tokens, coord.line), coord.item);
440
424
 
441
- // TLAExpr.stepCoord: the coordinates steps tokens after coord, or undefined past the end.
442
425
  export const stepPcalCoord = (expr: PcalExpr, coord: PcalCoord, steps: number) => {
443
426
  if (expr.tokens.length <= coord.line) {
444
427
  throw new PcalBugError("TLAExpr.StepCoord called with line too big");
@@ -461,13 +444,10 @@ export const stepPcalCoord = (expr: PcalExpr, coord: PcalCoord, steps: number) =
461
444
  return result;
462
445
  };
463
446
 
464
- // TLAExpr.findNextInstanceIn: the next token id at or after start that is not a record field
465
- // name, such as the a in r.a, [a |-> 1] or [a : S].
466
447
  const findNextInstance = (expr: PcalExpr, id: string, start: PcalCoord) => {
467
448
  for (let coord = expr.tokens.length === 0 ? undefined : { ...start }; coord !== undefined;) {
468
449
  const token = getPcalTokenAt(expr, coord);
469
450
  const isString = token.type === PCAL_TOKEN.string;
470
- // The id is an identifier, so a token that is the id is none of the tokens skipped below.
471
451
  if (!isString && token.string === id) return coord;
472
452
  const afterNext =
473
453
  !isString && (token.string === "[" || token.string === ",")
@@ -484,9 +464,6 @@ const findNextInstance = (expr: PcalExpr, id: string, start: PcalCoord) => {
484
464
  return undefined;
485
465
  };
486
466
 
487
- // TLAExpr.substituteAt: replaces the token at coord with a copy of replacement, parenthesized when
488
- // isParenthesized and replacement has more than one token, and returns the coordinates of the
489
- // token after it.
490
467
  const substituteAt = (
491
468
  expr: PcalExpr,
492
469
  replacement: PcalExpr,
@@ -507,13 +484,10 @@ const substituteAt = (
507
484
  ? tokenLine[coord.item + 1].column - (token.column + getPcalTokenWidth(token))
508
485
  : 0;
509
486
  const restOfLine = tokenLine.splice(coord.item + 1);
510
- // The line the replacement's tokens go on, and how far right they move.
511
- const cursor = {
512
- lineIndex: coord.line,
513
- indent: (isParenthesized ? 1 : 0) + token.column,
514
- isInserting: !isParenthesized,
515
- };
516
- const getLine = () => expr.tokens[cursor.lineIndex];
487
+ let lineIndex = coord.line;
488
+ let indent = (isParenthesized ? 1 : 0) + token.column;
489
+ let isInserting = !isParenthesized;
490
+ const getLine = () => expr.tokens[lineIndex];
517
491
  if (isOneTokenPcalExpr(replacement)) {
518
492
  const replacementToken = replacement.tokens[0][0];
519
493
  token.string = replacementToken.string;
@@ -526,30 +500,30 @@ const substituteAt = (
526
500
  const newExpr = clonePcalExpr(replacement);
527
501
  newExpr.tokens.forEach((replacementLine, index) => {
528
502
  replacementLine.forEach((nextToken) => {
529
- nextToken.column += cursor.indent;
530
- if (!cursor.isInserting) {
503
+ nextToken.column += indent;
504
+ if (!isInserting) {
531
505
  getLine().push(nextToken);
532
506
  return;
533
507
  }
534
508
  token.string = nextToken.string;
535
509
  token.type = nextToken.type;
536
- cursor.isInserting = false;
510
+ isInserting = false;
537
511
  });
538
512
  if (index + 1 >= newExpr.tokens.length) return;
539
- cursor.indent = 0;
540
- cursor.lineIndex += 1;
541
- const currentLine = cursor.lineIndex;
513
+ indent = 0;
514
+ lineIndex += 1;
515
+ const currentLine = lineIndex;
542
516
  expr.tokens.splice(currentLine, 0, []);
543
517
  const oldAnchors = expr.anchorTokens ?? [];
544
518
  const oldColumns = expr.anchorTokCol ?? [];
545
- expr.anchorTokens = expr.tokens.map((_, item) =>
519
+ expr.anchorTokens = expr.tokens.map((_line, item) =>
546
520
  item < currentLine
547
521
  ? oldAnchors[item]
548
522
  : item === currentLine
549
523
  ? newExpr.anchorTokens?.[index + 1]
550
524
  : oldAnchors[item - 1],
551
525
  );
552
- expr.anchorTokCol = expr.tokens.map((_, item) =>
526
+ expr.anchorTokCol = expr.tokens.map((_line, item) =>
553
527
  item < currentLine
554
528
  ? oldColumns[item]
555
529
  : item === currentLine
@@ -565,7 +539,7 @@ const substituteAt = (
565
539
  }
566
540
  }
567
541
  const line = getLine();
568
- const result = { line: cursor.lineIndex, item: line.length - 1 };
542
+ const result = { line: lineIndex, item: line.length - 1 };
569
543
  if (restOfLine.length > 0) {
570
544
  const previous = line[line.length - 1];
571
545
  const shift = previous.column + getPcalTokenWidth(previous) + spaces - restOfLine[0].column;
@@ -578,8 +552,6 @@ const substituteAt = (
578
552
  return stepPcalCoord(expr, result, 1);
579
553
  };
580
554
 
581
- // TLAExpr.substituteForAll: replaces each instance of names[i] with exprs[i], in the order the
582
- // instances appear.
583
555
  export const substitutePcalExpr = (
584
556
  expr: PcalExpr,
585
557
  exprs: PcalExpr[],
@@ -625,11 +597,9 @@ export const getSubstitutedPcalExpr = (expr: PcalExpr, args: PcalExpr[], params:
625
597
  return result;
626
598
  };
627
599
 
628
- // TLAExpr.SeqSubstituteForAll.
629
600
  export const substitutePcalExprs = (exprs: PcalExpr[], args: PcalExpr[], params: string[]) =>
630
601
  exprs.map((expr) => getSubstitutedPcalExpr(expr, args, params));
631
602
 
632
- // TLAExpr.toString, which names the column of a junction except in TLC 1.7.4.
633
603
  const formatPcalExpr = (expr: PcalExpr, version?: TlcVersion) => {
634
604
  const getColumn = (token: PcalToken) => (version === "1.7.4" ? "" : `(col${token.column}) `);
635
605
  const tokens = expr.tokens.map((line) =>
@@ -651,8 +621,6 @@ const formatPcalExpr = (expr: PcalExpr, version?: TlcVersion) => {
651
621
  return `<< ${text} >>`;
652
622
  };
653
623
 
654
- // AST.toString: the TLA+ record that PlusCal.tla uses for the node. Indent, EndIndent and NewLine
655
- // keep a stack of indentation columns as the Java concatenates the record's text left to right.
656
624
  export const formatPcalNode = (
657
625
  node: PcalNode,
658
626
  inputVersionNumber: number,
@@ -660,95 +628,94 @@ export const formatPcalNode = (
660
628
  ) => {
661
629
  const formatExpr = (expr: PcalExpr) => formatPcalExpr(expr, version);
662
630
  const columns = [0];
663
- const depth = { value: 0 };
631
+ let depth = 0;
664
632
  const indent = (text: string) => {
665
- columns[depth.value + 1] = columns[depth.value] + text.length;
666
- depth.value += 1;
633
+ columns[depth + 1] = columns[depth] + text.length;
634
+ depth += 1;
667
635
  return text;
668
636
  };
669
637
  const endIndent = () => {
670
- depth.value -= 1;
638
+ depth -= 1;
671
639
  return "";
672
640
  };
673
- const newLine = () => `\n${" ".repeat(columns[depth.value])}`;
641
+ const getNewLine = () => `\n${" ".repeat(columns[depth])}`;
674
642
  const isOldVersion = inputVersionNumber < 1500;
675
- // The separators' new lines take the indentation the elements before them leave.
676
643
  const formatSeq = (vector: (PcalNode | PcalExpr)[]) =>
677
644
  `${indent("<<")}${vector
678
645
  .map(
679
646
  (element, index) =>
680
- `${index > 0 ? `, ${newLine()}` : ""}${"kind" in element ? format(element) : formatExpr(element)}`,
647
+ `${index > 0 ? `, ${getNewLine()}` : ""}${"kind" in element ? format(element) : formatExpr(element)}`,
681
648
  )
682
649
  .join("")}>>${endIndent()}`;
683
650
  const formatQuotedSeq = (vector: string[]) =>
684
651
  `${indent("<<")}${vector.map((element) => `"${element}"`).join(", ")}>>${endIndent()}`;
685
652
  const formatSeqOfSeqs = (vectors: PcalStmt[][]) =>
686
653
  `${indent("<< ")}${vectors
687
- .map((vector, index) => `${index > 0 ? `, ${newLine()}` : ""}${formatSeq(vector)}`)
654
+ .map((vector, index) => `${index > 0 ? `, ${getNewLine()}` : ""}${formatSeq(vector)}`)
688
655
  .join("")} >>${endIndent()}`;
689
656
  const formatEqOrIn = (isEq: boolean) => (isEq ? '"="' : '"\\\\in"');
690
657
  const format = (node: PcalNode): string => {
691
658
  switch (node.kind) {
692
659
  case "Uniprocess":
693
- return `${indent("")}[type |-> "uniprocess", ${newLine()} name |-> "${node.name}", ${newLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${newLine()}${indent(" defs |-> ")}${formatExpr(node.defs)},${endIndent()}${newLine()}${indent(" prcds |-> ")}${formatSeq(node.prcds)},${endIndent()}${newLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`;
660
+ return `${indent("")}[type |-> "uniprocess", ${getNewLine()} name |-> "${node.name}", ${getNewLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${getNewLine()}${indent(" defs |-> ")}${formatExpr(node.defs)},${endIndent()}${getNewLine()}${indent(" prcds |-> ")}${formatSeq(node.prcds)},${endIndent()}${getNewLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`;
694
661
  case "Multiprocess":
695
- return `${indent("")}[type |-> "multiprocess", ${newLine()} name |-> "${node.name}", ${newLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${newLine()}${indent(" defs |-> ")}${formatExpr(node.defs)},${endIndent()}${newLine()}${indent(" prcds |-> ")}${formatSeq(node.prcds)},${endIndent()}${newLine()}${indent(" procs |-> ")}${formatSeq(node.procs)}]${endIndent()}${endIndent()}`;
662
+ return `${indent("")}[type |-> "multiprocess", ${getNewLine()} name |-> "${node.name}", ${getNewLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${getNewLine()}${indent(" defs |-> ")}${formatExpr(node.defs)},${endIndent()}${getNewLine()}${indent(" prcds |-> ")}${formatSeq(node.prcds)},${endIndent()}${getNewLine()}${indent(" procs |-> ")}${formatSeq(node.procs)}]${endIndent()}${endIndent()}`;
696
663
  case "Procedure":
697
664
  return isOldVersion
698
- ? `${indent("")}[name |-> "${node.name}", ${newLine()}${indent(" params |-> ")}${formatSeq(node.params)},${endIndent()}${newLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${newLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`
699
- : `${indent("")}[name |-> "${node.name}", ${newLine()}minusLabels |-> ${formatQuotedSeq(node.minusLabels)}, plusLabels |->${formatQuotedSeq(node.plusLabels)}, proceduresCalled |->${formatQuotedSeq(node.proceduresCalled)},${newLine()}${indent(" params |-> ")}${formatSeq(node.params)},${endIndent()}${newLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${newLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`;
665
+ ? `${indent("")}[name |-> "${node.name}", ${getNewLine()}${indent(" params |-> ")}${formatSeq(node.params)},${endIndent()}${getNewLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${getNewLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`
666
+ : `${indent("")}[name |-> "${node.name}", ${getNewLine()}minusLabels |-> ${formatQuotedSeq(node.minusLabels)}, plusLabels |->${formatQuotedSeq(node.plusLabels)}, proceduresCalled |->${formatQuotedSeq(node.proceduresCalled)},${getNewLine()}${indent(" params |-> ")}${formatSeq(node.params)},${endIndent()}${getNewLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${getNewLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`;
700
667
  case "Process":
701
668
  return isOldVersion
702
- ? `${indent("")}[name |-> "${node.name}", ${newLine()} eqOrIn |-> ${formatEqOrIn(node.isEq)},${newLine()} id |-> ${formatExpr(node.id)},${newLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${newLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`
703
- : `${indent("")}[name |-> "${node.name}",${newLine()} fairness |-> "${PCAL_FAIRNESS[node.fairness]}", minusLabels |-> ${formatQuotedSeq(node.minusLabels)}, plusLabels |->${formatQuotedSeq(node.plusLabels)}, proceduresCalled |->${formatQuotedSeq(node.proceduresCalled)},${newLine()} eqOrIn |-> ${formatEqOrIn(node.isEq)},${newLine()} id |-> ${formatExpr(node.id)},${newLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${newLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`;
669
+ ? `${indent("")}[name |-> "${node.name}", ${getNewLine()} eqOrIn |-> ${formatEqOrIn(node.isEq)},${getNewLine()} id |-> ${formatExpr(node.id)},${getNewLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${getNewLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`
670
+ : `${indent("")}[name |-> "${node.name}",${getNewLine()} fairness |-> "${PCAL_FAIRNESS[node.fairness]}", minusLabels |-> ${formatQuotedSeq(node.minusLabels)}, plusLabels |->${formatQuotedSeq(node.plusLabels)}, proceduresCalled |->${formatQuotedSeq(node.proceduresCalled)},${getNewLine()} eqOrIn |-> ${formatEqOrIn(node.isEq)},${getNewLine()} id |-> ${formatExpr(node.id)},${getNewLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${getNewLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`;
704
671
  case "VarDecl":
705
672
  return `${indent("")}[var |-> "${node.var}", eqOrIn |-> ${formatEqOrIn(node.isEq)}, val |-> ${formatExpr(node.val)}]${endIndent()}`;
706
673
  case "PVarDecl":
707
674
  return `${indent("")}[var |-> "${node.var}", eqOrIn |-> "=", val |-> ${formatExpr(node.val)}]${endIndent()}`;
708
675
  case "LabeledStmt":
709
- return `${indent("")}[label |-> "${node.label}",${newLine()}${indent(" stmts |-> ")}${formatSeq(node.stmts)}]${endIndent()}${endIndent()}`;
676
+ return `${indent("")}[label |-> "${node.label}",${getNewLine()}${indent(" stmts |-> ")}${formatSeq(node.stmts)}]${endIndent()}${endIndent()}`;
710
677
  case "While":
711
- return `${indent("")}[type |-> "while", ${newLine()} test |-> ${formatExpr(node.test)},${newLine()}${indent(" labDo |-> ")}${formatSeq(node.labDo)},${endIndent()}${newLine()}${indent(" unlabDo |-> ")}${formatSeq(node.unlabDo)}]${endIndent()}${endIndent()}`;
678
+ return `${indent("")}[type |-> "while", ${getNewLine()} test |-> ${formatExpr(node.test)},${getNewLine()}${indent(" labDo |-> ")}${formatSeq(node.labDo)},${endIndent()}${getNewLine()}${indent(" unlabDo |-> ")}${formatSeq(node.unlabDo)}]${endIndent()}${endIndent()}`;
712
679
  case "Assign":
713
- return `${indent("")}[type |-> "assignment",${newLine()}${indent(" ass |-> ")}${formatSeq(node.ass)}]${endIndent()}${endIndent()}`;
680
+ return `${indent("")}[type |-> "assignment",${getNewLine()}${indent(" ass |-> ")}${formatSeq(node.ass)}]${endIndent()}${endIndent()}`;
714
681
  case "SingleAssign":
715
- return `${indent("")}[lhs |-> ${format(node.lhs)},${newLine()} rhs |-> ${formatExpr(node.rhs)}]${endIndent()}`;
682
+ return `${indent("")}[lhs |-> ${format(node.lhs)},${getNewLine()} rhs |-> ${formatExpr(node.rhs)}]${endIndent()}`;
716
683
  case "Lhs":
717
684
  return `[var |-> "${node.var}", sub |-> ${formatExpr(node.sub)}]`;
718
685
  case "If":
719
- return `${indent("")}[type |-> "if", ${newLine()} test |-> ${formatExpr(node.test)},${newLine()}${indent(" then |-> ")}${formatSeq(node.Then)},${endIndent()}${newLine()}${indent(" else |-> ")}${formatSeq(node.Else)}]${endIndent()}${endIndent()}`;
686
+ return `${indent("")}[type |-> "if", ${getNewLine()} test |-> ${formatExpr(node.test)},${getNewLine()}${indent(" then |-> ")}${formatSeq(node.Then)},${endIndent()}${getNewLine()}${indent(" else |-> ")}${formatSeq(node.Else)}]${endIndent()}${endIndent()}`;
720
687
  case "Either":
721
- return `${indent("")}[type |-> "either", ${newLine()}${indent(" ors |-> ")}${formatSeqOfSeqs(node.ors)}]${endIndent()}${endIndent()}`;
688
+ return `${indent("")}[type |-> "either", ${getNewLine()}${indent(" ors |-> ")}${formatSeqOfSeqs(node.ors)}]${endIndent()}${endIndent()}`;
722
689
  case "With":
723
- return `${indent("")}[type |-> "with", ${newLine()} var |-> "${node.var}",${newLine()} eqOrIn |-> ${formatEqOrIn(node.isEq)},${newLine()} exp |-> ${formatExpr(node.exp)},${newLine()}${indent(" do |-> ")}${formatSeq(node.Do)}]${endIndent()}${endIndent()}`;
690
+ return `${indent("")}[type |-> "with", ${getNewLine()} var |-> "${node.var}",${getNewLine()} eqOrIn |-> ${formatEqOrIn(node.isEq)},${getNewLine()} exp |-> ${formatExpr(node.exp)},${getNewLine()}${indent(" do |-> ")}${formatSeq(node.Do)}]${endIndent()}${endIndent()}`;
724
691
  case "When":
725
- return `${indent("")}[type |-> "when", ${newLine()} exp |-> ${formatExpr(node.exp)}]${endIndent()}`;
692
+ return `${indent("")}[type |-> "when", ${getNewLine()} exp |-> ${formatExpr(node.exp)}]${endIndent()}`;
726
693
  case "PrintS":
727
- return `${indent("")}[type |-> "print", ${newLine()} exp |-> ${formatExpr(node.exp)}]${endIndent()}`;
694
+ return `${indent("")}[type |-> "print", ${getNewLine()} exp |-> ${formatExpr(node.exp)}]${endIndent()}`;
728
695
  case "Assert":
729
- return `${indent("")}[type |-> "assert", ${newLine()} exp |-> ${formatExpr(node.exp)}]${endIndent()}`;
696
+ return `${indent("")}[type |-> "assert", ${getNewLine()} exp |-> ${formatExpr(node.exp)}]${endIndent()}`;
730
697
  case "Skip":
731
698
  return '[type |-> "skip"]';
732
699
  case "LabelIf":
733
- return `${indent("")}[type |-> "labelIf",${newLine()} test |-> ${formatExpr(node.test)},${newLine()}${indent(" unlabThen |-> ")}${formatSeq(node.unlabThen)},${endIndent()}${newLine()}${indent(" labThen |-> ")}${formatSeq(node.labThen)},${endIndent()}${newLine()}${indent(" unlabElse |-> ")}${formatSeq(node.unlabElse)},${endIndent()}${newLine()}${indent(" labElse |-> ")}${formatSeq(node.labElse)}]${endIndent()}${newLine()}${endIndent()}`;
700
+ return `${indent("")}[type |-> "labelIf",${getNewLine()} test |-> ${formatExpr(node.test)},${getNewLine()}${indent(" unlabThen |-> ")}${formatSeq(node.unlabThen)},${endIndent()}${getNewLine()}${indent(" labThen |-> ")}${formatSeq(node.labThen)},${endIndent()}${getNewLine()}${indent(" unlabElse |-> ")}${formatSeq(node.unlabElse)},${endIndent()}${getNewLine()}${indent(" labElse |-> ")}${formatSeq(node.labElse)}]${endIndent()}${getNewLine()}${endIndent()}`;
734
701
  case "LabelEither":
735
- return `${indent("")}[type |-> "labelEither",${newLine()}${indent(" clauses |-> ")}${formatSeq(node.clauses)}]${endIndent()}${newLine()}${endIndent()}`;
702
+ return `${indent("")}[type |-> "labelEither",${getNewLine()}${indent(" clauses |-> ")}${formatSeq(node.clauses)}]${endIndent()}${getNewLine()}${endIndent()}`;
736
703
  case "Clause":
737
- return `${indent("")}${indent("[unlabOr |-> ")}${formatSeq(node.unlabOr)},${endIndent()}${newLine()}${indent(" labOr |-> ")}${formatSeq(node.labOr)}]${endIndent()}${newLine()}${endIndent()}`;
704
+ return `${indent("")}${indent("[unlabOr |-> ")}${formatSeq(node.unlabOr)},${endIndent()}${getNewLine()}${indent(" labOr |-> ")}${formatSeq(node.labOr)}]${endIndent()}${getNewLine()}${endIndent()}`;
738
705
  case "Call":
739
- return `${indent("")}[type |-> "call",${newLine()} returnTo |-> "${node.returnTo}",${newLine()} to |-> "${node.to}",${newLine()}${indent(" args |-> ")}${formatSeq(node.args)}]${endIndent()}${endIndent()}`;
706
+ return `${indent("")}[type |-> "call",${getNewLine()} returnTo |-> "${node.returnTo}",${getNewLine()} to |-> "${node.to}",${getNewLine()}${indent(" args |-> ")}${formatSeq(node.args)}]${endIndent()}${endIndent()}`;
740
707
  case "Return":
741
708
  return `[type |-> "return", from |-> "${node.from ?? "null"}"]`;
742
709
  case "CallReturn":
743
- return `${indent("")}[type |-> "callReturn",${newLine()} from |-> "${node.from ?? "null"}",${newLine()} to |-> "${node.to}",${newLine()}${indent("args |-> ")}${formatSeq(node.args)}]${newLine()}${endIndent()}${endIndent()}`;
710
+ return `${indent("")}[type |-> "callReturn",${getNewLine()} from |-> "${node.from ?? "null"}",${getNewLine()} to |-> "${node.to}",${getNewLine()}${indent("args |-> ")}${formatSeq(node.args)}]${getNewLine()}${endIndent()}${endIndent()}`;
744
711
  case "CallGoto":
745
- return `${indent("")}[type |-> "callGoto",${newLine()} after |-> "${node.after}",${newLine()} to |-> "${node.to}",${newLine()}${indent("args |-> ")}${formatSeq(node.args)}]${newLine()}${endIndent()}${endIndent()}`;
712
+ return `${indent("")}[type |-> "callGoto",${getNewLine()} after |-> "${node.after}",${getNewLine()} to |-> "${node.to}",${getNewLine()}${indent("args |-> ")}${formatSeq(node.args)}]${getNewLine()}${endIndent()}${endIndent()}`;
746
713
  case "Goto":
747
714
  return `[type |-> "goto", to |-> "${node.to}"]`;
748
715
  case "Macro":
749
- return `${indent("")}[name |-> "${node.name}", ${newLine()}${indent(" params |-> ")}${indent("<<")}${node.params.join(`, ${newLine()}`)}>>${endIndent()},${endIndent()}${newLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`;
716
+ return `${indent("")}[name |-> "${node.name}", ${getNewLine()}${indent(" params |-> ")}${indent("<<")}${node.params.join(`, ${getNewLine()}`)}>>${endIndent()},${endIndent()}${getNewLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`;
750
717
  case "MacroCall":
751
- return `${indent("")}[type |-> "macrocall",${newLine()} name |-> "${node.name}",${newLine()}${indent(" args |-> ")}${formatSeq(node.args)}]${endIndent()}${endIndent()}`;
718
+ return `${indent("")}[type |-> "macrocall",${getNewLine()} name |-> "${node.name}",${getNewLine()}${indent(" args |-> ")}${formatSeq(node.args)}]${endIndent()}${endIndent()}`;
752
719
  }
753
720
  };
754
721
  return format(node);