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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (382) hide show
  1. package/README.md +32 -6
  2. package/dist/cli.cjs +1 -1
  3. package/dist/cli.js +1 -1
  4. package/dist/deciders.cjs +27 -27
  5. package/dist/deciders.js +34 -34
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +12 -14
  8. package/dist/index.d.ts +12 -14
  9. package/dist/index.js +1 -1
  10. package/dist/parallel-worker.cjs +1 -1
  11. package/dist/parallel-worker.js +1 -1
  12. package/dist/prove-worker.cjs +1 -1
  13. package/dist/prove-worker.js +1 -1
  14. package/dist/prove.cjs +516 -25
  15. package/dist/prove.js +518 -27
  16. package/dist/run.cjs +45 -0
  17. package/dist/run.js +45 -0
  18. package/dist/tlapm.cjs +2 -2
  19. package/dist/tlapm.js +2 -2
  20. package/dist/transfer.cjs +76 -86
  21. package/dist/transfer.js +73 -83
  22. package/dist/worker.cjs +6 -6
  23. package/dist/worker.js +6 -6
  24. package/package.json +1 -1
  25. package/src/ast.ts +2 -2
  26. package/src/bags.ts +22 -23
  27. package/src/builtins.ts +16 -8
  28. package/src/check.ts +131 -1154
  29. package/src/{cli-options.ts → cli/options.ts} +54 -9
  30. package/src/cli/run.ts +63 -0
  31. package/src/cli/shared.ts +106 -0
  32. package/src/cli/tlapm.ts +374 -0
  33. package/src/{run-cli.ts → cli/tlc.ts} +112 -761
  34. package/src/cli/xml-exporter.ts +221 -0
  35. package/src/cli.ts +1 -1
  36. package/src/codegen.ts +17 -15
  37. package/src/config.ts +5 -5
  38. package/src/dependencies.ts +4 -6
  39. package/src/environment.ts +55 -60
  40. package/src/errors.ts +12 -36
  41. package/src/evaluate.ts +81 -101
  42. package/src/exit-codes.ts +1 -1
  43. package/src/fingerprints.ts +3 -3
  44. package/src/index.ts +2 -2
  45. package/src/instances.ts +56 -46
  46. package/src/java-overrides.ts +79 -41
  47. package/src/json.ts +31 -36
  48. package/src/levels.ts +10 -13
  49. package/src/{live-check.ts → liveness-checker.ts} +169 -142
  50. package/src/liveness.ts +38 -34
  51. package/src/obligations/action.ts +58 -105
  52. package/src/obligations/{anon.ts → anonymize.ts} +44 -52
  53. package/src/obligations/equality.ts +260 -0
  54. package/src/obligations/expression.ts +42 -530
  55. package/src/obligations/format.ts +7 -8
  56. package/src/obligations/generate.ts +93 -783
  57. package/src/obligations/index.ts +23 -23
  58. package/src/obligations/levels.ts +38 -44
  59. package/src/obligations/module.ts +106 -729
  60. package/src/obligations/normalize.ts +554 -0
  61. package/src/obligations/operators.ts +176 -0
  62. package/src/obligations/pragma.ts +35 -29
  63. package/src/obligations/printer.ts +98 -209
  64. package/src/obligations/proof.ts +0 -1
  65. package/src/obligations/regroup.ts +100 -0
  66. package/src/obligations/simplify.ts +668 -0
  67. package/src/obligations/source.ts +92 -192
  68. package/src/obligations/{deref.ts → subexpression.ts} +82 -113
  69. package/src/obligations/substitution.ts +261 -0
  70. package/src/obligations/temporal.ts +32 -30
  71. package/src/obligations/tuples.ts +37 -53
  72. package/src/parallel-worker.ts +37 -33
  73. package/src/parallel.ts +30 -24
  74. package/src/parser.ts +67 -74
  75. package/src/{pcal-ast.ts → pcal/ast.ts} +2 -17
  76. package/src/{pcal-parse.ts → pcal/parse.ts} +28 -64
  77. package/src/{pcal-tokenize.ts → pcal/tokenize.ts} +10 -39
  78. package/src/{pcal-translate.ts → pcal/translate.ts} +30 -109
  79. package/src/{pcal-validate.ts → pcal/validate.ts} +10 -20
  80. package/src/{prove → prover}/decide-pool.ts +14 -19
  81. package/src/{prove → prover}/deciders.ts +7 -1
  82. package/src/{obligations/pickle.ts → prover/first-order.ts} +79 -4
  83. package/src/{prove → prover}/isabelle/decide.ts +3 -6
  84. package/src/{prove → prover}/isabelle/encode.ts +106 -138
  85. package/src/{prove → prover}/isabelle/isar/inner-syntax.ts +1 -1
  86. package/src/{prove → prover}/isabelle/isar/method.ts +3 -3
  87. package/src/{prove → prover}/isabelle/isar/type-check.ts +1 -1
  88. package/src/{prove → prover}/isabelle/provers/blast/blast.ts +1 -1
  89. package/src/{prove → prover}/isabelle/provers/blast/branch.ts +1 -1
  90. package/src/{prove → prover}/isabelle/provers/blast/term.ts +3 -4
  91. package/src/{prove → prover}/isabelle/provers/clasimp.ts +1 -1
  92. package/src/{prove → prover}/isabelle/provers/classical.ts +3 -3
  93. package/src/{prove → prover}/isabelle/provers/hypsubst.ts +1 -9
  94. package/src/{prove → prover}/isabelle/pure/conv.ts +1 -1
  95. package/src/{prove → prover}/isabelle/pure/drule.ts +2 -2
  96. package/src/{prove → prover}/isabelle/pure/envir.ts +3 -35
  97. package/src/{prove → prover}/isabelle/pure/logic.ts +4 -76
  98. package/src/{prove → prover}/isabelle/pure/name.ts +1 -13
  99. package/src/{prove → prover}/isabelle/pure/net.ts +2 -49
  100. package/src/{prove → prover}/isabelle/pure/pattern.ts +3 -22
  101. package/src/{prove → prover}/isabelle/pure/raw-simplifier.ts +3 -18
  102. package/src/{prove → prover}/isabelle/pure/seq.ts +0 -23
  103. package/src/{prove → prover}/isabelle/pure/simplifier.ts +2 -8
  104. package/src/{prove → prover}/isabelle/pure/table.ts +1 -8
  105. package/src/{prove → prover}/isabelle/pure/tactic.ts +5 -113
  106. package/src/{prove → prover}/isabelle/pure/tactical.ts +1 -84
  107. package/src/{prove → prover}/isabelle/pure/term-ord.ts +1 -55
  108. package/src/{prove → prover}/isabelle/pure/term.ts +8 -128
  109. package/src/{prove → prover}/isabelle/pure/thm.ts +4 -27
  110. package/src/{prove → prover}/isabelle/pure/type.ts +0 -12
  111. package/src/{prove → prover}/isabelle/pure/unify.ts +1 -1
  112. package/src/{prove → prover}/isabelle/tla/classical-setup.ts +1 -1
  113. package/src/{prove → prover}/ocaml.ts +1 -1
  114. package/src/{prove → prover}/prep/action.ts +54 -66
  115. package/src/{prove → prover}/prep/enabled-axioms.ts +2 -2
  116. package/src/{prove → prover}/prep/fingerprint.ts +3 -3
  117. package/src/{prove → prover}/prep/level-comparison.ts +15 -38
  118. package/src/{prove → prover}/prep/md5.ts +2 -9
  119. package/src/{prove/prep/pragma.ts → prover/prep/methods.ts} +4 -4
  120. package/src/prover/prep/normalize.ts +309 -0
  121. package/src/{prove → prover}/prove-worker.ts +4 -11
  122. package/src/prover/prove.ts +492 -0
  123. package/src/{prove → prover}/ptl/encode.ts +19 -31
  124. package/src/{prove → prover}/smt/axioms.ts +78 -79
  125. package/src/{prove → prover}/smt/data.ts +16 -45
  126. package/src/{prove → prover}/smt/encode.ts +134 -28
  127. package/src/{prove → prover}/smt/extensionality.ts +14 -12
  128. package/src/{prove → prover}/smt/flatten.ts +3 -18
  129. package/src/{prove → prover}/smt/format.ts +14 -3
  130. package/src/{prove → prover}/smt/instances.ts +4 -5
  131. package/src/{prove → prover}/smt/rewrite.ts +41 -59
  132. package/src/{prove → prover}/smt/solver/ast-util.ts +0 -56
  133. package/src/{prove → prover}/smt/solver/case-split-queue.ts +1 -1
  134. package/src/{prove → prover}/smt/solver/enode.ts +1 -1
  135. package/src/{prove → prover}/smt/solver/lp/dep-intervals.ts +0 -14
  136. package/src/{prove → prover}/smt/solver/model-macro-solver.ts +1 -1
  137. package/src/{prove → prover}/smt/solver/nlsat/algebraic.ts +3 -3
  138. package/src/{prove → prover}/smt/solver/nlsat/atoms.ts +1 -1
  139. package/src/{prove → prover}/smt/solver/nlsat/explain.ts +1 -1
  140. package/src/{prove → prover}/smt/solver/nlsat/interval-set.ts +1 -1
  141. package/src/{prove → prover}/smt/solver/nlsat/levelwise.ts +4 -7
  142. package/src/{prove → prover}/smt/solver/nlsat/polynomial.ts +4 -4
  143. package/src/{prove → prover}/smt/solver/nlsat/upolynomial.ts +2 -2
  144. package/src/{prove → prover}/smt/solver/pattern-inference.ts +1 -1
  145. package/src/{prove → prover}/smt/solver/relevancy.ts +2 -2
  146. package/src/{prove → prover}/smt/solver/rewriter.ts +1 -1
  147. package/src/{prove → prover}/smt/solver/solver.ts +2 -2
  148. package/src/prover/tlapm/cache.ts +236 -0
  149. package/src/prover/tlapm/ocaml-marshal.ts +166 -0
  150. package/src/{prove → prover}/tlapm/tlapm.ts +1 -2
  151. package/src/prover/verdict.ts +13 -0
  152. package/src/{prove → prover}/zenon/decide.ts +5 -11
  153. package/src/{prove → prover}/zenon/encode.ts +40 -106
  154. package/src/{prove → prover}/zenon/eqrel.ts +1 -1
  155. package/src/{prove → prover}/zenon/equality-rules.ts +1 -1
  156. package/src/{prove → prover}/zenon/expr.ts +2 -2
  157. package/src/{prove → prover}/zenon/index-table.ts +1 -1
  158. package/src/{prove → prover}/zenon/isar.ts +1 -1
  159. package/src/{prove → prover}/zenon/llproof.ts +1 -1
  160. package/src/{prove → prover}/zenon/mltoll.ts +1 -1
  161. package/src/{prove → prover}/zenon/node.ts +1 -1
  162. package/src/{prove → prover}/zenon/search.ts +1 -1
  163. package/src/{prove → prover}/zenon/tla/terms.ts +1 -20
  164. package/src/{prove → prover}/zenon/tla/tla.ts +1 -1
  165. package/src/randomization.ts +19 -24
  166. package/src/resolve.ts +15 -22
  167. package/src/runtime.ts +8 -8
  168. package/src/{sany-builtins.ts → sany/builtins.ts} +1 -1
  169. package/src/{sany-generator.ts → sany/generator.ts} +38 -55
  170. package/src/{sany-levels.ts → sany/levels.ts} +45 -48
  171. package/src/{sany-lexer.ts → sany/lexer.ts} +2 -3
  172. package/src/{sany-linter.ts → sany/linter.ts} +1 -1
  173. package/src/{sany-modules.ts → sany/modules.ts} +2 -2
  174. package/src/{sany-nodes.ts → sany/nodes.ts} +2 -2
  175. package/src/{sany-parse-error.ts → sany/parse-error.ts} +2 -2
  176. package/src/{sany-report.ts → sany/report.ts} +16 -17
  177. package/src/{sany-selectors.ts → sany/selectors.ts} +3 -5
  178. package/src/{sany-source.ts → sany/source.ts} +6 -7
  179. package/src/{sany-xml.ts → sany/xml.ts} +5 -6
  180. package/src/search.ts +969 -0
  181. package/src/spec-description.ts +26 -20
  182. package/src/{standard-levels.ts → standard-definitions.ts} +118 -2
  183. package/src/standard-modules.ts +16 -20
  184. package/src/state-graph.ts +9 -8
  185. package/src/substitution-levels.ts +2 -2
  186. package/src/successors.ts +16 -19
  187. package/src/symmetry.ts +1 -1
  188. package/src/tableau.ts +6 -7
  189. package/src/tlc/fingerprint.ts +214 -0
  190. package/src/{tlc-messages.ts → tlc/messages.ts} +119 -7
  191. package/src/{tlc-order.ts → tlc/order.ts} +7 -7
  192. package/src/{tlc-random.ts → tlc/random.ts} +3 -213
  193. package/src/{tlc-replay.ts → tlc/replay.ts} +40 -36
  194. package/src/{tlc-module.ts → tlc/tlc-operators.ts} +9 -9
  195. package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +30 -25
  196. package/src/transfer.ts +32 -32
  197. package/src/values.ts +72 -67
  198. package/src/worker.ts +1 -4
  199. package/dist/run-cli.cjs +0 -38
  200. package/dist/run-cli.js +0 -38
  201. package/src/canonical.ts +0 -40
  202. package/src/obligations/ctx.ts +0 -64
  203. package/src/prove/prep/defs.ts +0 -27
  204. package/src/prove/prep/elab.ts +0 -156
  205. package/src/prove/prep/enabled.ts +0 -43
  206. package/src/prove/prep/flatten.ts +0 -70
  207. package/src/prove/prep/trivial.ts +0 -22
  208. package/src/prove/prove.ts +0 -417
  209. package/src/prove/smt/axiomatize.ts +0 -69
  210. package/src/prove/smt/simplify.ts +0 -57
  211. package/src/prove/verdict.ts +0 -13
  212. package/src/standard-ranges.ts +0 -116
  213. package/src/value-sources.ts +0 -29
  214. /package/src/{prove → prover}/isabelle/LICENSE +0 -0
  215. /package/src/{prove → prover}/isabelle/LICENSE-tlapm +0 -0
  216. /package/src/{prove → prover}/isabelle/isar/proof.ts +0 -0
  217. /package/src/{prove → prover}/isabelle/isar/statement.ts +0 -0
  218. /package/src/{prove → prover}/isabelle/isar/theory.ts +0 -0
  219. /package/src/{prove → prover}/isabelle/provers/blast/prove.ts +0 -0
  220. /package/src/{prove → prover}/isabelle/provers/blast/rules.ts +0 -0
  221. /package/src/{prove → prover}/isabelle/provers/blast/state.ts +0 -0
  222. /package/src/{prove → prover}/isabelle/pure/bicompose.ts +0 -0
  223. /package/src/{prove → prover}/isabelle/pure/consts.ts +0 -0
  224. /package/src/{prove → prover}/isabelle/pure/goal.ts +0 -0
  225. /package/src/{prove → prover}/isabelle/pure/interrupt.ts +0 -0
  226. /package/src/{prove → prover}/isabelle/pure/list.ts +0 -0
  227. /package/src/{prove → prover}/isabelle/pure/object-logic.ts +0 -0
  228. /package/src/{prove → prover}/isabelle/pure/rewriter.ts +0 -0
  229. /package/src/{prove → prover}/isabelle/pure/search.ts +0 -0
  230. /package/src/{prove → prover}/isabelle/pure/variable.ts +0 -0
  231. /package/src/{prove → prover}/isabelle/tla/context.ts +0 -0
  232. /package/src/{prove → prover}/isabelle/tla/logic-data.ts +0 -0
  233. /package/src/{prove → prover}/isabelle/tla/logic.ts +0 -0
  234. /package/src/{prove → prover}/isabelle/tla/simpdata.ts +0 -0
  235. /package/src/{prove → prover}/isabelle/tools/intuitionistic.ts +0 -0
  236. /package/src/{prove → prover}/ptl/decide.ts +0 -0
  237. /package/src/{prove → prover}/ptl/sat.ts +0 -0
  238. /package/src/{prove → prover}/ptl/tableau.ts +0 -0
  239. /package/src/{prove → prover}/smt/context.ts +0 -0
  240. /package/src/{prove → prover}/smt/solver/act-cache.ts +0 -0
  241. /package/src/{prove → prover}/smt/solver/arith-rewriter.ts +0 -0
  242. /package/src/{prove → prover}/smt/solver/array.ts +0 -0
  243. /package/src/{prove → prover}/smt/solver/asserted-formulas.ts +0 -0
  244. /package/src/{prove → prover}/smt/solver/ast-lt.ts +0 -0
  245. /package/src/{prove → prover}/smt/solver/ast.ts +0 -0
  246. /package/src/{prove → prover}/smt/solver/auf-solver.ts +0 -0
  247. /package/src/{prove → prover}/smt/solver/cg-table.ts +0 -0
  248. /package/src/{prove → prover}/smt/solver/clause.ts +0 -0
  249. /package/src/{prove → prover}/smt/solver/conflict-resolution.ts +0 -0
  250. /package/src/{prove → prover}/smt/solver/context.ts +0 -0
  251. /package/src/{prove → prover}/smt/solver/ctx-simplify.ts +0 -0
  252. /package/src/{prove → prover}/smt/solver/der.ts +0 -0
  253. /package/src/{prove → prover}/smt/solver/dyn-ack.ts +0 -0
  254. /package/src/{prove → prover}/smt/solver/e-matching.ts +0 -0
  255. /package/src/{prove → prover}/smt/solver/expr-ref.ts +0 -0
  256. /package/src/{prove → prover}/smt/solver/expr-safe-replace.ts +0 -0
  257. /package/src/{prove → prover}/smt/solver/fingerprints.ts +0 -0
  258. /package/src/{prove → prover}/smt/solver/flat-literals.ts +0 -0
  259. /package/src/{prove → prover}/smt/solver/goal.ts +0 -0
  260. /package/src/{prove → prover}/smt/solver/hash.ts +0 -0
  261. /package/src/{prove → prover}/smt/solver/hashtable.ts +0 -0
  262. /package/src/{prove → prover}/smt/solver/internalizer.ts +0 -0
  263. /package/src/{prove → prover}/smt/solver/lbool.ts +0 -0
  264. /package/src/{prove → prover}/smt/solver/literal.ts +0 -0
  265. /package/src/{prove → prover}/smt/solver/lp/bound-propagator.ts +0 -0
  266. /package/src/{prove → prover}/smt/solver/lp/constraints.ts +0 -0
  267. /package/src/{prove → prover}/smt/solver/lp/containers.ts +0 -0
  268. /package/src/{prove → prover}/smt/solver/lp/core-solver.ts +0 -0
  269. /package/src/{prove → prover}/smt/solver/lp/cross-nested.ts +0 -0
  270. /package/src/{prove → prover}/smt/solver/lp/dependency.ts +0 -0
  271. /package/src/{prove → prover}/smt/solver/lp/dioph-eq.ts +0 -0
  272. /package/src/{prove → prover}/smt/solver/lp/explanation.ts +0 -0
  273. /package/src/{prove → prover}/smt/solver/lp/gomory.ts +0 -0
  274. /package/src/{prove → prover}/smt/solver/lp/hnf-cutter.ts +0 -0
  275. /package/src/{prove → prover}/smt/solver/lp/hnf.ts +0 -0
  276. /package/src/{prove → prover}/smt/solver/lp/int-cube.ts +0 -0
  277. /package/src/{prove → prover}/smt/solver/lp/int-solver.ts +0 -0
  278. /package/src/{prove → prover}/smt/solver/lp/lar-solver.ts +0 -0
  279. /package/src/{prove → prover}/smt/solver/lp/lar-term.ts +0 -0
  280. /package/src/{prove → prover}/smt/solver/lp/lp-settings.ts +0 -0
  281. /package/src/{prove → prover}/smt/solver/lp/maximize-term.ts +0 -0
  282. /package/src/{prove → prover}/smt/solver/lp/nex-creator.ts +0 -0
  283. /package/src/{prove → prover}/smt/solver/lp/nex.ts +0 -0
  284. /package/src/{prove → prover}/smt/solver/lp/nla-backoff.ts +0 -0
  285. /package/src/{prove → prover}/smt/solver/lp/nla-basics.ts +0 -0
  286. /package/src/{prove → prover}/smt/solver/lp/nla-core.ts +0 -0
  287. /package/src/{prove → prover}/smt/solver/lp/nla-divisions.ts +0 -0
  288. /package/src/{prove → prover}/smt/solver/lp/nla-emonics.ts +0 -0
  289. /package/src/{prove → prover}/smt/solver/lp/nla-factorization.ts +0 -0
  290. /package/src/{prove → prover}/smt/solver/lp/nla-grobner.ts +0 -0
  291. /package/src/{prove → prover}/smt/solver/lp/nla-horner.ts +0 -0
  292. /package/src/{prove → prover}/smt/solver/lp/nla-intervals.ts +0 -0
  293. /package/src/{prove → prover}/smt/solver/lp/nla-monomial-bounds.ts +0 -0
  294. /package/src/{prove → prover}/smt/solver/lp/nla-monotone.ts +0 -0
  295. /package/src/{prove → prover}/smt/solver/lp/nla-order.ts +0 -0
  296. /package/src/{prove → prover}/smt/solver/lp/nla-patcher.ts +0 -0
  297. /package/src/{prove → prover}/smt/solver/lp/nla-tangents.ts +0 -0
  298. /package/src/{prove → prover}/smt/solver/lp/nla-throttle.ts +0 -0
  299. /package/src/{prove → prover}/smt/solver/lp/nla-types.ts +0 -0
  300. /package/src/{prove → prover}/smt/solver/lp/nla-var-eqs.ts +0 -0
  301. /package/src/{prove → prover}/smt/solver/lp/nra-solver.ts +0 -0
  302. /package/src/{prove → prover}/smt/solver/lp/numeric-pair.ts +0 -0
  303. /package/src/{prove → prover}/smt/solver/lp/pdd-interval.ts +0 -0
  304. /package/src/{prove → prover}/smt/solver/lp/pdd-simplifier.ts +0 -0
  305. /package/src/{prove → prover}/smt/solver/lp/pdd-solver.ts +0 -0
  306. /package/src/{prove → prover}/smt/solver/lp/pdd.ts +0 -0
  307. /package/src/{prove → prover}/smt/solver/lp/random-updater.ts +0 -0
  308. /package/src/{prove → prover}/smt/solver/lp/static-matrix.ts +0 -0
  309. /package/src/{prove → prover}/smt/solver/lp/union-find.ts +0 -0
  310. /package/src/{prove → prover}/smt/solver/mam-compiler.ts +0 -0
  311. /package/src/{prove → prover}/smt/solver/mam-interpreter.ts +0 -0
  312. /package/src/{prove → prover}/smt/solver/maximize-ac-sharing.ts +0 -0
  313. /package/src/{prove → prover}/smt/solver/model-checker.ts +0 -0
  314. /package/src/{prove → prover}/smt/solver/model-evaluator.ts +0 -0
  315. /package/src/{prove → prover}/smt/solver/model-finder.ts +0 -0
  316. /package/src/{prove → prover}/smt/solver/model-generator.ts +0 -0
  317. /package/src/{prove → prover}/smt/solver/nlsat/evaluator.ts +0 -0
  318. /package/src/{prove → prover}/smt/solver/nlsat/mpbq.ts +0 -0
  319. /package/src/{prove → prover}/smt/solver/nlsat/solver.ts +0 -0
  320. /package/src/{prove → prover}/smt/solver/nlsat/types.ts +0 -0
  321. /package/src/{prove → prover}/smt/solver/nlsat/upolynomial-factorization.ts +0 -0
  322. /package/src/{prove → prover}/smt/solver/nnf.ts +0 -0
  323. /package/src/{prove → prover}/smt/solver/poly-rewriter.ts +0 -0
  324. /package/src/{prove → prover}/smt/solver/propagate-values.ts +0 -0
  325. /package/src/{prove → prover}/smt/solver/proto-model.ts +0 -0
  326. /package/src/{prove → prover}/smt/solver/pull-quant.ts +0 -0
  327. /package/src/{prove → prover}/smt/solver/qe-lite-der.ts +0 -0
  328. /package/src/{prove → prover}/smt/solver/qe-lite-fm.ts +0 -0
  329. /package/src/{prove → prover}/smt/solver/qe-lite.ts +0 -0
  330. /package/src/{prove → prover}/smt/solver/qi-queue.ts +0 -0
  331. /package/src/{prove → prover}/smt/solver/quant-tactics.ts +0 -0
  332. /package/src/{prove → prover}/smt/solver/quantifier-analyzer.ts +0 -0
  333. /package/src/{prove → prover}/smt/solver/quantifier-manager.ts +0 -0
  334. /package/src/{prove → prover}/smt/solver/random-gen.ts +0 -0
  335. /package/src/{prove → prover}/smt/solver/rational.ts +0 -0
  336. /package/src/{prove → prover}/smt/solver/ref-vector.ts +0 -0
  337. /package/src/{prove → prover}/smt/solver/rewriter-tpl.ts +0 -0
  338. /package/src/{prove → prover}/smt/solver/rlimit.ts +0 -0
  339. /package/src/{prove → prover}/smt/solver/smtlib-parser.ts +0 -0
  340. /package/src/{prove → prover}/smt/solver/sort.ts +0 -0
  341. /package/src/{prove → prover}/smt/solver/sticky-generations.ts +0 -0
  342. /package/src/{prove → prover}/smt/solver/theory-lra-axioms.ts +0 -0
  343. /package/src/{prove → prover}/smt/solver/theory-lra-bounds.ts +0 -0
  344. /package/src/{prove → prover}/smt/solver/theory-lra-final-check.ts +0 -0
  345. /package/src/{prove → prover}/smt/solver/theory-lra-internalize.ts +0 -0
  346. /package/src/{prove → prover}/smt/solver/theory-lra-model.ts +0 -0
  347. /package/src/{prove → prover}/smt/solver/theory-lra-propagate.ts +0 -0
  348. /package/src/{prove → prover}/smt/solver/theory-lra-state.ts +0 -0
  349. /package/src/{prove → prover}/smt/solver/theory-lra.ts +0 -0
  350. /package/src/{prove → prover}/smt/solver/var-subst.ts +0 -0
  351. /package/src/{prove → prover}/smt/solver/z3-license.txt +0 -0
  352. /package/src/{prove → prover}/smt/table.ts +0 -0
  353. /package/src/{prove → prover}/tlaps-module.ts +0 -0
  354. /package/src/{prove → prover}/zenon/LICENSE +0 -0
  355. /package/src/{prove → prover}/zenon/check/check.ts +0 -0
  356. /package/src/{prove → prover}/zenon/check/definitions.ts +0 -0
  357. /package/src/{prove → prover}/zenon/check/equality.ts +0 -0
  358. /package/src/{prove → prover}/zenon/check/functions.ts +0 -0
  359. /package/src/{prove → prover}/zenon/check/keys.ts +0 -0
  360. /package/src/{prove → prover}/zenon/check/propositional.ts +0 -0
  361. /package/src/{prove → prover}/zenon/check/records.ts +0 -0
  362. /package/src/{prove → prover}/zenon/check/relations.ts +0 -0
  363. /package/src/{prove → prover}/zenon/check/rewrites.ts +0 -0
  364. /package/src/{prove → prover}/zenon/check/sets.ts +0 -0
  365. /package/src/{prove → prover}/zenon/check/terms.ts +0 -0
  366. /package/src/{prove → prover}/zenon/check/tla.ts +0 -0
  367. /package/src/{prove → prover}/zenon/isar-case.ts +0 -0
  368. /package/src/{prove → prover}/zenon/limits.ts +0 -0
  369. /package/src/{prove → prover}/zenon/ocaml.ts +0 -0
  370. /package/src/{prove → prover}/zenon/parse.ts +0 -0
  371. /package/src/{prove → prover}/zenon/phrase.ts +0 -0
  372. /package/src/{prove → prover}/zenon/proof.ts +0 -0
  373. /package/src/{prove → prover}/zenon/propositional-rules.ts +0 -0
  374. /package/src/{prove → prover}/zenon/rules.ts +0 -0
  375. /package/src/{prove → prover}/zenon/tla/functions.ts +0 -0
  376. /package/src/{prove → prover}/zenon/tla/llproof.ts +0 -0
  377. /package/src/{prove → prover}/zenon/tla/records.ts +0 -0
  378. /package/src/{prove → prover}/zenon/tla/rewrites.ts +0 -0
  379. /package/src/{prove → prover}/zenon/tla/sets.ts +0 -0
  380. /package/src/{tlc-modules.ts → tlc/jar-data.ts} +0 -0
  381. /package/src/{tlc-summary.ts → tlc/summary.ts} +0 -0
  382. /package/src/{tlc-version.ts → tlc/version.ts} +0 -0
