tla-ts 0.0.9 → 0.0.10-dev.63a6693bd

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 (400) hide show
  1. package/README.md +29 -1
  2. package/dist/compile.cjs +23 -0
  3. package/dist/compile.js +23 -0
  4. package/dist/deciders.cjs +29 -29
  5. package/dist/deciders.js +42 -42
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +106 -10
  8. package/dist/index.d.ts +106 -10
  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 +117 -37
  15. package/dist/prove.js +116 -36
  16. package/dist/run.cjs +143 -31
  17. package/dist/run.js +143 -31
  18. package/dist/tlapm.cjs +2 -2
  19. package/dist/tlapm.js +2 -2
  20. package/dist/transfer.cjs +129 -104
  21. package/dist/transfer.js +129 -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 +48 -62
  26. package/src/bags.ts +99 -102
  27. package/src/builtins.ts +28 -75
  28. package/src/bundled-modules.ts +1 -8
  29. package/src/check-failure.ts +116 -0
  30. package/src/check-trace.ts +282 -0
  31. package/src/check.ts +599 -754
  32. package/src/cli/options.ts +12 -32
  33. package/src/cli/run.ts +0 -2
  34. package/src/cli/runtime-invariants.ts +136 -0
  35. package/src/cli/shared.ts +19 -12
  36. package/src/cli/tlapm.ts +14 -25
  37. package/src/cli/tlc-arguments.ts +652 -0
  38. package/src/cli/tlc-output.ts +687 -0
  39. package/src/cli/tlc-usage.ts +361 -0
  40. package/src/cli/tlc.ts +309 -658
  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 +196 -74
  45. package/src/config.ts +140 -109
  46. package/src/coverage.ts +830 -0
  47. package/src/dependencies.ts +14 -53
  48. package/src/dfid.ts +618 -0
  49. package/src/environment-config.ts +315 -0
  50. package/src/environment.ts +169 -335
  51. package/src/errors.ts +71 -55
  52. package/src/evaluate.ts +598 -340
  53. package/src/exit-codes.ts +37 -3
  54. package/src/fingerprints.ts +75 -11
  55. package/src/index.ts +3 -0
  56. package/src/instances.ts +126 -21
  57. package/src/java-hash.ts +7 -0
  58. package/src/java-overrides.ts +4 -19
  59. package/src/json-reader.ts +455 -0
  60. package/src/json.ts +252 -139
  61. package/src/levels.ts +46 -58
  62. package/src/lexer.ts +80 -100
  63. package/src/liveness-checker.ts +103 -153
  64. package/src/liveness.ts +150 -109
  65. package/src/obligations/action.ts +8 -39
  66. package/src/obligations/anonymize.ts +88 -82
  67. package/src/obligations/equality.ts +1 -1
  68. package/src/obligations/expression.ts +20 -21
  69. package/src/obligations/format.ts +1 -9
  70. package/src/obligations/generate.ts +46 -49
  71. package/src/obligations/index.ts +2 -13
  72. package/src/obligations/levels.ts +4 -8
  73. package/src/obligations/module.ts +28 -53
  74. package/src/obligations/normalize.ts +7 -25
  75. package/src/obligations/operators.ts +1 -2
  76. package/src/obligations/pragma.ts +1 -10
  77. package/src/obligations/printer.ts +47 -46
  78. package/src/obligations/proof.ts +1 -5
  79. package/src/obligations/regroup.ts +1 -4
  80. package/src/obligations/simplify.ts +42 -58
  81. package/src/obligations/source.ts +48 -78
  82. package/src/obligations/subexpression.ts +5 -11
  83. package/src/obligations/substitution.ts +1 -3
  84. package/src/obligations/temporal.ts +13 -19
  85. package/src/obligations/tuples.ts +3 -9
  86. package/src/parallel-worker.ts +30 -60
  87. package/src/parallel.ts +57 -71
  88. package/src/parser.ts +584 -316
  89. package/src/pcal/ast.ts +53 -86
  90. package/src/pcal/parse.ts +144 -219
  91. package/src/pcal/tokenize.ts +91 -131
  92. package/src/pcal/translate.ts +83 -130
  93. package/src/pcal/validate.ts +48 -68
  94. package/src/pretty-print.ts +7 -8
  95. package/src/prover/decide-pool.ts +8 -13
  96. package/src/prover/deciders.ts +3 -7
  97. package/src/prover/first-order.ts +0 -11
  98. package/src/prover/isabelle/decide.ts +0 -6
  99. package/src/prover/isabelle/encode.ts +11 -23
  100. package/src/prover/isabelle/isar/inner-syntax.ts +114 -115
  101. package/src/prover/isabelle/isar/method.ts +29 -53
  102. package/src/prover/isabelle/isar/proof.ts +1 -10
  103. package/src/prover/isabelle/isar/statement.ts +1 -6
  104. package/src/prover/isabelle/isar/theory.ts +26 -36
  105. package/src/prover/isabelle/isar/type-check.ts +17 -31
  106. package/src/prover/isabelle/provers/blast/blast.ts +17 -104
  107. package/src/prover/isabelle/provers/blast/branch.ts +1 -32
  108. package/src/prover/isabelle/provers/blast/prove.ts +1 -35
  109. package/src/prover/isabelle/provers/blast/rules.ts +6 -44
  110. package/src/prover/isabelle/provers/blast/state.ts +2 -28
  111. package/src/prover/isabelle/provers/blast/term.ts +9 -36
  112. package/src/prover/isabelle/provers/clasimp.ts +1 -13
  113. package/src/prover/isabelle/provers/classical.ts +14 -42
  114. package/src/prover/isabelle/provers/hypsubst.ts +28 -51
  115. package/src/prover/isabelle/pure/bicompose.ts +25 -38
  116. package/src/prover/isabelle/pure/consts.ts +1 -7
  117. package/src/prover/isabelle/pure/conv.ts +3 -17
  118. package/src/prover/isabelle/pure/drule.ts +33 -42
  119. package/src/prover/isabelle/pure/envir.ts +3 -52
  120. package/src/prover/isabelle/pure/goal.ts +1 -7
  121. package/src/prover/isabelle/pure/interrupt.ts +0 -5
  122. package/src/prover/isabelle/pure/list.ts +0 -3
  123. package/src/prover/isabelle/pure/logic.ts +2 -15
  124. package/src/prover/isabelle/pure/name.ts +2 -9
  125. package/src/prover/isabelle/pure/net.ts +3 -59
  126. package/src/prover/isabelle/pure/object-logic.ts +3 -10
  127. package/src/prover/isabelle/pure/pattern.ts +2 -19
  128. package/src/prover/isabelle/pure/raw-simplifier.ts +17 -62
  129. package/src/prover/isabelle/pure/rewriter.ts +31 -67
  130. package/src/prover/isabelle/pure/search.ts +3 -10
  131. package/src/prover/isabelle/pure/seq.ts +1 -10
  132. package/src/prover/isabelle/pure/simplifier.ts +4 -12
  133. package/src/prover/isabelle/pure/table.ts +3 -32
  134. package/src/prover/isabelle/pure/tactic.ts +12 -22
  135. package/src/prover/isabelle/pure/tactical.ts +48 -47
  136. package/src/prover/isabelle/pure/term-ord.ts +2 -6
  137. package/src/prover/isabelle/pure/term.ts +2 -43
  138. package/src/prover/isabelle/pure/thm.ts +27 -47
  139. package/src/prover/isabelle/pure/type.ts +2 -15
  140. package/src/prover/isabelle/pure/unify.ts +20 -30
  141. package/src/prover/isabelle/pure/variable.ts +3 -7
  142. package/src/prover/isabelle/tla/classical-setup.ts +17 -24
  143. package/src/prover/isabelle/tla/context.ts +15 -18
  144. package/src/prover/isabelle/tla/logic.ts +14 -32
  145. package/src/prover/isabelle/tla/simpdata.ts +46 -43
  146. package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
  147. package/src/prover/ocaml.ts +0 -6
  148. package/src/prover/prep/action.ts +14 -54
  149. package/src/prover/prep/enabled-axioms.ts +12 -19
  150. package/src/prover/prep/fingerprint.ts +2 -21
  151. package/src/prover/prep/level-comparison.ts +8 -12
  152. package/src/prover/prep/md5.ts +0 -2
  153. package/src/prover/prep/methods.ts +33 -39
  154. package/src/prover/prep/normalize.ts +4 -28
  155. package/src/prover/prove-worker.ts +0 -2
  156. package/src/prover/prove.ts +87 -100
  157. package/src/prover/ptl/decide.ts +7 -12
  158. package/src/prover/ptl/encode.ts +14 -36
  159. package/src/prover/ptl/sat.ts +24 -32
  160. package/src/prover/ptl/tableau.ts +12 -26
  161. package/src/prover/smt/axioms.ts +0 -7
  162. package/src/prover/smt/context.ts +20 -28
  163. package/src/prover/smt/data.ts +433 -424
  164. package/src/prover/smt/encode.ts +43 -52
  165. package/src/prover/smt/extensionality.ts +0 -10
  166. package/src/prover/smt/flatten.ts +3 -22
  167. package/src/prover/smt/format.ts +5 -10
  168. package/src/prover/smt/instances.ts +0 -10
  169. package/src/prover/smt/rewrite.ts +663 -667
  170. package/src/prover/smt/solver/act-cache.ts +0 -15
  171. package/src/prover/smt/solver/arith-rewriter.ts +3 -48
  172. package/src/prover/smt/solver/array.ts +1 -3
  173. package/src/prover/smt/solver/asserted-formulas.ts +1 -43
  174. package/src/prover/smt/solver/ast-lt.ts +1 -11
  175. package/src/prover/smt/solver/ast-util.ts +1 -6
  176. package/src/prover/smt/solver/ast.ts +1 -165
  177. package/src/prover/smt/solver/auf-solver.ts +8 -44
  178. package/src/prover/smt/solver/case-split-queue.ts +1 -9
  179. package/src/prover/smt/solver/cg-table.ts +1 -18
  180. package/src/prover/smt/solver/clause.ts +1 -27
  181. package/src/prover/smt/solver/conflict-resolution.ts +0 -9
  182. package/src/prover/smt/solver/context.ts +7 -64
  183. package/src/prover/smt/solver/ctx-simplify.ts +14 -41
  184. package/src/prover/smt/solver/der.ts +2 -21
  185. package/src/prover/smt/solver/dyn-ack.ts +1 -11
  186. package/src/prover/smt/solver/e-matching.ts +4 -35
  187. package/src/prover/smt/solver/enode.ts +1 -21
  188. package/src/prover/smt/solver/expr-ref.ts +1 -5
  189. package/src/prover/smt/solver/expr-safe-replace.ts +1 -6
  190. package/src/prover/smt/solver/fingerprints.ts +1 -12
  191. package/src/prover/smt/solver/flat-literals.ts +1 -9
  192. package/src/prover/smt/solver/goal.ts +2 -14
  193. package/src/prover/smt/solver/hash.ts +0 -8
  194. package/src/prover/smt/solver/hashtable.ts +1 -12
  195. package/src/prover/smt/solver/internalizer.ts +7 -100
  196. package/src/prover/smt/solver/lbool.ts +1 -2
  197. package/src/prover/smt/solver/literal.ts +0 -3
  198. package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
  199. package/src/prover/smt/solver/lp/constraints.ts +2 -8
  200. package/src/prover/smt/solver/lp/containers.ts +12 -30
  201. package/src/prover/smt/solver/lp/core-solver.ts +10 -31
  202. package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
  203. package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
  204. package/src/prover/smt/solver/lp/dependency.ts +1 -4
  205. package/src/prover/smt/solver/lp/dioph-eq.ts +9 -102
  206. package/src/prover/smt/solver/lp/explanation.ts +1 -6
  207. package/src/prover/smt/solver/lp/gomory.ts +9 -22
  208. package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
  209. package/src/prover/smt/solver/lp/hnf.ts +11 -26
  210. package/src/prover/smt/solver/lp/int-cube.ts +15 -36
  211. package/src/prover/smt/solver/lp/int-solver.ts +4 -34
  212. package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
  213. package/src/prover/smt/solver/lp/lar-term.ts +1 -5
  214. package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
  215. package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
  216. package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
  217. package/src/prover/smt/solver/lp/nex.ts +1 -6
  218. package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
  219. package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
  220. package/src/prover/smt/solver/lp/nla-core.ts +36 -135
  221. package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
  222. package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
  223. package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
  224. package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
  225. package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
  226. package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
  227. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
  228. package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
  229. package/src/prover/smt/solver/lp/nla-order.ts +2 -13
  230. package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
  231. package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
  232. package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
  233. package/src/prover/smt/solver/lp/nla-types.ts +1 -11
  234. package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
  235. package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
  236. package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
  237. package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
  238. package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
  239. package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
  240. package/src/prover/smt/solver/lp/pdd.ts +7 -70
  241. package/src/prover/smt/solver/lp/random-updater.ts +1 -8
  242. package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
  243. package/src/prover/smt/solver/lp/union-find.ts +1 -6
  244. package/src/prover/smt/solver/mam-compiler.ts +18 -58
  245. package/src/prover/smt/solver/mam-interpreter.ts +1 -21
  246. package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
  247. package/src/prover/smt/solver/model-checker.ts +3 -37
  248. package/src/prover/smt/solver/model-evaluator.ts +3 -29
  249. package/src/prover/smt/solver/model-finder.ts +15 -32
  250. package/src/prover/smt/solver/model-generator.ts +1 -12
  251. package/src/prover/smt/solver/model-macro-solver.ts +23 -88
  252. package/src/prover/smt/solver/nlsat/algebraic.ts +63 -159
  253. package/src/prover/smt/solver/nlsat/atoms.ts +25 -23
  254. package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
  255. package/src/prover/smt/solver/nlsat/explain.ts +10 -69
  256. package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
  257. package/src/prover/smt/solver/nlsat/levelwise.ts +49 -135
  258. package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
  259. package/src/prover/smt/solver/nlsat/polynomial.ts +29 -159
  260. package/src/prover/smt/solver/nlsat/solver.ts +18 -90
  261. package/src/prover/smt/solver/nlsat/types.ts +1 -8
  262. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +2 -45
  263. package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
  264. package/src/prover/smt/solver/nnf.ts +3 -38
  265. package/src/prover/smt/solver/pattern-inference.ts +2 -15
  266. package/src/prover/smt/solver/poly-rewriter.ts +3 -23
  267. package/src/prover/smt/solver/propagate-values.ts +1 -10
  268. package/src/prover/smt/solver/proto-model.ts +3 -52
  269. package/src/prover/smt/solver/pull-quant.ts +1 -12
  270. package/src/prover/smt/solver/qe-lite-der.ts +1 -29
  271. package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
  272. package/src/prover/smt/solver/qe-lite.ts +3 -33
  273. package/src/prover/smt/solver/qi-queue.ts +1 -16
  274. package/src/prover/smt/solver/quant-tactics.ts +5 -22
  275. package/src/prover/smt/solver/quantifier-analyzer.ts +27 -47
  276. package/src/prover/smt/solver/quantifier-manager.ts +2 -13
  277. package/src/prover/smt/solver/random-gen.ts +1 -2
  278. package/src/prover/smt/solver/rational.ts +1 -8
  279. package/src/prover/smt/solver/ref-vector.ts +1 -6
  280. package/src/prover/smt/solver/relevancy.ts +2 -15
  281. package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
  282. package/src/prover/smt/solver/rewriter.ts +3 -85
  283. package/src/prover/smt/solver/rlimit.ts +2 -20
  284. package/src/prover/smt/solver/smtlib-parser.ts +80 -131
  285. package/src/prover/smt/solver/solver.ts +23 -34
  286. package/src/prover/smt/solver/sort.ts +1 -5
  287. package/src/prover/smt/solver/sticky-generations.ts +0 -5
  288. package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
  289. package/src/prover/smt/solver/theory-lra-bounds.ts +1 -7
  290. package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
  291. package/src/prover/smt/solver/theory-lra-internalize.ts +6 -43
  292. package/src/prover/smt/solver/theory-lra-model.ts +4 -19
  293. package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
  294. package/src/prover/smt/solver/theory-lra-state.ts +3 -8
  295. package/src/prover/smt/solver/theory-lra.ts +1 -8
  296. package/src/prover/smt/solver/var-subst.ts +2 -26
  297. package/src/prover/smt/table.ts +0 -8
  298. package/src/prover/tlapm/cache.ts +45 -40
  299. package/src/prover/tlapm/ocaml-marshal.ts +19 -21
  300. package/src/prover/tlapm/tlapm.ts +21 -20
  301. package/src/prover/verdict.ts +7 -2
  302. package/src/prover/zenon/check/check.ts +1 -11
  303. package/src/prover/zenon/check/definitions.ts +5 -15
  304. package/src/prover/zenon/check/equality.ts +0 -8
  305. package/src/prover/zenon/check/functions.ts +0 -4
  306. package/src/prover/zenon/check/keys.ts +0 -7
  307. package/src/prover/zenon/check/propositional.ts +0 -3
  308. package/src/prover/zenon/check/records.ts +1 -6
  309. package/src/prover/zenon/check/relations.ts +2 -14
  310. package/src/prover/zenon/check/rewrites.ts +2 -21
  311. package/src/prover/zenon/check/sets.ts +40 -61
  312. package/src/prover/zenon/check/terms.ts +1 -19
  313. package/src/prover/zenon/check/tla.ts +0 -6
  314. package/src/prover/zenon/decide.ts +0 -12
  315. package/src/prover/zenon/encode.ts +1 -8
  316. package/src/prover/zenon/eqrel.ts +2 -13
  317. package/src/prover/zenon/equality-rules.ts +0 -4
  318. package/src/prover/zenon/expr.ts +8 -26
  319. package/src/prover/zenon/index-table.ts +26 -57
  320. package/src/prover/zenon/isar-case.ts +9 -19
  321. package/src/prover/zenon/isar.ts +36 -64
  322. package/src/prover/zenon/limits.ts +0 -4
  323. package/src/prover/zenon/llproof.ts +2 -20
  324. package/src/prover/zenon/mltoll.ts +66 -104
  325. package/src/prover/zenon/node.ts +1 -11
  326. package/src/prover/zenon/ocaml.ts +1 -17
  327. package/src/prover/zenon/parse.ts +4 -12
  328. package/src/prover/zenon/phrase.ts +1 -11
  329. package/src/prover/zenon/proof.ts +0 -9
  330. package/src/prover/zenon/propositional-rules.ts +0 -5
  331. package/src/prover/zenon/rules.ts +2 -6
  332. package/src/prover/zenon/search.ts +5 -31
  333. package/src/prover/zenon/tla/functions.ts +59 -31
  334. package/src/prover/zenon/tla/llproof.ts +67 -76
  335. package/src/prover/zenon/tla/records.ts +57 -33
  336. package/src/prover/zenon/tla/rewrites.ts +12 -19
  337. package/src/prover/zenon/tla/sets.ts +83 -53
  338. package/src/prover/zenon/tla/terms.ts +0 -6
  339. package/src/prover/zenon/tla/tla.ts +66 -64
  340. package/src/randomization.ts +81 -35
  341. package/src/resolve.ts +67 -184
  342. package/src/runtime.ts +22 -22
  343. package/src/sany/builtins.ts +2 -5
  344. package/src/sany/generation.ts +394 -0
  345. package/src/sany/generator-def-entries.ts +210 -0
  346. package/src/sany/generator-definitions.ts +686 -0
  347. package/src/sany/generator-expressions.ts +1100 -0
  348. package/src/sany/generator-proofs.ts +662 -0
  349. package/src/sany/generator.ts +191 -2764
  350. package/src/sany/levels.ts +6 -34
  351. package/src/sany/lexer.ts +58 -77
  352. package/src/sany/linter.ts +1 -9
  353. package/src/sany/modules.ts +1 -5
  354. package/src/sany/nodes.ts +5 -43
  355. package/src/sany/parse-error.ts +39 -117
  356. package/src/sany/report.ts +32 -69
  357. package/src/sany/selectors.ts +49 -76
  358. package/src/sany/source.ts +1 -17
  359. package/src/sany/xml.ts +35 -117
  360. package/src/search.ts +541 -163
  361. package/src/simulate.ts +709 -0
  362. package/src/spec-description.ts +192 -100
  363. package/src/standard-definitions.ts +0 -4
  364. package/src/standard-modules.ts +264 -95
  365. package/src/state-graph.ts +52 -31
  366. package/src/subexpressions.ts +69 -52
  367. package/src/substitution-levels.ts +7 -7
  368. package/src/successors.ts +266 -99
  369. package/src/symmetry.ts +33 -25
  370. package/src/tableau.ts +27 -24
  371. package/src/tlc/fingerprint.ts +183 -67
  372. package/src/tlc/jar-data.ts +112 -6
  373. package/src/tlc/messages.ts +125 -54
  374. package/src/tlc/order.ts +39 -69
  375. package/src/tlc/random.ts +37 -49
  376. package/src/tlc/replay.ts +553 -228
  377. package/src/tlc/summary.ts +36 -47
  378. package/src/tlc/tlc-operators.ts +78 -44
  379. package/src/tlc/tlcext-operators.ts +139 -122
  380. package/src/tlc/trace-spec.ts +249 -0
  381. package/src/tlc/value-stream.ts +139 -0
  382. package/src/tlc/version.ts +1 -4
  383. package/src/transfer.ts +22 -25
  384. package/src/typescript/actions.ts +479 -0
  385. package/src/typescript/collections.ts +614 -0
  386. package/src/typescript/compile.ts +63 -0
  387. package/src/typescript/context.ts +94 -0
  388. package/src/typescript/emit.ts +121 -0
  389. package/src/typescript/expressions.ts +496 -0
  390. package/src/typescript/formula.ts +154 -0
  391. package/src/typescript/functions.ts +284 -0
  392. package/src/typescript/model.ts +162 -0
  393. package/src/typescript/names.ts +114 -0
  394. package/src/typescript/program.ts +48 -0
  395. package/src/typescript/properties.ts +139 -0
  396. package/src/typescript/scope.ts +112 -0
  397. package/src/typescript/steps.ts +167 -0
  398. package/src/typescript/types.ts +171 -0
  399. package/src/values.ts +832 -484
  400. package/src/worker.ts +7 -8
