tla-ts 0.0.4 → 0.0.5-dev.cc59f31

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 (378) hide show
  1. package/README.md +37 -126
  2. package/dist/cli.cjs +1 -1
  3. package/dist/cli.js +1 -1
  4. package/dist/deciders.cjs +366 -0
  5. package/dist/deciders.js +366 -0
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +46 -12
  8. package/dist/index.d.ts +46 -12
  9. package/dist/index.js +1 -1
  10. package/dist/parallel-worker.cjs +1 -4
  11. package/dist/parallel-worker.js +1 -4
  12. package/dist/prove-worker.cjs +9 -0
  13. package/dist/prove-worker.d.cts +9 -0
  14. package/dist/prove-worker.d.ts +9 -0
  15. package/dist/prove-worker.js +9 -0
  16. package/dist/prove.cjs +1006 -0
  17. package/dist/prove.js +1006 -0
  18. package/dist/run.cjs +45 -0
  19. package/dist/run.js +45 -0
  20. package/dist/tlapm.cjs +10 -0
  21. package/dist/tlapm.js +10 -0
  22. package/dist/transfer.cjs +76 -92
  23. package/dist/transfer.js +76 -92
  24. package/dist/worker.cjs +21 -0
  25. package/dist/worker.js +21 -0
  26. package/package.json +21 -12
  27. package/src/ast.ts +2 -2
  28. package/src/bags.ts +22 -23
  29. package/src/builtins.ts +16 -8
  30. package/src/check.ts +131 -1153
  31. package/src/{cli-options.ts → cli/options.ts} +54 -9
  32. package/src/cli/run.ts +63 -0
  33. package/src/cli/shared.ts +106 -0
  34. package/src/cli/tlapm.ts +374 -0
  35. package/src/{run-cli.ts → cli/tlc.ts} +115 -721
  36. package/src/cli/xml-exporter.ts +221 -0
  37. package/src/cli.ts +1 -1
  38. package/src/codegen.ts +43 -22
  39. package/src/config.ts +5 -5
  40. package/src/dependencies.ts +4 -6
  41. package/src/environment.ts +55 -60
  42. package/src/errors.ts +97 -35
  43. package/src/evaluate.ts +361 -181
  44. package/src/exit-codes.ts +1 -1
  45. package/src/fingerprints.ts +3 -3
  46. package/src/index.ts +10 -0
  47. package/src/instances.ts +56 -46
  48. package/src/java-overrides.ts +79 -41
  49. package/src/json.ts +31 -36
  50. package/src/levels.ts +10 -13
  51. package/src/{live-check.ts → liveness-checker.ts} +207 -141
  52. package/src/liveness.ts +38 -34
  53. package/src/{obligation-action.ts → obligations/action.ts} +248 -74
  54. package/src/{obligation-anon.ts → obligations/anonymize.ts} +55 -57
  55. package/src/obligations/equality.ts +260 -0
  56. package/src/obligations/expression.ts +618 -0
  57. package/src/{obligation-format.ts → obligations/format.ts} +7 -8
  58. package/src/obligations/generate.ts +457 -0
  59. package/src/{obligations.ts → obligations/index.ts} +46 -32
  60. package/src/{obligation-levels.ts → obligations/levels.ts} +44 -40
  61. package/src/obligations/module.ts +445 -0
  62. package/src/obligations/normalize.ts +554 -0
  63. package/src/obligations/operators.ts +176 -0
  64. package/src/obligations/pragma.ts +195 -0
  65. package/src/{obligation-printer.ts → obligations/printer.ts} +65 -230
  66. package/src/{obligation-proof.ts → obligations/proof.ts} +7 -2
  67. package/src/obligations/regroup.ts +100 -0
  68. package/src/{obligation-generate.ts → obligations/simplify.ts} +130 -536
  69. package/src/{obligation-source.ts → obligations/source.ts} +172 -216
  70. package/src/{obligation-deref.ts → obligations/subexpression.ts} +84 -115
  71. package/src/obligations/substitution.ts +261 -0
  72. package/src/obligations/temporal.ts +321 -0
  73. package/src/{obligation-tuples.ts → obligations/tuples.ts} +38 -54
  74. package/src/parallel-worker.ts +39 -51
  75. package/src/parallel.ts +39 -66
  76. package/src/parser.ts +67 -74
  77. package/src/{pcal-ast.ts → pcal/ast.ts} +2 -17
  78. package/src/{pcal-parse.ts → pcal/parse.ts} +28 -64
  79. package/src/{pcal-tokenize.ts → pcal/tokenize.ts} +10 -39
  80. package/src/{pcal-translate.ts → pcal/translate.ts} +30 -109
  81. package/src/{pcal-validate.ts → pcal/validate.ts} +10 -20
  82. package/src/prover/decide-pool.ts +95 -0
  83. package/src/prover/deciders.ts +33 -0
  84. package/src/prover/first-order.ts +175 -0
  85. package/src/prover/isabelle/LICENSE +36 -0
  86. package/src/prover/isabelle/LICENSE-tlapm +26 -0
  87. package/src/prover/isabelle/decide.ts +44 -0
  88. package/src/prover/isabelle/encode.ts +445 -0
  89. package/src/prover/isabelle/isar/inner-syntax.ts +579 -0
  90. package/src/prover/isabelle/isar/method.ts +367 -0
  91. package/src/prover/isabelle/isar/proof.ts +28 -0
  92. package/src/prover/isabelle/isar/statement.ts +57 -0
  93. package/src/prover/isabelle/isar/theory.ts +192 -0
  94. package/src/prover/isabelle/isar/type-check.ts +278 -0
  95. package/src/prover/isabelle/provers/blast/blast.ts +258 -0
  96. package/src/prover/isabelle/provers/blast/branch.ts +322 -0
  97. package/src/prover/isabelle/provers/blast/prove.ts +347 -0
  98. package/src/prover/isabelle/provers/blast/rules.ts +330 -0
  99. package/src/prover/isabelle/provers/blast/state.ts +180 -0
  100. package/src/prover/isabelle/provers/blast/term.ts +546 -0
  101. package/src/prover/isabelle/provers/clasimp.ts +150 -0
  102. package/src/prover/isabelle/provers/classical.ts +389 -0
  103. package/src/prover/isabelle/provers/hypsubst.ts +433 -0
  104. package/src/prover/isabelle/pure/bicompose.ts +174 -0
  105. package/src/prover/isabelle/pure/consts.ts +32 -0
  106. package/src/prover/isabelle/pure/conv.ts +79 -0
  107. package/src/prover/isabelle/pure/drule.ts +264 -0
  108. package/src/prover/isabelle/pure/envir.ts +331 -0
  109. package/src/prover/isabelle/pure/goal.ts +53 -0
  110. package/src/prover/isabelle/pure/interrupt.ts +16 -0
  111. package/src/prover/isabelle/pure/list.ts +12 -0
  112. package/src/prover/isabelle/pure/logic.ts +330 -0
  113. package/src/prover/isabelle/pure/name.ts +98 -0
  114. package/src/prover/isabelle/pure/net.ts +215 -0
  115. package/src/prover/isabelle/pure/object-logic.ts +41 -0
  116. package/src/prover/isabelle/pure/pattern.ts +631 -0
  117. package/src/prover/isabelle/pure/raw-simplifier.ts +338 -0
  118. package/src/prover/isabelle/pure/rewriter.ts +602 -0
  119. package/src/prover/isabelle/pure/search.ts +68 -0
  120. package/src/prover/isabelle/pure/seq.ts +133 -0
  121. package/src/prover/isabelle/pure/simplifier.ts +106 -0
  122. package/src/prover/isabelle/pure/table.ts +201 -0
  123. package/src/prover/isabelle/pure/tactic.ts +168 -0
  124. package/src/prover/isabelle/pure/tactical.ts +264 -0
  125. package/src/prover/isabelle/pure/term-ord.ts +105 -0
  126. package/src/prover/isabelle/pure/term.ts +688 -0
  127. package/src/prover/isabelle/pure/thm.ts +783 -0
  128. package/src/prover/isabelle/pure/type.ts +121 -0
  129. package/src/prover/isabelle/pure/unify.ts +753 -0
  130. package/src/prover/isabelle/pure/variable.ts +25 -0
  131. package/src/prover/isabelle/tla/classical-setup.ts +101 -0
  132. package/src/prover/isabelle/tla/context.ts +74 -0
  133. package/src/prover/isabelle/tla/logic-data.ts +5 -0
  134. package/src/prover/isabelle/tla/logic.ts +215 -0
  135. package/src/prover/isabelle/tla/simpdata.ts +241 -0
  136. package/src/prover/isabelle/tools/intuitionistic.ts +132 -0
  137. package/src/prover/ocaml.ts +22 -0
  138. package/src/prover/prep/action.ts +508 -0
  139. package/src/prover/prep/enabled-axioms.ts +189 -0
  140. package/src/prover/prep/fingerprint.ts +388 -0
  141. package/src/prover/prep/level-comparison.ts +529 -0
  142. package/src/prover/prep/md5.ts +60 -0
  143. package/src/prover/prep/methods.ts +221 -0
  144. package/src/prover/prep/normalize.ts +309 -0
  145. package/src/prover/prove-worker.ts +22 -0
  146. package/src/prover/prove.ts +492 -0
  147. package/src/prover/ptl/decide.ts +68 -0
  148. package/src/prover/ptl/encode.ts +244 -0
  149. package/src/prover/ptl/sat.ts +151 -0
  150. package/src/prover/ptl/tableau.ts +276 -0
  151. package/src/prover/smt/axioms.ts +209 -0
  152. package/src/prover/smt/context.ts +108 -0
  153. package/src/prover/smt/data.ts +636 -0
  154. package/src/prover/smt/encode.ts +275 -0
  155. package/src/prover/smt/extensionality.ts +65 -0
  156. package/src/prover/smt/flatten.ts +112 -0
  157. package/src/prover/smt/format.ts +154 -0
  158. package/src/prover/smt/instances.ts +181 -0
  159. package/src/prover/smt/rewrite.ts +766 -0
  160. package/src/prover/smt/solver/act-cache.ts +265 -0
  161. package/src/prover/smt/solver/arith-rewriter.ts +962 -0
  162. package/src/prover/smt/solver/array.ts +22 -0
  163. package/src/prover/smt/solver/asserted-formulas.ts +469 -0
  164. package/src/prover/smt/solver/ast-lt.ts +157 -0
  165. package/src/prover/smt/solver/ast-util.ts +91 -0
  166. package/src/prover/smt/solver/ast.ts +1315 -0
  167. package/src/prover/smt/solver/auf-solver.ts +572 -0
  168. package/src/prover/smt/solver/case-split-queue.ts +178 -0
  169. package/src/prover/smt/solver/cg-table.ts +175 -0
  170. package/src/prover/smt/solver/clause.ts +276 -0
  171. package/src/prover/smt/solver/conflict-resolution.ts +343 -0
  172. package/src/prover/smt/solver/context.ts +1292 -0
  173. package/src/prover/smt/solver/ctx-simplify.ts +334 -0
  174. package/src/prover/smt/solver/der.ts +224 -0
  175. package/src/prover/smt/solver/dyn-ack.ts +141 -0
  176. package/src/prover/smt/solver/e-matching.ts +659 -0
  177. package/src/prover/smt/solver/enode.ts +259 -0
  178. package/src/prover/smt/solver/expr-ref.ts +21 -0
  179. package/src/prover/smt/solver/expr-safe-replace.ts +172 -0
  180. package/src/prover/smt/solver/fingerprints.ts +92 -0
  181. package/src/prover/smt/solver/flat-literals.ts +51 -0
  182. package/src/prover/smt/solver/goal.ts +138 -0
  183. package/src/prover/smt/solver/hash.ts +173 -0
  184. package/src/prover/smt/solver/hashtable.ts +166 -0
  185. package/src/prover/smt/solver/internalizer.ts +1381 -0
  186. package/src/prover/smt/solver/lbool.ts +5 -0
  187. package/src/prover/smt/solver/literal.ts +24 -0
  188. package/src/prover/smt/solver/lp/bound-propagator.ts +391 -0
  189. package/src/prover/smt/solver/lp/constraints.ts +78 -0
  190. package/src/prover/smt/solver/lp/containers.ts +296 -0
  191. package/src/prover/smt/solver/lp/core-solver.ts +504 -0
  192. package/src/prover/smt/solver/lp/cross-nested.ts +224 -0
  193. package/src/prover/smt/solver/lp/dep-intervals.ts +642 -0
  194. package/src/prover/smt/solver/lp/dependency.ts +51 -0
  195. package/src/prover/smt/solver/lp/dioph-eq.ts +1181 -0
  196. package/src/prover/smt/solver/lp/explanation.ts +46 -0
  197. package/src/prover/smt/solver/lp/gomory.ts +255 -0
  198. package/src/prover/smt/solver/lp/hnf-cutter.ts +125 -0
  199. package/src/prover/smt/solver/lp/hnf.ts +281 -0
  200. package/src/prover/smt/solver/lp/int-cube.ts +295 -0
  201. package/src/prover/smt/solver/lp/int-solver.ts +514 -0
  202. package/src/prover/smt/solver/lp/lar-solver.ts +816 -0
  203. package/src/prover/smt/solver/lp/lar-term.ts +62 -0
  204. package/src/prover/smt/solver/lp/lp-settings.ts +91 -0
  205. package/src/prover/smt/solver/lp/maximize-term.ts +347 -0
  206. package/src/prover/smt/solver/lp/nex-creator.ts +381 -0
  207. package/src/prover/smt/solver/lp/nex.ts +120 -0
  208. package/src/prover/smt/solver/lp/nla-backoff.ts +43 -0
  209. package/src/prover/smt/solver/lp/nla-basics.ts +398 -0
  210. package/src/prover/smt/solver/lp/nla-core.ts +968 -0
  211. package/src/prover/smt/solver/lp/nla-divisions.ts +332 -0
  212. package/src/prover/smt/solver/lp/nla-emonics.ts +373 -0
  213. package/src/prover/smt/solver/lp/nla-factorization.ts +30 -0
  214. package/src/prover/smt/solver/lp/nla-grobner.ts +904 -0
  215. package/src/prover/smt/solver/lp/nla-horner.ts +126 -0
  216. package/src/prover/smt/solver/lp/nla-intervals.ts +265 -0
  217. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +715 -0
  218. package/src/prover/smt/solver/lp/nla-monotone.ts +59 -0
  219. package/src/prover/smt/solver/lp/nla-order.ts +307 -0
  220. package/src/prover/smt/solver/lp/nla-patcher.ts +112 -0
  221. package/src/prover/smt/solver/lp/nla-tangents.ts +251 -0
  222. package/src/prover/smt/solver/lp/nla-throttle.ts +85 -0
  223. package/src/prover/smt/solver/lp/nla-types.ts +124 -0
  224. package/src/prover/smt/solver/lp/nla-var-eqs.ts +141 -0
  225. package/src/prover/smt/solver/lp/nra-solver.ts +440 -0
  226. package/src/prover/smt/solver/lp/numeric-pair.ts +65 -0
  227. package/src/prover/smt/solver/lp/pdd-interval.ts +31 -0
  228. package/src/prover/smt/solver/lp/pdd-simplifier.ts +184 -0
  229. package/src/prover/smt/solver/lp/pdd-solver.ts +408 -0
  230. package/src/prover/smt/solver/lp/pdd.ts +971 -0
  231. package/src/prover/smt/solver/lp/random-updater.ts +138 -0
  232. package/src/prover/smt/solver/lp/static-matrix.ts +246 -0
  233. package/src/prover/smt/solver/lp/union-find.ts +96 -0
  234. package/src/prover/smt/solver/mam-compiler.ts +847 -0
  235. package/src/prover/smt/solver/mam-interpreter.ts +400 -0
  236. package/src/prover/smt/solver/maximize-ac-sharing.ts +118 -0
  237. package/src/prover/smt/solver/model-checker.ts +347 -0
  238. package/src/prover/smt/solver/model-evaluator.ts +262 -0
  239. package/src/prover/smt/solver/model-finder.ts +155 -0
  240. package/src/prover/smt/solver/model-generator.ts +97 -0
  241. package/src/prover/smt/solver/model-macro-solver.ts +728 -0
  242. package/src/prover/smt/solver/nlsat/algebraic.ts +1161 -0
  243. package/src/prover/smt/solver/nlsat/atoms.ts +238 -0
  244. package/src/prover/smt/solver/nlsat/evaluator.ts +303 -0
  245. package/src/prover/smt/solver/nlsat/explain.ts +607 -0
  246. package/src/prover/smt/solver/nlsat/interval-set.ts +351 -0
  247. package/src/prover/smt/solver/nlsat/levelwise.ts +737 -0
  248. package/src/prover/smt/solver/nlsat/mpbq.ts +161 -0
  249. package/src/prover/smt/solver/nlsat/polynomial.ts +1722 -0
  250. package/src/prover/smt/solver/nlsat/solver.ts +911 -0
  251. package/src/prover/smt/solver/nlsat/types.ts +43 -0
  252. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +648 -0
  253. package/src/prover/smt/solver/nlsat/upolynomial.ts +996 -0
  254. package/src/prover/smt/solver/nnf.ts +469 -0
  255. package/src/prover/smt/solver/pattern-inference.ts +351 -0
  256. package/src/prover/smt/solver/poly-rewriter.ts +477 -0
  257. package/src/prover/smt/solver/propagate-values.ts +83 -0
  258. package/src/prover/smt/solver/proto-model.ts +551 -0
  259. package/src/prover/smt/solver/pull-quant.ts +139 -0
  260. package/src/prover/smt/solver/qe-lite-der.ts +526 -0
  261. package/src/prover/smt/solver/qe-lite-fm.ts +576 -0
  262. package/src/prover/smt/solver/qe-lite.ts +381 -0
  263. package/src/prover/smt/solver/qi-queue.ts +362 -0
  264. package/src/prover/smt/solver/quant-tactics.ts +117 -0
  265. package/src/prover/smt/solver/quantifier-analyzer.ts +562 -0
  266. package/src/prover/smt/solver/quantifier-manager.ts +186 -0
  267. package/src/prover/smt/solver/random-gen.ts +10 -0
  268. package/src/prover/smt/solver/rational.ts +165 -0
  269. package/src/prover/smt/solver/ref-vector.ts +62 -0
  270. package/src/prover/smt/solver/relevancy.ts +247 -0
  271. package/src/prover/smt/solver/rewriter-tpl.ts +1159 -0
  272. package/src/prover/smt/solver/rewriter.ts +843 -0
  273. package/src/prover/smt/solver/rlimit.ts +79 -0
  274. package/src/prover/smt/solver/smtlib-parser.ts +526 -0
  275. package/src/prover/smt/solver/solver.ts +71 -0
  276. package/src/prover/smt/solver/sort.ts +35 -0
  277. package/src/prover/smt/solver/sticky-generations.ts +69 -0
  278. package/src/prover/smt/solver/theory-lra-axioms.ts +340 -0
  279. package/src/prover/smt/solver/theory-lra-bounds.ts +226 -0
  280. package/src/prover/smt/solver/theory-lra-final-check.ts +252 -0
  281. package/src/prover/smt/solver/theory-lra-internalize.ts +476 -0
  282. package/src/prover/smt/solver/theory-lra-model.ts +243 -0
  283. package/src/prover/smt/solver/theory-lra-propagate.ts +405 -0
  284. package/src/prover/smt/solver/theory-lra-state.ts +43 -0
  285. package/src/prover/smt/solver/theory-lra.ts +56 -0
  286. package/src/prover/smt/solver/var-subst.ts +258 -0
  287. package/src/prover/smt/solver/z3-license.txt +10 -0
  288. package/src/prover/smt/table.ts +170 -0
  289. package/src/prover/tlapm/cache.ts +236 -0
  290. package/src/prover/tlapm/ocaml-marshal.ts +166 -0
  291. package/src/prover/tlapm/tlapm.ts +96 -0
  292. package/src/prover/tlaps-module.ts +510 -0
  293. package/src/prover/verdict.ts +13 -0
  294. package/src/prover/zenon/LICENSE +32 -0
  295. package/src/prover/zenon/check/check.ts +105 -0
  296. package/src/prover/zenon/check/definitions.ts +144 -0
  297. package/src/prover/zenon/check/equality.ts +182 -0
  298. package/src/prover/zenon/check/functions.ts +62 -0
  299. package/src/prover/zenon/check/keys.ts +125 -0
  300. package/src/prover/zenon/check/propositional.ts +104 -0
  301. package/src/prover/zenon/check/records.ts +188 -0
  302. package/src/prover/zenon/check/relations.ts +121 -0
  303. package/src/prover/zenon/check/rewrites.ts +224 -0
  304. package/src/prover/zenon/check/sets.ts +302 -0
  305. package/src/prover/zenon/check/terms.ts +127 -0
  306. package/src/prover/zenon/check/tla.ts +126 -0
  307. package/src/prover/zenon/decide.ts +107 -0
  308. package/src/prover/zenon/encode.ts +378 -0
  309. package/src/prover/zenon/eqrel.ts +300 -0
  310. package/src/prover/zenon/equality-rules.ts +435 -0
  311. package/src/prover/zenon/expr.ts +551 -0
  312. package/src/prover/zenon/index-table.ts +350 -0
  313. package/src/prover/zenon/isar-case.ts +513 -0
  314. package/src/prover/zenon/isar.ts +1249 -0
  315. package/src/prover/zenon/limits.ts +15 -0
  316. package/src/prover/zenon/llproof.ts +173 -0
  317. package/src/prover/zenon/mltoll.ts +1566 -0
  318. package/src/prover/zenon/node.ts +297 -0
  319. package/src/prover/zenon/ocaml.ts +169 -0
  320. package/src/prover/zenon/parse.ts +247 -0
  321. package/src/prover/zenon/phrase.ts +191 -0
  322. package/src/prover/zenon/proof.ts +198 -0
  323. package/src/prover/zenon/propositional-rules.ts +387 -0
  324. package/src/prover/zenon/rules.ts +94 -0
  325. package/src/prover/zenon/search.ts +288 -0
  326. package/src/prover/zenon/tla/functions.ts +151 -0
  327. package/src/prover/zenon/tla/llproof.ts +480 -0
  328. package/src/prover/zenon/tla/records.ts +225 -0
  329. package/src/prover/zenon/tla/rewrites.ts +447 -0
  330. package/src/prover/zenon/tla/sets.ts +304 -0
  331. package/src/prover/zenon/tla/terms.ts +162 -0
  332. package/src/prover/zenon/tla/tla.ts +506 -0
  333. package/src/randomization.ts +19 -24
  334. package/src/resolve.ts +15 -22
  335. package/src/runtime.ts +8 -8
  336. package/src/{sany-builtins.ts → sany/builtins.ts} +1 -1
  337. package/src/{sany-generator.ts → sany/generator.ts} +38 -55
  338. package/src/{sany-levels.ts → sany/levels.ts} +45 -48
  339. package/src/{sany-lexer.ts → sany/lexer.ts} +2 -3
  340. package/src/{sany-linter.ts → sany/linter.ts} +1 -1
  341. package/src/{sany-modules.ts → sany/modules.ts} +2 -2
  342. package/src/{sany-nodes.ts → sany/nodes.ts} +2 -2
  343. package/src/{sany-parse-error.ts → sany/parse-error.ts} +2 -2
  344. package/src/{sany-report.ts → sany/report.ts} +16 -17
  345. package/src/{sany-selectors.ts → sany/selectors.ts} +3 -5
  346. package/src/{sany-source.ts → sany/source.ts} +6 -7
  347. package/src/{sany-xml.ts → sany/xml.ts} +5 -6
  348. package/src/search.ts +969 -0
  349. package/src/spec-description.ts +26 -20
  350. package/src/{standard-levels.ts → standard-definitions.ts} +118 -2
  351. package/src/standard-modules.ts +21 -22
  352. package/src/state-graph.ts +9 -8
  353. package/src/substitution-levels.ts +2 -2
  354. package/src/successors.ts +39 -23
  355. package/src/symmetry.ts +1 -1
  356. package/src/tableau.ts +6 -7
  357. package/src/tlc/fingerprint.ts +214 -0
  358. package/src/{tlc-messages.ts → tlc/messages.ts} +119 -7
  359. package/src/{tlc-order.ts → tlc/order.ts} +7 -7
  360. package/src/{tlc-random.ts → tlc/random.ts} +3 -190
  361. package/src/{tlc-replay.ts → tlc/replay.ts} +40 -36
  362. package/src/{tlc-module.ts → tlc/tlc-operators.ts} +9 -9
  363. package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +30 -25
  364. package/src/{tlc-version.ts → tlc/version.ts} +8 -7
  365. package/src/transfer.ts +32 -32
  366. package/src/values.ts +166 -111
  367. package/src/worker.ts +62 -0
  368. package/dist/parallel.cjs +0 -12
  369. package/dist/parallel.js +0 -12
  370. package/dist/run-cli.cjs +0 -55
  371. package/dist/run-cli.js +0 -55
  372. package/src/canonical.ts +0 -40
  373. package/src/obligation-expression.ts +0 -1060
  374. package/src/obligation-module.ts +0 -1042
  375. package/src/standard-ranges.ts +0 -116
  376. package/src/value-sources.ts +0 -29
  377. /package/src/{tlc-modules.ts → tlc/jar-data.ts} +0 -0
  378. /package/src/{tlc-summary.ts → tlc/summary.ts} +0 -0