@@ -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
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,
@@ -14,180 +13,71 @@ import {
14
13
  type Sequent,
15
14
  type Shape,
16
15
  } from "./expression";
17
- import { createContext, getBoundName, popNames, pushName, withNames } from "./ctx";
18
16
  import { format, formatDelimited, renderDoc, text, type Doc } from "./format";
17
+ import { getStandardForm, lookupOperator } from "./operators";
19
18
 
20
- export type Fixity = "Nonfix" | "Prefix" | "Postfix" | "InfixLeft" | "InfixNon" | "InfixRight";
21
-
22
- export interface Operator {
23
- name: string;
24
- low: number;
25
- high: number;
26
- fixity: Fixity;
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.
21
+ interface Ident {
22
+ rep: string;
23
+ salt: number;
27
24
  }
28
25
 
29
- const OPERATORS: [string, number, number, Fixity, string[]][] = [
30
- ["=>", 1, 1, "InfixNon", []],
31
- ["<=>", 2, 2, "InfixNon", ["\\equiv"]],
32
- ["/\\", 3, 3, "InfixLeft", ["\\land"]],
33
- ["\\/", 3, 3, "InfixLeft", ["\\lor"]],
34
- ["~", 4, 4, "Prefix", ["\\neg", "\\lnot"]],
35
- ["=", 5, 5, "InfixNon", []],
36
- ["#", 5, 5, "InfixNon", ["/="]],
37
- ["SUBSET", 8, 8, "Prefix", []],
38
- ["UNION", 8, 8, "Prefix", []],
39
- ["DOMAIN", 9, 9, "Prefix", []],
40
- ["\\subseteq", 5, 5, "InfixNon", []],
41
- ["\\in", 5, 5, "InfixNon", []],
42
- ["\\notin", 5, 5, "InfixNon", []],
43
- ["\\", 8, 8, "InfixNon", []],
44
- ["\\cap", 8, 8, "InfixLeft", ["\\intersect"]],
45
- ["\\cup", 8, 8, "InfixLeft", ["\\union"]],
46
- ["\\X", 10, 13, "Prefix", ["\\times"]],
47
- ["'", 15, 15, "Postfix", []],
48
- ["~>", 2, 2, "InfixNon", ["\\leadsto"]],
49
- ["ENABLED", 4, 15, "Prefix", []],
50
- ["UNCHANGED", 4, 15, "Prefix", []],
51
- ["\\cdot", 5, 14, "InfixLeft", []],
52
- ["-+->", 2, 2, "InfixNon", []],
53
- ["[]", 4, 15, "Prefix", []],
54
- ["<>", 4, 15, "Prefix", []],
55
- ["^", 14, 14, "InfixNon", []],
56
- ["/", 13, 13, "InfixNon", []],
57
- ["*", 13, 13, "InfixLeft", []],
58
- ["-.", 12, 12, "Prefix", ["-"]],
59
- ["-", 11, 11, "InfixLeft", []],
60
- ["+", 10, 10, "InfixLeft", []],
61
- ["^+", 15, 15, "Postfix", []],
62
- ["^*", 15, 15, "Postfix", []],
63
- ["^#", 15, 15, "Postfix", []],
64
- ["<", 5, 5, "InfixNon", []],
65
- ["=<", 5, 5, "InfixNon", ["<=", "\\leq"]],
66
- [">", 5, 5, "InfixNon", []],
67
- [">=", 5, 5, "InfixNon", ["\\geq"]],
68
- ["...", 9, 9, "InfixNon", []],
69
- ["..", 9, 9, "InfixNon", []],
70
- ["|", 10, 11, "InfixLeft", []],
71
- ["||", 10, 11, "InfixLeft", []],
72
- ["&&", 13, 13, "InfixLeft", []],
73
- ["&", 13, 13, "InfixLeft", []],
74
- ["$$", 9, 13, "InfixLeft", []],
75
- ["$", 9, 13, "InfixLeft", []],
76
- ["??", 9, 13, "InfixLeft", []],
77
- ["%%", 10, 11, "InfixLeft", []],
78
- ["%", 10, 11, "InfixLeft", ["\\mod"]],
79
- ["##", 9, 13, "InfixLeft", []],
80
- ["++", 10, 10, "InfixLeft", []],
81
- ["--", 11, 11, "InfixLeft", []],
82
- ["**", 13, 13, "InfixLeft", []],
83
- ["//", 13, 13, "InfixNon", []],
84
- ["^^", 14, 14, "InfixNon", []],
85
- ["@@", 6, 6, "InfixLeft", []],
86
- ["!!", 9, 13, "InfixNon", []],
87
- ["|-", 5, 5, "InfixNon", []],
88
- ["|=", 5, 5, "InfixNon", []],
89
- ["-|", 5, 5, "InfixNon", []],
90
- ["=|", 5, 5, "InfixNon", []],
91
- ["<:", 7, 7, "InfixNon", []],
92
- [":>", 7, 7, "InfixNon", []],
93
- [":=", 5, 5, "InfixNon", []],
94
- ["::=", 5, 5, "InfixNon", []],
95
- ["(+)", 10, 10, "InfixLeft", ["\\oplus"]],
96
- ["(-)", 11, 11, "InfixLeft", ["\\ominus"]],
97
- ["(.)", 13, 13, "InfixLeft", ["\\odot"]],
98
- ["(/)", 13, 13, "InfixNon", ["\\oslash"]],
99
- ["(\\X)", 13, 13, "InfixLeft", ["\\otimes"]],
100
- ["\\uplus", 9, 13, "InfixLeft", []],
101
- ["\\sqcap", 9, 13, "InfixLeft", []],
102
- ["\\sqcup", 9, 13, "InfixLeft", []],
103
- ["\\div", 13, 13, "InfixNon", []],
104
- ["\\wr", 9, 14, "InfixNon", []],
105
- ["\\star", 13, 13, "InfixLeft", []],
106
- ["\\o", 13, 13, "InfixLeft", ["\\circ"]],
107
- ["\\bigcirc", 13, 13, "InfixLeft", []],
108
- ["\\bullet", 13, 13, "InfixLeft", []],
109
- ["\\prec", 5, 5, "InfixNon", []],
110
- ["\\succ", 5, 5, "InfixNon", []],
111
- ["\\preceq", 5, 5, "InfixNon", []],
112
- ["\\succeq", 5, 5, "InfixNon", []],
113
- ["\\sim", 5, 5, "InfixNon", []],
114
- ["\\simeq", 5, 5, "InfixNon", []],
115
- ["\\ll", 5, 5, "InfixNon", []],
116
- ["\\gg", 5, 5, "InfixNon", []],
117
- ["\\asymp", 5, 5, "InfixNon", []],
118
- ["\\subset", 5, 5, "InfixNon", []],
119
- ["\\supset", 5, 5, "InfixNon", []],
120
- ["\\supseteq", 5, 5, "InfixNon", []],
121
- ["\\approx", 5, 5, "InfixNon", []],
122
- ["\\cong", 5, 5, "InfixNon", []],
123
- ["\\sqsubset", 5, 5, "InfixNon", []],
124
- ["\\sqsubseteq", 5, 5, "InfixNon", []],
125
- ["\\sqsupset", 5, 5, "InfixNon", []],
126
- ["\\sqsupseteq", 5, 5, "InfixNon", []],
127
- ["\\doteq", 5, 5, "InfixNon", []],
128
- ["\\propto", 5, 5, "InfixNon", []],
129
- ];
130
-
131
- // OCaml's Hashtbl.find returns the most recent binding, so later aliases win over earlier names.
132
- const OPERATOR_TABLE = new Map<string, Operator>();
133
- for (const [name, low, high, fixity, aliases] of OPERATORS) {
134
- const operator = { name, low, high, fixity };
135
- for (const spelling of [name, ...aliases]) OPERATOR_TABLE.set(spelling, operator);
26
+ export interface Context {
27
+ stack: Ident[];
28
+ idents: Map<string, Ident[]>;
29
+ defined: Map<string, number>;
136
30
  }
137
31
 
138
- const getNonfix = (name: string): Operator => ({ name, low: -1, high: -1, fixity: "Nonfix" });
139
-
140
- export const lookupOperator = (name: string) => OPERATOR_TABLE.get(name) ?? getNonfix(name);
141
-
142
- const STANDARD_NAMES: Partial<Record<Builtin, string>> = {
143
- Implies: "=>",
144
- Equiv: "<=>",
145
- Conj: "/\\",
146
- Disj: "\\/",
147
- Neg: "~",
148
- Eq: "=",
149
- Neq: "#",
150
- SUBSET: "SUBSET",
151
- UNION: "UNION",
152
- DOMAIN: "DOMAIN",
153
- Subseteq: "\\subseteq",
154
- Mem: "\\in",
155
- Notmem: "\\notin",
156
- Setminus: "\\",
157
- Cap: "\\cap",
158
- Cup: "\\cup",
159
- Prime: "'",
160
- StrongPrime: "'",
161
- Leadsto: "~>",
162
- ENABLED: "ENABLED",
163
- UNCHANGED: "UNCHANGED",
164
- Cdot: "\\cdot",
165
- Actplus: "-+->",
166
- BoxTrue: "[]",
167
- BoxFalse: "[]",
168
- Diamond: "<>",
169
- Plus: "+",
170
- Minus: "-",
171
- Times: "*",
172
- Ratio: "/",
173
- Quotient: "\\div",
174
- Remainder: "%",
175
- Exp: "^",
176
- Lteq: "=<",
177
- Lt: "<",
178
- Gteq: ">=",
179
- Gt: ">",
180
- Range: "..",
181
- Cat: "\\o",
182
- OneArg: ":>",
183
- Extend: "@@",
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
+ };
46
+
47
+ export const pushName = (context: Context, rep: string) => {
48
+ const previous = context.idents.get(rep)?.at(-1);
49
+ let ident: Ident = previous ? { rep, salt: previous.salt + 1 } : { rep, salt: 0 };
50
+ while (context.defined.has(getIdentName(ident))) ident = { rep, salt: ident.salt + 1 };
51
+ context.stack.push(ident);
52
+ const idents = context.idents.get(rep);
53
+ if (idents) idents.push(ident);
54
+ else context.idents.set(rep, [ident]);
55
+ const key = getIdentName(ident);
56
+ context.defined.set(key, (context.defined.get(key) ?? 0) + 1);
57
+ return key;
58
+ };
59
+
60
+ export const popNames = (context: Context, count: number) => {
61
+ for (let index = 0; index < count; index++) {
62
+ const ident = context.stack.pop();
63
+ if (!ident) return;
64
+ context.idents.get(ident.rep)?.pop();
65
+ const key = getIdentName(ident);
66
+ const remaining = (context.defined.get(key) ?? 1) - 1;
67
+ if (remaining === 0) context.defined.delete(key);
68
+ else context.defined.set(key, remaining);
69
+ }
184
70
  };
185
71
 
186
- const getStandardForm = (builtin: Builtin): Operator => {
187
- if (builtin === "Divides") return { name: "?|", low: 10, high: 11, fixity: "InfixNon" };
188
- if (builtin === "Uminus") return { ...lookupOperator("-."), name: "-" };
189
- const name = STANDARD_NAMES[builtin];
190
- return name ? lookupOperator(name) : getNonfix(builtin);
72
+ const withNames = <Result>(
73
+ context: Context,
74
+ names: string[],
75
+ body: (idents: string[]) => Result,
76
+ ) => {
77
+ const idents = names.map((name) => pushName(context, name));
78
+ const result = body(idents);
79
+ popNames(context, names.length);
80
+ return result;
191
81
  };
192
82
 
193
83
  type Assoc = "Left" | "Non" | "Right";
@@ -404,7 +294,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
404
294
  return atom(format("@[<h>@<1>%s%a@<1>%s@]", "<[", printExpr(args[0]), "]>"));
405
295
  }
406
296
  }
407
- const top = (() => {
297
+ const form = (() => {
408
298
  switch (operator.kind) {
409
299
  case "Ix":
410
300
  return lookupOperator(getIndexName(operator.index));
@@ -418,38 +308,41 @@ const createPrinter = (hyps: Hyp[] = []) => {
418
308
  throw new TlaProofError("Cannot print this operator");
419
309
  }
420
310
  })();
421
- const getOp = (doc: Doc, skeleton: Skeleton): Minimal => ({
311
+ const getOperation = (doc: Doc, skeleton: Skeleton): Minimal => ({
422
312
  kind: "Op",
423
- name: top.name,
313
+ name: form.name,
424
314
  doc,
425
- low: top.low,
426
- high: top.high,
315
+ low: form.low,
316
+ high: form.high,
427
317
  skeleton,
428
318
  });
429
- if (args.length === 0) return atom(text(top.name));
430
- if (top.fixity === "Nonfix") {
431
- 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)));
432
322
  }
433
- if (top.fixity === "Prefix" && args.length === 1) {
434
- return getOp(/[A-Za-z]$/.test(top.name) ? format("%s@ ", top.name) : text(top.name), {
435
- kind: "Prefix",
436
- operand: formatExpr(args[0]),
437
- });
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
+ );
438
331
  }
439
- if (top.fixity === "Postfix" && args.length === 1) {
440
- 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]) });
441
334
  }