@@ -1,6 +1,3 @@
1
- // Converts the tla-ts AST into tlapm's parse trees: expressions name operators opaquely until
2
- // anonymization resolves them, and proof steps get tlapm's levels and anonymous step numbers.
3
-
4
1
  import type {
5
2
  AssumeProve,
6
3
  Definition,
@@ -51,36 +48,38 @@ import {
51
48
  type Usable,
52
49
  } from "./proof";
53
50
 
54
- const BUILTINS: Record<string, Builtin> = {
55
- "=>": "Implies",
56
- "<=>": "Equiv",
57
- "/\\": "Conj",
58
- "\\/": "Disj",
59
- "~": "Neg",
60
- "=": "Eq",
61
- "#": "Neq",
62
- SUBSET: "SUBSET",
63
- UNION: "UNION",
64
- DOMAIN: "DOMAIN",
65
- "\\subseteq": "Subseteq",
66
- "\\in": "Mem",
67
- "\\notin": "Notmem",
68
- "\\": "Setminus",
69
- "\\cap": "Cap",
70
- "\\cup": "Cup",
71
- "'": "Prime",
72
- "~>": "Leadsto",
73
- ENABLED: "ENABLED",
74
- UNCHANGED: "UNCHANGED",
75
- "\\cdot": "Cdot",
76
- "-+->": "Actplus",
77
- "[]": "BoxTrue",
78
- "<>": "Diamond",
79
- TRUE: "TRUE",
80
- FALSE: "FALSE",
81
- BOOLEAN: "BOOLEAN",
82
- STRING: "STRING",
83
- };
51
+ const BUILTINS = new Map<string, Builtin>(
52
+ Object.entries({
53
+ "=>": "Implies",
54
+ "<=>": "Equiv",
55
+ "/\\": "Conj",
56
+ "\\/": "Disj",
57
+ "~": "Neg",
58
+ "=": "Eq",
59
+ "#": "Neq",
60
+ SUBSET: "SUBSET",
61
+ UNION: "UNION",
62
+ DOMAIN: "DOMAIN",
63
+ "\\subseteq": "Subseteq",
64
+ "\\in": "Mem",
65
+ "\\notin": "Notmem",
66
+ "\\": "Setminus",
67
+ "\\cap": "Cap",
68
+ "\\cup": "Cup",
69
+ "'": "Prime",
70
+ "~>": "Leadsto",
71
+ ENABLED: "ENABLED",
72
+ UNCHANGED: "UNCHANGED",
73
+ "\\cdot": "Cdot",
74
+ "-+->": "Actplus",
75
+ "[]": "BoxTrue",
76
+ "<>": "Diamond",
77
+ TRUE: "TRUE",
78
+ FALSE: "FALSE",
79
+ BOOLEAN: "BOOLEAN",
80
+ STRING: "STRING",
81
+ }),
82
+ );
84
83
 
85
84
  const getCanonicalName = (name: string) => lookupOperator(name).name;
86
85
 
@@ -108,7 +107,7 @@ const TUPLY_FAILURE = "use instead the class`E_visit.iter_concrete`";
108
107
  const isDitto = (bounds: QuantifierExpression["bounds"], index: number) =>
109
108
  index > 0 && bounds[index - 1].set === bounds[index].set;
110
109
 
111
- export const createSource = (
110
+ export const createModuleConverter = (
112
111
  file: string,
113
112
  text: string,
114
113
  counter: Counter,
@@ -137,14 +136,12 @@ export const createSource = (
137
136
  const getMethod = (range: SourceRange | undefined) =>
138
137
  range && readOldMethod(lines, { line: range.end.line - 1, column: range.end.column });
139
138
 
140
- // A method pragma belongs to the node it follows, whose locus then takes it in.
141
139
  const withMethod = (range: SourceRange) => {
142
140
  const method = getMethod(range);
143
141
  const location = getRangeLocus(range);
144
142
  return method ? { location: withPragma(location), method } : { location };
145
143
  };
146
144
 
147
- // Module.Parser's with_meth, which wraps the expression a method follows.
148
145
  const withExpressionMethod = (expression: Expr, range: SourceRange | undefined): Expr => {
149
146
  const method = getMethod(range);
150
147
  return method ? at({ kind: "With", expression, method }, expression) : expression;
@@ -163,13 +160,12 @@ export const createSource = (
163
160
 
164
161
  const convertOperator = (name: string, location: Locus | undefined): Expr => {
165
162
  const canonical = getCanonicalName(name);
166
- const builtin = BUILTINS[canonical];
163
+ const builtin = BUILTINS.get(canonical);
167
164
  return at(builtin ? { kind: "Internal", builtin } : { kind: "Opaque", name: canonical }, {
168
165
  location,
169
166
  });
170
167
  };
171
168
 
172
- // A name with ! selects through instances, which anonymization resolves by joining the names.
173
169
  const convertName = (
174
170
  name: string,
175
171
  args: Expr[],
@@ -180,7 +176,7 @@ export const createSource = (
180
176
  const operator = at({ kind: "Opaque", name }, { location });
181
177
  return at({ kind: "Bang", expression: operator, selectors: [] }, { location });
182
178
  }
183
- const builtin = BUILTINS[name];
179
+ const builtin = BUILTINS.get(name);
184
180
  if (builtin && args.length === 0) return at({ kind: "Internal", builtin }, { location });
185
181
  const names = name.split("!");
186
182
  if (names.length === 1) {
@@ -251,8 +247,6 @@ export const createSource = (
251
247
  const convertExpression = (expression: Expression, isExcept: boolean): Expr => {
252
248
  const location = getLocus(expression.location);
253
249
  const recurse = (inner: Expression) => convertExpression(inner, isExcept);
254
- // tlapm locates an operator application by its operator and operands, and a parenthesized
255
- // operand by what is inside the parentheses.
256
250
  const getOperatorLocus = (args: Expr[], fixity: Fixity) => {
257
251
  if (args.length === 2) return mergeLoci(args[0].location, args[1].location);
258
252
  if (args.length !== 1 || !args[0].location) return location;
@@ -286,8 +280,6 @@ export const createSource = (
286
280
  return at({ kind: "Num", integer, fraction }, { location });
287
281
  }
288
282
  case "String": {
289
- // tlapm's lexer keeps a string's escapes as written. The location ends at the closing
290
- // quote.
291
283
  const written = /"((?:[^"\\]|\\.)*)"$/.exec(
292
284
  (lines[location.endLine - 1] ?? "").slice(0, location.endColumn - 1),
293
285
  );
@@ -474,8 +466,7 @@ export const createSource = (
474
466
  { location },
475
467
  );
476
468
  case "Tuple":
477
- // tlapm's tuple parser binds as (<< >>> elements) >>= ">>", which keeps only the location
478
- // of the closing >>.
469
+ // tlapm's tuple parser keeps only the location of the closing >>.
479
470
  return at(
480
471
  { kind: "Tuple", elements: expression.elements.map(recurse) },
481
472
  {
@@ -563,22 +554,14 @@ export const createSource = (
563
554
  case "Always":
564
555
  case "Eventually": {
565
556
  const inner = expression.expression;
566
- if (expression.kind === "Always" && inner.kind === "BoxAction") {
567
- return at(
568
- {
569
- kind: "Tsub",
570
- modal: "Box",
571
- action: recurse(inner.action),
572
- subscript: recurse(inner.subscript),
573
- },
574
- { location },
575
- );
576
- }
577
- if (expression.kind === "Eventually" && inner.kind === "AngleAction") {
557
+ if (
558
+ (expression.kind === "Always" && inner.kind === "BoxAction") ||
559
+ (expression.kind === "Eventually" && inner.kind === "AngleAction")
560
+ ) {
578
561
  return at(
579
562
  {
580
563
  kind: "Tsub",
581
- modal: "Dia",
564
+ modal: expression.kind === "Always" ? "Box" : "Dia",
582
565
  action: recurse(inner.action),
583
566
  subscript: recurse(inner.subscript),
584
567
  },
@@ -678,26 +661,21 @@ export const createSource = (
678
661
  location,
679
662
  };
680
663
  }
681
- // A prefix minus is the operator -.
682
664
  const name =
683
665
  definition.kind === "Operator" && definition.params.length === 1 && definition.name === "-"
684
666
  ? "-."
685
667
  : getCanonicalName(definition.name);
686
668
  const body = convertExpression(definition.body, isExcept);
687
- if (definition.kind === "Function" && hasTuple(definition.bounds)) {
688
- return {
689
- kind: "Operator",
690
- name,
691
- body: expandTuples(expandFcn(getTuplyBounds(definition.bounds, isExcept), body), location),
692
- location,
693
- };
694
- }
695
669
  if (definition.kind === "Function") {
696
- const bounds = convertBounds(definition.bounds, isExcept);
697
670
  return {
698
671
  kind: "Operator",
699
672
  name,
700
- body: at({ kind: "Fcn", bounds, body }, { location }),
673
+ body: hasTuple(definition.bounds)
674
+ ? expandTuples(expandFcn(getTuplyBounds(definition.bounds, isExcept), body), location)
675
+ : at(
676
+ { kind: "Fcn", bounds: convertBounds(definition.bounds, isExcept), body },
677
+ { location },
678
+ ),
701
679
  location,
702
680
  };
703
681
  }
@@ -739,7 +717,6 @@ export const createSource = (
739
717
  };
740
718
  };
741
719
 
742
- // Anonymization judges the time of each assumption once it resolves the names in it.
743
720
  const convertSequent = (statement: Expression | AssumeProve): Sequent => {
744
721
  if (statement.kind !== "AssumeProve")
745
722
  return { context: [], active: convertExpression(statement, false) };
@@ -759,7 +736,6 @@ export const createSource = (
759
736
  };
760
737
  };
761
738
 
762
- // A labeled hypothesis is an Xlabel without parameters, not an Nlabel like a labeled expression.
763
739
  const convertFactLabel = (expression: Expression): Expr => {
764
740
  if (expression.kind !== "Label" || expression.params.length > 0)
765
741
  return convertExpression(expression, false);
@@ -804,7 +780,6 @@ export const createSource = (
804
780
  ? { kind: "Named", level, label: token[2], isAnonymous: false }
805
781
  : { kind: "Unnamed", level, id: getUnique(counter) };
806
782
 
807
- // to_proof: a missing proof is implicitly omitted where the enclosing step is.
808
783
  const convertProof = (
809
784
  proof: ProofStep["proof"],
810
785
  level: number,
@@ -830,12 +805,9 @@ export const createSource = (
830
805
  method: getMethod(proof.location.range),
831
806
  };
832
807
  case "Steps": {
833
- // A <*> first step takes the enclosing level only after PROOF, and the top level
834
- // always counts as PROOF.
835
808
  const tokens = proof.steps.map((step) => STEP_PATTERN.exec(step.token));
836
809
  const first = tokens[0];
837
810
  const stepLevel = first && first[1] !== "*" && first[1] !== "+" ? Number(first[1]) : level;
838
- // The parser ends the steps at the first QED.
839
811
  const steps = proof.steps
840
812
  .slice(0, -1)
841
813
  .map((step, index) =>
@@ -855,8 +827,6 @@ export const createSource = (
855
827
  }
856
828
  };
857
829
 
858
- // tlapm locates a USE or HIDE by its keywords and DEF clause, since its parser drops the
859
- // facts' location.
860
830
  const getUseLocus = (use: UseOrHide) =>
861
831
  mergeLoci(
862
832
  getRangeLocus(use.keyword),
@@ -1038,5 +1008,5 @@ export const createSource = (
1038
1008
  }),
1039
1009
  });
1040
1010
 
1041
- return { convertModule };
1011
+ return convertModule;
1042
1012
  };
@@ -1,5 +1,4 @@
1
- // A port of tlapm's Expr.Deref: a subexpression reference such as Op!2!<< resolves to the
2
- // subexpression it names, abstracted over the bound names it uses.
1
+ // A port of tlapm's Expr.Deref.
3
2
 
4
3
  import { TlaProofError, TlapmBugError } from "../errors";
5
4
  import { consAll, consSubstitution, shift, substituteExpr } from "./substitution";
@@ -48,7 +47,6 @@ const stripParensAndAtomic = (expression: Expr): Expr => {
48
47
  return rest;
49
48
  };
50
49
 
51
- // Parentheses go everywhere but in the definitions of a LET.
52
50
  const stripParens = (expression: Expr): Expr => {
53
51
  if (expression.kind === "Let") {
54
52
  return at(
@@ -63,8 +61,6 @@ const stripParens = (expression: Expr): Expr => {
63
61
  const hasNegativeIndex = (expression: Expr): boolean =>
64
62
  expression.kind === "Ix" ? expression.index <= 0 : getChildren(expression).some(hasNegativeIndex);
65
63
 
66
- // Visit.iter's context for each binder, stopping at labels with other names and at declarations
67
- // in an ASSUME.
68
64
  const findLabel = (expression: Expr, label: string, context: Hyp[]): LabelMatch | undefined => {
69
65
  const search = (inner: Expr, innerContext = context) => findLabel(inner, label, innerContext);
70
66
  const searchBounds = (bounds: Bound[], body: Expr) =>
@@ -133,7 +129,6 @@ const findLabel = (expression: Expr, label: string, context: Hyp[]): LabelMatch
133
129
  }
134
130
  };
135
131
 
136
- // The first count indices in reverse, and the rest past the parameters.
137
132
  const getReversal = (count: number, paramCount: number) =>
138
133
  consAll(
139
134
  Array.from({ length: count }, (_item, index): Expr => ({ kind: "Ix", index: index + 1 })),
@@ -354,7 +349,6 @@ const getNumbered = (
354
349
  return [expression.kind === "Let" ? expression.definitions : [], result];
355
350
  };
356
351
 
357
- // Reorders label arguments given in source order to the order of the label's de Bruijn indices.
358
352
  const permute = (indices: number[], args: Expr[]) => {
359
353
  const count = indices.length;
360
354
  let current = indices;
@@ -513,7 +507,7 @@ const resolveSelectors = (
513
507
  const expression = isLabel ? state.expression : stripParens(state.expression);
514
508
  const count = state.definitions.length;
515
509
  const next = ((): Resolution & { rest: Selector[]; isLabel: boolean } => {
516
- const numbered = (position: number, message: string) => {
510
+ const resolveNumbered = (position: number, message: string) => {
517
511
  const [definitions, inner] = getNumbered(
518
512
  onWarning,
519
513
  expression,
@@ -536,11 +530,11 @@ const resolveSelectors = (
536
530
  });
537
531
  }
538
532
  case "Number":
539
- return numbered(selector.value, `Cannot resolve !${selector.value}`);
533
+ return resolveNumbered(selector.value, `Cannot resolve !${selector.value}`);
540
534
  case "Left":
541
- return numbered(1, "Cannot resolve !<<");
535
+ return resolveNumbered(1, "Cannot resolve !<<");
542
536
  case "Right":
543
- return numbered(2, "Cannot resolve !>>");
537
+ return resolveNumbered(2, "Cannot resolve !>>");
544
538
  case "Instance":
545
539
  return {
546
540
  params: [],
@@ -1,4 +1,4 @@
1
- // tlapm's E_subst: substitutions for de Bruijn indices, applied to every part of an expression.
1
+ // A port of tlapm's E_subst.
2
2
 
3
3
  import { TlaProofError } from "../errors";
4
4
  import {
@@ -31,7 +31,6 @@ export const consSubstitution = (expression: Expr, rest: Substitution): Substitu
31
31
  rest,
32
32
  });
33
33
 
34
- // Binds the expressions in order, so the last one becomes index 1.
35
34
  export const consAll = (expressions: Expr[], rest: Substitution) =>
36
35
  expressions.reduce((inner, expression) => consSubstitution(expression, inner), rest);
37
36
 
@@ -63,7 +62,6 @@ const applyIndex = (substitution: Substitution, index: number, from: Expr): Expr
63
62
  export const substituteExprs = (substitution: Substitution, expressions: Expr[]) =>
64
63
  expressions.map((expression) => substituteExpr(substitution, expression));
65
64
 
66
- // Beta-reduces a lambda applied to arguments, as E_subst.normalize does.
67
65
  export const normalizeApply = (operator: Expr, args: Expr[]): ExprCore => {
68
66
  if (operator.kind === "Lambda") {
69
67
  if (operator.params.length !== args.length) throw new TlaProofError("Arity mismatch");
@@ -1,5 +1,4 @@
1
- // tlapm's expansions of temporal operators (Expr.Tla_norm), constant detection (Expr.Constness), and
2
- // the time of a fact (Expr.Temporal_props): a fact holds always when it is closed under [].
1
+ // A port of tlapm's Expr.Tla_norm, Expr.Constness and Expr.Temporal_props.
3
2
 
4
3
  import {
5
4
  adjoin,
@@ -9,6 +8,8 @@ import {
9
8
  getFresh,
10
9
  getLocalDefn,
11
10
  getScopeAt,
11
+ getTrue,
12
+ isBuiltinApply,
12
13
  mapChildren,
13
14
  type Builtin,
14
15
  type Expr,
@@ -27,17 +28,15 @@ const applyUnchanged = (expression: Expr) => applyBuiltin("UNCHANGED", [expressi
27
28
  const getEquality = (expression: Expr) =>
28
29
  applyBuiltin("Eq", [applyBuiltin("Prime", [expression], expression), expression], expression);
29
30
 
30
- // E_tla_norm.rewrite_unch: UNCHANGED <<x, <<y>>>> as x' = x /\ y' = y.
31
31
  export const rewriteUnchanged = (expression: Expr): Expr => {
32
32
  const flatten = (inner: Expr): Expr[] =>
33
33
  inner.kind === "Tuple" ? inner.elements.flatMap(flatten) : [inner];
34
34
  const items = flatten(expression);
35
- if (items.length === 0) return at({ kind: "Internal", builtin: "TRUE" }, expression);
35
+ if (items.length === 0) return getTrue(expression);
36
36
  if (items.length === 1) return getEquality(items[0]);
37
37
  return at({ kind: "List", bullet: "And", items: items.map(getEquality) }, expression);
38
38
  };
39
39
 
40
- // Each visitor rewrites the outermost match and leaves the rest of the tree as it is.
41
40
  const rewrite =
42
41
  (match: (expression: Expr, recurse: (inner: Expr) => Expr) => Expr | undefined) =>
43
42
  (expression: Expr): Expr => {
@@ -46,7 +45,7 @@ const rewrite =
46
45
  };
47
46
 
48
47
  export const expandLeadsto = rewrite((expression, recurse) =>
49
- expression.kind === "Apply" && isApplied(expression, ["Leadsto"])
48
+ isBuiltinApply(expression, "Leadsto")
50
49
  ? applyBuiltin(
51
50
  "BoxTrue",
52
51
  [
@@ -105,11 +104,8 @@ export const expandAction = rewrite((expression, recurse) => {
105
104
  return applyBuiltin(expression.modal === "Box" ? "BoxTrue" : "Diamond", [step], expression);
106
105
  });
107
106
 
108
- // Only getTime uses this, so the locations rewriteUnchanged gives do not matter.
109
107
  const expandUnchanged = rewrite((expression) =>
110
- expression.kind === "Apply" && isApplied(expression, ["UNCHANGED"])
111
- ? rewriteUnchanged(expression.args[0])
112
- : undefined,
108
+ isBuiltinApply(expression, "UNCHANGED") ? rewriteUnchanged(expression.args[0]) : undefined,
113
109
  );
114
110
 
115
111
  const TEMPORAL_BUILTINS: Builtin[] = [
@@ -127,6 +123,11 @@ const TEMPORAL_BUILTINS: Builtin[] = [
127
123
 
128
124
  const constantBodies = new WeakMap<Expr, boolean>();
129
125
 
126
+ interface ConstnessState {
127
+ scope: Scope | undefined;
128
+ isGood: boolean;
129
+ }
130
+
130
131
  const isConstantHyp = (scope: Scope | undefined, hyp: Hyp) => {
131
132
  switch (hyp.kind) {
132
133
  case "Fresh":
@@ -183,10 +184,7 @@ export const isConstant = (scope: Scope | undefined, expression: Expr): boolean
183
184
  expression.body,
184
185
  );
185
186
  case "Sequent": {
186
- const inner = expression.sequent.context.reduce<{
187
- scope: Scope | undefined;
188
- isGood: boolean;
189
- }>(
187
+ const inner = expression.sequent.context.reduce<ConstnessState>(
190
188
  (state, hyp) => ({
191
189
  scope: adjoin(state.scope, hyp),
192
190
  isGood: state.isGood && isConstantHyp(state.scope, hyp),
@@ -203,7 +201,7 @@ export const isConstant = (scope: Scope | undefined, expression: Expr): boolean
203
201
  case "Apply":
204
202
  return recurse(expression.operator) && expression.args.every(recurse);
205
203
  case "Let": {
206
- const inner = expression.definitions.reduce<{ scope: Scope | undefined; isGood: boolean }>(
204
+ const inner = expression.definitions.reduce<ConstnessState>(
207
205
  (state, definition) => ({
208
206
  scope: adjoin(state.scope, getLocalDefn(definition)),
209
207
  isGood:
@@ -275,8 +273,6 @@ export const isConstant = (scope: Scope | undefined, expression: Expr): boolean
275
273
  }
276
274
  };
277
275
 
278
- // Temporal_props.box_closure: whether the formula is equivalent to [] of itself, judged by its
279
- // shape. Under a negation or on the left of =>, <> takes the place of [].
280
276
  const isClosed = (scope: Scope | undefined, expression: Expr, isBox: boolean): boolean => {
281
277
  if (isConstant(scope, expression)) return true;
282
278
  if (expression.kind === "Internal")
@@ -313,8 +309,6 @@ export const getTime = (scope: Scope | undefined, expression: Expr): Time =>
313
309
  ? "Always"
314
310
  : "Now";
315
311
 
316
- // Temporal_props.check_time_change: a proof stays in the always scope while no fact it assumes
317
- // holds only now.
318
312
  export const getScopeTime = (context: Hyp[], time: Time): Time =>
319
313
  time === "Always" && context.some((hyp) => hyp.kind === "Fact" && hyp.time === "Now")
320
314
  ? "Now"
@@ -1,4 +1,4 @@
1
- // tlapm's E_tuply_declarations: declarations such as <<x, y>> \in S become declarations of names.
1
+ // A port of tlapm's E_tuply_declarations.
2
2
 
3
3
  import type { Bound, BoundDomain, Defn, Expr } from "./expression";
4
4
 
@@ -25,7 +25,6 @@ export const getUnbounded = (names: string[]): Bound[] =>
25
25
  const getFactors = (domain: Expr | undefined, names: string[]) =>
26
26
  domain?.kind === "Product" && domain.factors.length === names.length ? domain.factors : undefined;
27
27
 
28
- // Each name is the matching item of the tuple: x == t[1], y == t[2].
29
28
  const getItemDefinitions = (tuple: string, names: string[]): Defn[] =>
30
29
  names.map((name, index) => ({
31
30
  kind: "Operator",
@@ -50,8 +49,6 @@ const getNamedBound = (bound: Extract<TuplyBound, { kind: "Name" }>): Bound => (
50
49
  domain: bound.domain,
51
50
  });
52
51
 
53
- // \E <<x, y>> \in A \X B: P becomes \E x \in A, y \in B: P, and \E <<x, y>> \in S: P becomes
54
- // \E x, y: <<x, y>> \in S /\ P. Each domain quantifies separately, the last one innermost.
55
52
  export const expandQuant = (
56
53
  quantifier: "Forall" | "Exists",
57
54
  bounds: TuplyBound[],
@@ -91,8 +88,6 @@ export const expandQuant = (
91
88
  }, body);
92
89
  };
93
90
 
94
- // CHOOSE <<x, y>> \in A \X B: P binds t \in A \X B with x == t[1], y == t[2], and any other
95
- // domain binds t with \E x, y: t = <<x, y>> /\ P. {<<x, y>> \in S: P} binds t the same way.
96
91
  export const expandChoose = (
97
92
  binder: { kind: "Choose"; domain: Expr | undefined } | { kind: "SetSt"; domain: Expr },
98
93
  names: string[],
@@ -117,8 +112,6 @@ export const expandChoose = (
117
112
  };
118
113
  };
119
114
 
120
- // A set or function constructor binds each tuple as fcn#x, with its names defined in a LET around
121
- // the value. A set constructor over a matching product binds the names to its factors instead.
122
115
  const expandConstructorBounds = (bounds: TuplyBound[], value: Expr, isSetOf: boolean) => {
123
116
  const expanded = bounds.map((bound): { bounds: Bound[]; definitions: Defn[] } => {
124
117
  if (bound.kind === "Name") return { bounds: [getNamedBound(bound)], definitions: [] };
@@ -153,7 +146,8 @@ const expandConstructorBounds = (bounds: TuplyBound[], value: Expr, isSetOf: boo
153
146
  const definitions = expanded.flatMap((item) => item.definitions);
154
147
  return {
155
148
  bounds: expanded.flatMap((item) => item.bounds),
156
- value: definitions.length === 0 ? value : { kind: "Let" as const, definitions, body: value },
149
+ value:
150
+ definitions.length === 0 ? value : ({ kind: "Let", definitions, body: value } satisfies Expr),
157
151
  };
158
152
  };
159
153