@@ -1,11 +1,10 @@
1
- // A port of tlapm's obligation printer: E_fmt with Fmtutil's minimal parenthesization, the
2
- // operator table in Optable, and the identifier renaming in Ctx.
1
+ // A port of tlapm's obligation printer: E_fmt with Fmtutil's minimal parenthesization, and the
2
+ // identifier renaming in Ctx.
3
3
 
4
- import { TlaProofError } from "./errors";
4
+ import { TlaProofError } from "../errors";
5
5
  import {
6
6
  getHypName,
7
7
  type Bound,
8
- type Builtin,
9
8
  type Defn,
10
9
  type Expr,
11
10
  type Hyp,
@@ -13,200 +12,39 @@ import {
13
12
  type Selector,
14
13
  type Sequent,
15
14
  type Shape,
16
- } from "./obligation-expression";
17
- import { format, formatDelimited, renderDoc, text, type Doc } from "./obligation-format";
18
-
19
- export type Fixity = "Nonfix" | "Prefix" | "Postfix" | "InfixLeft" | "InfixNon" | "InfixRight";
20
-
21
- export interface Operator {
22
- name: string;
23
- low: number;
24
- high: number;
25
- fixity: Fixity;
26
- }
27
-
28
- const OPERATORS: [string, number, number, Fixity, string[]][] = [
29
- ["=>", 1, 1, "InfixNon", []],
30
- ["<=>", 2, 2, "InfixNon", ["\\equiv"]],
31
- ["/\\", 3, 3, "InfixLeft", ["\\land"]],
32
- ["\\/", 3, 3, "InfixLeft", ["\\lor"]],
33
- ["~", 4, 4, "Prefix", ["\\neg", "\\lnot"]],
34
- ["=", 5, 5, "InfixNon", []],
35
- ["#", 5, 5, "InfixNon", ["/="]],
36
- ["SUBSET", 8, 8, "Prefix", []],
37
- ["UNION", 8, 8, "Prefix", []],
38
- ["DOMAIN", 9, 9, "Prefix", []],
39
- ["\\subseteq", 5, 5, "InfixNon", []],
40
- ["\\in", 5, 5, "InfixNon", []],
41
- ["\\notin", 5, 5, "InfixNon", []],
42
- ["\\", 8, 8, "InfixNon", []],
43
- ["\\cap", 8, 8, "InfixLeft", ["\\intersect"]],
44
- ["\\cup", 8, 8, "InfixLeft", ["\\union"]],
45
- ["\\X", 10, 13, "Prefix", ["\\times"]],
46
- ["'", 15, 15, "Postfix", []],
47
- ["~>", 2, 2, "InfixNon", ["\\leadsto"]],
48
- ["ENABLED", 4, 15, "Prefix", []],
49
- ["UNCHANGED", 4, 15, "Prefix", []],
50
- ["\\cdot", 5, 14, "InfixLeft", []],
51
- ["-+->", 2, 2, "InfixNon", []],
52
- ["[]", 4, 15, "Prefix", []],
53
- ["<>", 4, 15, "Prefix", []],
54
- ["^", 14, 14, "InfixNon", []],
55
- ["/", 13, 13, "InfixNon", []],
56
- ["*", 13, 13, "InfixLeft", []],
57
- ["-.", 12, 12, "Prefix", ["-"]],
58
- ["-", 11, 11, "InfixLeft", []],
59
- ["+", 10, 10, "InfixLeft", []],
60
- ["^+", 15, 15, "Postfix", []],
61
- ["^*", 15, 15, "Postfix", []],
62
- ["^#", 15, 15, "Postfix", []],
63
- ["<", 5, 5, "InfixNon", []],
64
- ["=<", 5, 5, "InfixNon", ["<=", "\\leq"]],
65
- [">", 5, 5, "InfixNon", []],
66
- [">=", 5, 5, "InfixNon", ["\\geq"]],
67
- ["...", 9, 9, "InfixNon", []],
68
- ["..", 9, 9, "InfixNon", []],
69
- ["|", 10, 11, "InfixLeft", []],
70
- ["||", 10, 11, "InfixLeft", []],
71
- ["&&", 13, 13, "InfixLeft", []],
72
- ["&", 13, 13, "InfixLeft", []],
73
- ["$$", 9, 13, "InfixLeft", []],
74
- ["$", 9, 13, "InfixLeft", []],
75
- ["??", 9, 13, "InfixLeft", []],
76
- ["%%", 10, 11, "InfixLeft", []],
77
- ["%", 10, 11, "InfixLeft", ["\\mod"]],
78
- ["##", 9, 13, "InfixLeft", []],
79
- ["++", 10, 10, "InfixLeft", []],
80
- ["--", 11, 11, "InfixLeft", []],
81
- ["**", 13, 13, "InfixLeft", []],
82
- ["//", 13, 13, "InfixNon", []],
83
- ["^^", 14, 14, "InfixNon", []],
84
- ["@@", 6, 6, "InfixLeft", []],
85
- ["!!", 9, 13, "InfixNon", []],
86
- ["|-", 5, 5, "InfixNon", []],
87
- ["|=", 5, 5, "InfixNon", []],
88
- ["-|", 5, 5, "InfixNon", []],
89
- ["=|", 5, 5, "InfixNon", []],
90
- ["<:", 7, 7, "InfixNon", []],
91
- [":>", 7, 7, "InfixNon", []],
92
- [":=", 5, 5, "InfixNon", []],
93
- ["::=", 5, 5, "InfixNon", []],
94
- ["(+)", 10, 10, "InfixLeft", ["\\oplus"]],
95
- ["(-)", 11, 11, "InfixLeft", ["\\ominus"]],
96
- ["(.)", 13, 13, "InfixLeft", ["\\odot"]],
97
- ["(/)", 13, 13, "InfixNon", ["\\oslash"]],
98
- ["(\\X)", 13, 13, "InfixLeft", ["\\otimes"]],
99
- ["\\uplus", 9, 13, "InfixLeft", []],
100
- ["\\sqcap", 9, 13, "InfixLeft", []],
101
- ["\\sqcup", 9, 13, "InfixLeft", []],
102
- ["\\div", 13, 13, "InfixNon", []],
103
- ["\\wr", 9, 14, "InfixNon", []],
104
- ["\\star", 13, 13, "InfixLeft", []],
105
- ["\\o", 13, 13, "InfixLeft", ["\\circ"]],
106
- ["\\bigcirc", 13, 13, "InfixLeft", []],
107
- ["\\bullet", 13, 13, "InfixLeft", []],
108
- ["\\prec", 5, 5, "InfixNon", []],
109
- ["\\succ", 5, 5, "InfixNon", []],
110
- ["\\preceq", 5, 5, "InfixNon", []],
111
- ["\\succeq", 5, 5, "InfixNon", []],
112
- ["\\sim", 5, 5, "InfixNon", []],
113
- ["\\simeq", 5, 5, "InfixNon", []],
114
- ["\\ll", 5, 5, "InfixNon", []],
115
- ["\\gg", 5, 5, "InfixNon", []],
116
- ["\\asymp", 5, 5, "InfixNon", []],
117
- ["\\subset", 5, 5, "InfixNon", []],
118
- ["\\supset", 5, 5, "InfixNon", []],
119
- ["\\supseteq", 5, 5, "InfixNon", []],
120
- ["\\approx", 5, 5, "InfixNon", []],
121
- ["\\cong", 5, 5, "InfixNon", []],
122
- ["\\sqsubset", 5, 5, "InfixNon", []],
123
- ["\\sqsubseteq", 5, 5, "InfixNon", []],
124
- ["\\sqsupset", 5, 5, "InfixNon", []],
125
- ["\\sqsupseteq", 5, 5, "InfixNon", []],
126
- ["\\doteq", 5, 5, "InfixNon", []],
127
- ["\\propto", 5, 5, "InfixNon", []],
128
- ];
129
-
130
- // OCaml's Hashtbl.find returns the most recent binding, so later aliases win over earlier names.
131
- const OPERATOR_TABLE = new Map<string, Operator>();
132
- for (const [name, low, high, fixity, aliases] of OPERATORS) {
133
- const operator = { name, low, high, fixity };
134
- for (const spelling of [name, ...aliases]) OPERATOR_TABLE.set(spelling, operator);
135
- }
136
-
137
- const getNonfix = (name: string): Operator => ({ name, low: -1, high: -1, fixity: "Nonfix" });
138
-
139
- export const lookupOperator = (name: string) => OPERATOR_TABLE.get(name) ?? getNonfix(name);
140
-
141
- const STANDARD_NAMES: Partial<Record<Builtin, string>> = {
142
- Implies: "=>",
143
- Equiv: "<=>",
144
- Conj: "/\\",
145
- Disj: "\\/",
146
- Neg: "~",
147
- Eq: "=",
148
- Neq: "#",
149
- SUBSET: "SUBSET",
150
- UNION: "UNION",
151
- DOMAIN: "DOMAIN",
152
- Subseteq: "\\subseteq",
153
- Mem: "\\in",
154
- Notmem: "\\notin",
155
- Setminus: "\\",
156
- Cap: "\\cap",
157
- Cup: "\\cup",
158
- Prime: "'",
159
- StrongPrime: "'",
160
- Leadsto: "~>",
161
- ENABLED: "ENABLED",
162
- UNCHANGED: "UNCHANGED",
163
- Cdot: "\\cdot",
164
- Actplus: "-+->",
165
- BoxTrue: "[]",
166
- BoxFalse: "[]",
167
- Diamond: "<>",
168
- Plus: "+",
169
- Minus: "-",
170
- Times: "*",
171
- Ratio: "/",
172
- Quotient: "\\div",
173
- Remainder: "%",
174
- Exp: "^",
175
- Lteq: "=<",
176
- Lt: "<",
177
- Gteq: ">=",
178
- Gt: ">",
179
- Range: "..",
180
- Cat: "\\o",
181
- OneArg: ":>",
182
- Extend: "@@",
183
- };
184
-
185
- const getStandardForm = (builtin: Builtin): Operator => {
186
- if (builtin === "Divides") return { name: "?|", low: 10, high: 11, fixity: "InfixNon" };
187
- if (builtin === "Uminus") return { ...lookupOperator("-."), name: "-" };
188
- const name = STANDARD_NAMES[builtin];
189
- return name ? lookupOperator(name) : getNonfix(builtin);
190
- };
15
+ } from "./expression";
16
+ import { format, formatDelimited, renderDoc, text, type Doc } from "./format";
17
+ import { getStandardForm, lookupOperator } from "./operators";
191
18
 