442
- if (top.fixity.startsWith("Infix") && args.length === 2) {
335
+ if (form.fixity.startsWith("Infix") && args.length === 2) {
443
336
  const assoc: Assoc =
444
- top.fixity === "InfixLeft" ? "Left" : top.fixity === "InfixRight" ? "Right" : "Non";
445
- 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), {
446
339
  kind: "Infix",
447
340
  assoc,
448
341
  left: formatExpr(args[0]),
449
342
  right: formatExpr(args[1]),
450
343
  });
451
344
  }
452
- throw new TlaProofError(`Arity mismatch for operator ${top.name}`);
345
+ throw new TlaProofError(`Arity mismatch for operator ${form.name}`);
453
346
  };
454
347
 
455
348
  const formatExpr = (expression: Expr): Minimal => {
@@ -478,8 +371,9 @@ const createPrinter = (hyps: Hyp[] = []) => {
478
371
  ),
479
372
  );
480
373
  case "List": {
481
- if (expression.bullet === "Refs" && expression.items.length === 0)
374
+ if (expression.bullet === "Refs" && expression.items.length === 0) {
482
375
  return atom(format("TRUE"));
376
+ }
483
377
  if (expression.bullet === "Refs" && expression.items.length === 1) {
484
378
  return formatExpr(expression.items[0]);
485
379
  }
@@ -603,23 +497,17 @@ const createPrinter = (hyps: Hyp[] = []) => {
603
497
  case "Tuple":
604
498
  return atom(format("@[<b2><<%a>>@]", formatDelimited(expression.elements, printExpr)));
605
499
  case "Rect":
500
+ case "Record": {
501
+ const separator = expression.kind === "Rect" ? ":" : "|->";
606
502
  return atom(
607
503
  format(
608
504
  "@[<b1>[%a]@]",
609
505
  formatDelimited(expression.fields, (field) =>
610
- format("@[<h>%s : %a@]", field.name, printExpr(field.value)),
611
- ),
612
- ),
613
- );
614
- case "Record":
615
- return atom(
616
- format(
617
- "@[<b1>[%a]@]",
618
- formatDelimited(expression.fields, (field) =>
619
- format("@[<h>%s |-> %a@]", field.name, printExpr(field.value)),
506
+ format(`@[<h>%s ${separator} %a@]`, field.name, printExpr(field.value)),
620
507
  ),
621
508
  ),
622
509
  );
510
+ }
623
511
  case "Except":
624
512
  return atom(
625
513
  format(
@@ -718,12 +606,13 @@ const createPrinter = (hyps: Hyp[] = []) => {
718
606
  return atom(format(pattern, form.label, printMinimal(inner)));
719
607
  }
720
608
  const namesDoc = formatDelimited(names, text);
721
- if (inner.kind === "Atm")
722
- return atom(format("%s(%a)::%a", form.label, namesDoc, printMinimal(inner)));
723
- if (inner.kind === "Big") {
724
- return atom(format("%s(%a)::(%a)", form.label, namesDoc, printMinimal(inner)));
725
- }
726
- 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)));
727
616
  }
728
617
  }
729
618
  };
@@ -829,7 +718,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
829
718
  export const printExpression = (hyps: Hyp[], expression: Expr) =>
830
719
  createPrinter(hyps).printExpr(expression);
831
720
 
832
- export const formatObligation = (sequent: Sequent) => {
833
- const printer = createPrinter();
834
- return renderDoc(format("@[<b0>%a@]", printer.printSequent(sequent))).trimEnd();
835
- };
721
+ export const printSequent = (sequent: Sequent) => createPrinter().printSequent(sequent);
722
+
723
+ export const formatObligation = (sequent: Sequent) =>
724
+ renderDoc(format("@[<b0>%a@]", printSequent(sequent))).trimEnd();
@@ -36,7 +36,6 @@ export interface Obligation {
36
36
  interface ProofProps {
37
37
  location?: Locus;
38
38
  step?: StepNumber;
39
- isSuppressed?: boolean;
40
39
  obligations?: Obligation[];
41
40
  method?: OldMethod;
42
41
  useLocation?: Locus;
@@ -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
+ };