19
+ // Ctx, which names each binder apart from the names in scope by adding a salt, as a mutable stack:
20
+ // printers bind and unbind names in strict nesting order.
192
21
  interface Ident {
193
22
  rep: string;
194
23
  salt: number;
195
24
  }
196
25
 
197
- const getIdentName = (ident: Ident) =>
198
- ident.salt === 0 ? ident.rep : `${ident.rep}_${ident.salt}`;
199
-
200
- // Ctx as a mutable stack: printing binds and unbinds names in strict nesting order.
201
- interface Context {
26
+ export interface Context {
202
27
  stack: Ident[];
203
28
  idents: Map<string, Ident[]>;
204
29
  defined: Map<string, number>;
205
30
  }
206
31
 
207
- const createContext = (): Context => ({ stack: [], idents: new Map(), defined: new Map() });
32
+ const getIdentName = (ident: Ident) =>
33
+ ident.salt === 0 ? ident.rep : `${ident.rep}_${ident.salt}`;
34
+
35
+ export const createContext = (): Context => ({
36
+ stack: [],
37
+ idents: new Map(),
38
+ defined: new Map(),
39
+ });
40
+
41
+ // The name of the binder index places in, counting from 1 for the innermost.
42
+ export const getBoundName = (context: Context, index: number) => {
43
+ const ident = context.stack[context.stack.length - index];
44
+ return ident && getIdentName(ident);
45
+ };
208
46
 
209
- const pushName = (context: Context, rep: string) => {
47
+ export const pushName = (context: Context, rep: string) => {
210
48
  const previous = context.idents.get(rep)?.at(-1);
211
49
  let ident: Ident = previous ? { rep, salt: previous.salt + 1 } : { rep, salt: 0 };
212
50
  while (context.defined.has(getIdentName(ident))) ident = { rep, salt: ident.salt + 1 };
@@ -219,7 +57,7 @@ const pushName = (context: Context, rep: string) => {
219
57
  return key;
220
58
  };
221
59
 
222
- const popNames = (context: Context, count: number) => {
60
+ export const popNames = (context: Context, count: number) => {
223
61
  for (let index = 0; index < count; index++) {
224
62
  const ident = context.stack.pop();
225
63
  if (!ident) return;
@@ -419,9 +257,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
419
257
  const getIndexName = (index: number) => {
420
258
  if (index < 0) return `#$$${Math.abs(index)}`;
421
259
  if (index === 0) return "#$0";
422
- if (index <= context.stack.length) {
423
- return getIdentName(context.stack[context.stack.length - index]);
424
- }
260
+ if (index <= context.stack.length) return getBoundName(context, index);
425
261
  const hyp = hyps[hyps.length - (index - context.stack.length)];
426
262
  if (hyp) return getHypName(hyp) ?? "??? FACT ???";
427
263
  return `#$${index}`;
@@ -458,7 +294,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
458
294
  return atom(format("@[<h>@<1>%s%a@<1>%s@]", "<[", printExpr(args[0]), "]>"));
459
295
  }
460
296
  }
461
- const top = (() => {
297
+ const form = (() => {
462
298
  switch (operator.kind) {
463
299
  case "Ix":
464
300
  return lookupOperator(getIndexName(operator.index));
@@ -472,38 +308,41 @@ const createPrinter = (hyps: Hyp[] = []) => {
472
308
  throw new TlaProofError("Cannot print this operator");
473
309
  }
474
310
  })();
475
- const getOp = (doc: Doc, skeleton: Skeleton): Minimal => ({
311
+ const getOperation = (doc: Doc, skeleton: Skeleton): Minimal => ({
476
312
  kind: "Op",
477
- name: top.name,
313
+ name: form.name,
478
314
  doc,
479
- low: top.low,
480
- high: top.high,
315
+ low: form.low,
316
+ high: form.high,
481
317
  skeleton,
482
318
  });
483
- if (args.length === 0) return atom(text(top.name));
484
- if (top.fixity === "Nonfix") {
485
- return atom(format("@[<b2>%s@[<b1>(%a)@]@]", top.name, formatDelimited(args, printExpr)));
319
+ if (args.length === 0) return atom(text(form.name));
320
+ if (form.fixity === "Nonfix") {
321
+ return atom(format("@[<b2>%s@[<b1>(%a)@]@]", form.name, formatDelimited(args, printExpr)));
486
322
  }
487
- if (top.fixity === "Prefix" && args.length === 1) {
488
- return getOp(/[A-Za-z]$/.test(top.name) ? format("%s@ ", top.name) : text(top.name), {
489
- kind: "Prefix",
490
- operand: formatExpr(args[0]),
491
- });
323
+ if (form.fixity === "Prefix" && args.length === 1) {
324
+ return getOperation(
325
+ /[A-Za-z]$/.test(form.name) ? format("%s@ ", form.name) : text(form.name),
326
+ {
327
+ kind: "Prefix",
328
+ operand: formatExpr(args[0]),
329
+ },
330
+ );
492
331
  }
493
- if (top.fixity === "Postfix" && args.length === 1) {
494
- return getOp(text(top.name), { kind: "Postfix", operand: formatExpr(args[0]) });
332
+ if (form.fixity === "Postfix" && args.length === 1) {
333
+ return getOperation(text(form.name), { kind: "Postfix", operand: formatExpr(args[0]) });
495
334
  }
496
- if (top.fixity.startsWith("Infix") && args.length === 2) {
335
+ if (form.fixity.startsWith("Infix") && args.length === 2) {
497
336
  const assoc: Assoc =
498
- top.fixity === "InfixLeft" ? "Left" : top.fixity === "InfixRight" ? "Right" : "Non";
499
- return getOp(top.name === ".." ? text(top.name) : format("@ %s ", top.name), {
337
+ form.fixity === "InfixLeft" ? "Left" : form.fixity === "InfixRight" ? "Right" : "Non";
338
+ return getOperation(form.name === ".." ? text(form.name) : format("@ %s ", form.name), {
500
339
  kind: "Infix",
501
340
  assoc,
502
341
  left: formatExpr(args[0]),
503
342
  right: formatExpr(args[1]),
504
343
  });
505
344
  }
506
- throw new TlaProofError(`Arity mismatch for operator ${top.name}`);
345
+ throw new TlaProofError(`Arity mismatch for operator ${form.name}`);
507
346
  };
508
347
 
509
348
  const formatExpr = (expression: Expr): Minimal => {
@@ -532,8 +371,9 @@ const createPrinter = (hyps: Hyp[] = []) => {
532
371
  ),
533
372
  );
534
373
  case "List": {
535
- if (expression.bullet === "Refs" && expression.items.length === 0)
374
+ if (expression.bullet === "Refs" && expression.items.length === 0) {
536
375
  return atom(format("TRUE"));
376
+ }
537
377
  if (expression.bullet === "Refs" && expression.items.length === 1) {
538
378
  return formatExpr(expression.items[0]);
539
379
  }
@@ -657,23 +497,17 @@ const createPrinter = (hyps: Hyp[] = []) => {
657
497
  case "Tuple":
658
498
  return atom(format("@[<b2><<%a>>@]", formatDelimited(expression.elements, printExpr)));
659
499
  case "Rect":
500
+ case "Record": {
501
+ const separator = expression.kind === "Rect" ? ":" : "|->";
660
502
  return atom(
661
503
  format(
662
504
  "@[<b1>[%a]@]",
663
505
  formatDelimited(expression.fields, (field) =>
664
- format("@[<h>%s : %a@]", field.name, printExpr(field.value)),
665
- ),
666
- ),
667
- );
668
- case "Record":
669
- return atom(
670
- format(
671
- "@[<b1>[%a]@]",
672
- formatDelimited(expression.fields, (field) =>
673
- format("@[<h>%s |-> %a@]", field.name, printExpr(field.value)),
506
+ format(`@[<h>%s ${separator} %a@]`, field.name, printExpr(field.value)),
674
507
  ),
675
508
  ),
676
509
  );
510
+ }
677
511
  case "Except":
678
512
  return atom(
679
513
  format(
@@ -772,12 +606,13 @@ const createPrinter = (hyps: Hyp[] = []) => {
772
606
  return atom(format(pattern, form.label, printMinimal(inner)));
773
607
  }
774
608
  const namesDoc = formatDelimited(names, text);
775
- if (inner.kind === "Atm")
776
- return atom(format("%s(%a)::%a", form.label, namesDoc, printMinimal(inner)));
777
- if (inner.kind === "Big") {
778
- return atom(format("%s(%a)::(%a)", form.label, namesDoc, printMinimal(inner)));
779
- }
780
- return atom(format("(%s(%a):: %a)", form.label, namesDoc, printMinimal(inner)));
609
+ const pattern =
610
+ inner.kind === "Atm"
611
+ ? "%s(%a)::%a"
612
+ : inner.kind === "Big"
613
+ ? "%s(%a)::(%a)"
614
+ : "(%s(%a):: %a)";
615
+ return atom(format(pattern, form.label, namesDoc, printMinimal(inner)));
781
616
  }
782
617
  }
783
618
  };
@@ -883,7 +718,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
883
718
  export const printExpression = (hyps: Hyp[], expression: Expr) =>
884
719
  createPrinter(hyps).printExpr(expression);
885
720
 
886
- export const formatObligation = (sequent: Sequent) => {
887
- const printer = createPrinter();
888
- return renderDoc(format("@[<b0>%a@]", printer.printSequent(sequent))).trimEnd();
889
- };
721
+ export const printSequent = (sequent: Sequent) => createPrinter().printSequent(sequent);
722
+
723
+ export const formatObligation = (sequent: Sequent) =>
724
+ renderDoc(format("@[<b0>%a@]", printSequent(sequent))).trimEnd();
@@ -1,6 +1,7 @@
1
1
  // tlapm's proof IR (P_t).
2
2
 
3
- import type { Bound, Defn, Expr, Locus, Sequent } from "./obligation-expression";
3
+ import type { Bound, Defn, Expr, Locus, Sequent } from "./expression";
4
+ import type { OldMethod } from "./pragma";
4
5
 
5
6
  export type StepNumber =
6
7
  | { kind: "Named"; level: number; label: string; isAnonymous: boolean }
@@ -23,17 +24,21 @@ export type ObligationKind =
23
24
  | { kind: "Error"; message: string }
24
25
  | { kind: "Omitted"; omission: Omission };
25
26
 
27
+ // method is the one an old-style pragma names, which keeps find_meth from choosing.
26
28
  export interface Obligation {
27
29
  sequent: Sequent;
28
30
  location: Locus | undefined;
29
31
  kind: ObligationKind;
32
+ method?: OldMethod;
30
33
  }
31
34
 
35
+ // useLocation is where a USE step comes from, so find_meth can tell apart the facts of each BY.
32
36
  interface ProofProps {
33
37
  location?: Locus;
34
38
  step?: StepNumber;
35
- isSuppressed?: boolean;
36
39
  obligations?: Obligation[];
40
+ method?: OldMethod;
41
+ useLocation?: Locus;
37
42
  }
38
43
 
39
44
  export type Proof = ProofCore & ProofProps;
@@ -0,0 +1,100 @@
1
+ // Pco.resolve: tlapm's parser lets an operator take in every later infix operator that is not
2
+ // entirely below it, so SUBSET S \ T is SUBSET (S \ T) to tlapm though SANY reads (SUBSET S) \ T.
3
+ // This regroups an infix application the way tlapm does.
4
+
5
+ import type { Expression, SourceLocation } from "../ast";
6
+ import { lookupOperator, type Operator } from "./operators";
7
+
8
+ type Grouping =
9
+ | { kind: "Attached"; expression: Expression }
10
+ | { kind: "Reduced"; isFinal: boolean };
11
+
12
+ const PREFIX_KEYWORDS: Partial<Record<Expression["kind"], string>> = {
13
+ Always: "[]",
14
+ Eventually: "<>",
15
+ Enabled: "ENABLED",
16
+ Unchanged: "UNCHANGED",
17
+ };
18
+
19
+ const isSamePosition = (left: SourceLocation | undefined, right: SourceLocation | undefined) =>
20
+ left !== undefined &&
21
+ right !== undefined &&
22
+ left.line === right.line &&
23
+ left.column === right.column;
24
+
25
+ const getStart = (expression: Expression) => expression.location.range?.start;
26
+
27
+ const getEnd = (expression: Expression) => expression.location.range?.end;
28
+
29
+ const withEnd = (expression: Expression, end: SourceLocation | undefined): Expression => {
30
+ const range = expression.location.range;
31
+ return range && end
32
+ ? { ...expression, location: { ...expression.location, range: { ...range, end } } }
33
+ : expression;
34
+ };
35
+
36
+ // The operator an expression leaves open on tlapm's parse stack, with the operand after it.
37
+ const getOpenOperator = (expression: Expression) => {
38
+ if (expression.kind === "Apply") {
39
+ const operator = lookupOperator(expression.operator);
40
+ const isInfix = expression.args.length === 2 && operator.fixity.startsWith("Infix");
41
+ const isPrefix = expression.args.length === 1 && operator.fixity === "Prefix";
42
+ if (!isInfix && !isPrefix) return undefined;
43
+ const last = expression.args.length - 1;
44
+ return {
45
+ operator,
46
+ isInfix,
47
+ operand: expression.args[last],
48
+ replace: (operand: Expression): Expression => ({
49
+ ...expression,
50
+ args: [...expression.args.slice(0, last), operand],
51
+ }),
52
+ };
53
+ }
54
+ const keyword = PREFIX_KEYWORDS[expression.kind];
55
+ if (keyword === undefined || !("expression" in expression)) return undefined;
56
+ return {
57
+ operator: lookupOperator(keyword),
58
+ isInfix: false,
59
+ operand: expression.expression,
60
+ replace: (operand: Expression): Expression => ({ ...expression, expression: operand }),
61
+ };
62
+ };
63
+
64
+ const isBelow = (left: Operator, right: Operator) => left.high < right.low;
65
+
66
+ export const regroup = (expression: Extract<Expression, { kind: "Apply" }>): Expression => {
67
+ const operator = lookupOperator(expression.operator);
68
+ const [left, right] = expression.args;
69
+ const end = getEnd(expression);
70
+ const getInfix = (operand: Expression): Expression => {
71
+ const range = expression.location.range;
72
+ const start = getStart(operand);
73
+ return {
74
+ ...expression,
75
+ args: [operand, right],
76
+ location:
77
+ range && start
78
+ ? { ...expression.location, range: { ...range, start } }
79
+ : expression.location,
80
+ };
81
+ };
82
+ const attach = (node: Expression, isOpen: boolean): Grouping => {
83
+ const open = isOpen ? getOpenOperator(node) : undefined;
84
+ if (!open) return { kind: "Reduced", isFinal: false };
85
+ const inner = attach(open.operand, isSamePosition(getEnd(open.operand), getEnd(node)));
86
+ if (inner.kind === "Attached")
87
+ return { kind: "Attached", expression: withEnd(open.replace(inner.expression), end) };
88
+ const isReduced =
89
+ !inner.isFinal &&
90
+ (isBelow(operator, open.operator) ||
91
+ (open.isInfix &&
92
+ operator.fixity === "InfixLeft" &&
93
+ open.operator.fixity === "InfixLeft" &&
94
+ !isBelow(open.operator, operator)));
95
+ if (isReduced) return { kind: "Reduced", isFinal: !isBelow(operator, open.operator) };
96
+ return { kind: "Attached", expression: withEnd(open.replace(getInfix(open.operand)), end) };
97
+ };
98
+ const grouping = attach(left, isSamePosition(getStart(left), getStart(expression)));
99
+ return grouping.kind === "Attached" ? grouping.expression : expression;
100
+ };