tla-ts 0.0.3 → 0.0.4-dev.1a3acf6

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 (381) hide show
  1. package/README.md +46 -115
  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 +194 -8
  8. package/dist/index.d.ts +194 -8
  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 +1377 -18
  23. package/dist/transfer.js +1377 -18
  24. package/dist/worker.cjs +21 -0
  25. package/dist/worker.js +21 -0
  26. package/package.json +24 -11
  27. package/src/ast.ts +149 -8
  28. package/src/bags.ts +26 -30
  29. package/src/builtins.ts +45 -19
  30. package/src/bundled-modules.ts +3 -3
  31. package/src/check.ts +1182 -900
  32. package/src/cli/options.ts +109 -0
  33. package/src/cli/run.ts +63 -0
  34. package/src/cli/shared.ts +106 -0
  35. package/src/cli/tlapm.ts +374 -0
  36. package/src/cli/tlc.ts +941 -0
  37. package/src/cli/xml-exporter.ts +221 -0
  38. package/src/cli.ts +9 -2
  39. package/src/codegen.ts +112 -51
  40. package/src/config.ts +254 -181
  41. package/src/dependencies.ts +5 -7
  42. package/src/environment.ts +579 -184
  43. package/src/errors.ts +287 -4
  44. package/src/evaluate.ts +1095 -365
  45. package/src/exit-codes.ts +22 -43
  46. package/src/fingerprints.ts +49 -14
  47. package/src/index.ts +11 -0
  48. package/src/instances.ts +73 -60
  49. package/src/java-overrides.ts +183 -66
  50. package/src/json.ts +31 -36
  51. package/src/levels.ts +197 -54
  52. package/src/lexer.ts +127 -30
  53. package/src/liveness-checker.ts +894 -0
  54. package/src/liveness.ts +246 -596
  55. package/src/{obligation-action.ts → obligations/action.ts} +248 -74
  56. package/src/{obligation-anon.ts → obligations/anonymize.ts} +55 -57
  57. package/src/obligations/equality.ts +260 -0
  58. package/src/obligations/expression.ts +618 -0
  59. package/src/{obligation-format.ts → obligations/format.ts} +7 -8
  60. package/src/obligations/generate.ts +457 -0
  61. package/src/{obligations.ts → obligations/index.ts} +46 -32
  62. package/src/{obligation-levels.ts → obligations/levels.ts} +44 -40
  63. package/src/obligations/module.ts +445 -0
  64. package/src/obligations/normalize.ts +554 -0
  65. package/src/obligations/operators.ts +176 -0
  66. package/src/obligations/pragma.ts +195 -0
  67. package/src/{obligation-printer.ts → obligations/printer.ts} +65 -230
  68. package/src/{obligation-proof.ts → obligations/proof.ts} +7 -2
  69. package/src/obligations/regroup.ts +100 -0
  70. package/src/{obligation-generate.ts → obligations/simplify.ts} +130 -536
  71. package/src/{obligation-source.ts → obligations/source.ts} +174 -216
  72. package/src/{obligation-deref.ts → obligations/subexpression.ts} +84 -115
  73. package/src/obligations/substitution.ts +261 -0
  74. package/src/obligations/temporal.ts +321 -0
  75. package/src/{obligation-tuples.ts → obligations/tuples.ts} +38 -54
  76. package/src/parallel-worker.ts +184 -235
  77. package/src/parallel.ts +156 -91
  78. package/src/parser.ts +490 -188
  79. package/src/pcal/ast.ts +755 -0
  80. package/src/pcal/parse.ts +1487 -0
  81. package/src/pcal/tokenize.ts +487 -0
  82. package/src/pcal/translate.ts +1151 -0
  83. package/src/pcal/validate.ts +444 -0
  84. package/src/prover/decide-pool.ts +95 -0
  85. package/src/prover/deciders.ts +33 -0
  86. package/src/prover/first-order.ts +175 -0
  87. package/src/prover/isabelle/LICENSE +36 -0
  88. package/src/prover/isabelle/LICENSE-tlapm +26 -0
  89. package/src/prover/isabelle/decide.ts +44 -0
  90. package/src/prover/isabelle/encode.ts +445 -0
  91. package/src/prover/isabelle/isar/inner-syntax.ts +579 -0
  92. package/src/prover/isabelle/isar/method.ts +367 -0
  93. package/src/prover/isabelle/isar/proof.ts +28 -0
  94. package/src/prover/isabelle/isar/statement.ts +57 -0
  95. package/src/prover/isabelle/isar/theory.ts +192 -0
  96. package/src/prover/isabelle/isar/type-check.ts +278 -0
  97. package/src/prover/isabelle/provers/blast/blast.ts +258 -0
  98. package/src/prover/isabelle/provers/blast/branch.ts +322 -0
  99. package/src/prover/isabelle/provers/blast/prove.ts +347 -0
  100. package/src/prover/isabelle/provers/blast/rules.ts +330 -0
  101. package/src/prover/isabelle/provers/blast/state.ts +180 -0
  102. package/src/prover/isabelle/provers/blast/term.ts +546 -0
  103. package/src/prover/isabelle/provers/clasimp.ts +150 -0
  104. package/src/prover/isabelle/provers/classical.ts +389 -0
  105. package/src/prover/isabelle/provers/hypsubst.ts +433 -0
  106. package/src/prover/isabelle/pure/bicompose.ts +174 -0
  107. package/src/prover/isabelle/pure/consts.ts +32 -0
  108. package/src/prover/isabelle/pure/conv.ts +79 -0
  109. package/src/prover/isabelle/pure/drule.ts +264 -0
  110. package/src/prover/isabelle/pure/envir.ts +331 -0
  111. package/src/prover/isabelle/pure/goal.ts +53 -0
  112. package/src/prover/isabelle/pure/interrupt.ts +16 -0
  113. package/src/prover/isabelle/pure/list.ts +12 -0
  114. package/src/prover/isabelle/pure/logic.ts +330 -0
  115. package/src/prover/isabelle/pure/name.ts +98 -0
  116. package/src/prover/isabelle/pure/net.ts +215 -0
  117. package/src/prover/isabelle/pure/object-logic.ts +41 -0
  118. package/src/prover/isabelle/pure/pattern.ts +631 -0
  119. package/src/prover/isabelle/pure/raw-simplifier.ts +338 -0
  120. package/src/prover/isabelle/pure/rewriter.ts +602 -0
  121. package/src/prover/isabelle/pure/search.ts +68 -0
  122. package/src/prover/isabelle/pure/seq.ts +133 -0
  123. package/src/prover/isabelle/pure/simplifier.ts +106 -0
  124. package/src/prover/isabelle/pure/table.ts +201 -0
  125. package/src/prover/isabelle/pure/tactic.ts +168 -0
  126. package/src/prover/isabelle/pure/tactical.ts +264 -0
  127. package/src/prover/isabelle/pure/term-ord.ts +105 -0
  128. package/src/prover/isabelle/pure/term.ts +688 -0
  129. package/src/prover/isabelle/pure/thm.ts +783 -0
  130. package/src/prover/isabelle/pure/type.ts +121 -0
  131. package/src/prover/isabelle/pure/unify.ts +753 -0
  132. package/src/prover/isabelle/pure/variable.ts +25 -0
  133. package/src/prover/isabelle/tla/classical-setup.ts +101 -0
  134. package/src/prover/isabelle/tla/context.ts +74 -0
  135. package/src/prover/isabelle/tla/logic-data.ts +5 -0
  136. package/src/prover/isabelle/tla/logic.ts +215 -0
  137. package/src/prover/isabelle/tla/simpdata.ts +241 -0
  138. package/src/prover/isabelle/tools/intuitionistic.ts +132 -0
  139. package/src/prover/ocaml.ts +22 -0
  140. package/src/prover/prep/action.ts +508 -0
  141. package/src/prover/prep/enabled-axioms.ts +189 -0
  142. package/src/prover/prep/fingerprint.ts +388 -0
  143. package/src/prover/prep/level-comparison.ts +529 -0
  144. package/src/prover/prep/md5.ts +60 -0
  145. package/src/prover/prep/methods.ts +221 -0
  146. package/src/prover/prep/normalize.ts +309 -0
  147. package/src/prover/prove-worker.ts +22 -0
  148. package/src/prover/prove.ts +492 -0
  149. package/src/prover/ptl/decide.ts +68 -0
  150. package/src/prover/ptl/encode.ts +244 -0
  151. package/src/prover/ptl/sat.ts +151 -0
  152. package/src/prover/ptl/tableau.ts +276 -0
  153. package/src/prover/smt/axioms.ts +209 -0
  154. package/src/prover/smt/context.ts +108 -0
  155. package/src/prover/smt/data.ts +636 -0
  156. package/src/prover/smt/encode.ts +275 -0
  157. package/src/prover/smt/extensionality.ts +65 -0
  158. package/src/prover/smt/flatten.ts +112 -0
  159. package/src/prover/smt/format.ts +154 -0
  160. package/src/prover/smt/instances.ts +181 -0
  161. package/src/prover/smt/rewrite.ts +766 -0
  162. package/src/prover/smt/solver/act-cache.ts +265 -0
  163. package/src/prover/smt/solver/arith-rewriter.ts +962 -0
  164. package/src/prover/smt/solver/array.ts +22 -0
  165. package/src/prover/smt/solver/asserted-formulas.ts +469 -0
  166. package/src/prover/smt/solver/ast-lt.ts +157 -0
  167. package/src/prover/smt/solver/ast-util.ts +91 -0
  168. package/src/prover/smt/solver/ast.ts +1315 -0
  169. package/src/prover/smt/solver/auf-solver.ts +572 -0
  170. package/src/prover/smt/solver/case-split-queue.ts +178 -0
  171. package/src/prover/smt/solver/cg-table.ts +175 -0
  172. package/src/prover/smt/solver/clause.ts +276 -0
  173. package/src/prover/smt/solver/conflict-resolution.ts +343 -0
  174. package/src/prover/smt/solver/context.ts +1292 -0
  175. package/src/prover/smt/solver/ctx-simplify.ts +334 -0
  176. package/src/prover/smt/solver/der.ts +224 -0
  177. package/src/prover/smt/solver/dyn-ack.ts +141 -0
  178. package/src/prover/smt/solver/e-matching.ts +659 -0
  179. package/src/prover/smt/solver/enode.ts +259 -0
  180. package/src/prover/smt/solver/expr-ref.ts +21 -0
  181. package/src/prover/smt/solver/expr-safe-replace.ts +172 -0
  182. package/src/prover/smt/solver/fingerprints.ts +92 -0
  183. package/src/prover/smt/solver/flat-literals.ts +51 -0
  184. package/src/prover/smt/solver/goal.ts +138 -0
  185. package/src/prover/smt/solver/hash.ts +173 -0
  186. package/src/prover/smt/solver/hashtable.ts +166 -0
  187. package/src/prover/smt/solver/internalizer.ts +1381 -0
  188. package/src/prover/smt/solver/lbool.ts +5 -0
  189. package/src/prover/smt/solver/literal.ts +24 -0
  190. package/src/prover/smt/solver/lp/bound-propagator.ts +391 -0
  191. package/src/prover/smt/solver/lp/constraints.ts +78 -0
  192. package/src/prover/smt/solver/lp/containers.ts +296 -0
  193. package/src/prover/smt/solver/lp/core-solver.ts +504 -0
  194. package/src/prover/smt/solver/lp/cross-nested.ts +224 -0
  195. package/src/prover/smt/solver/lp/dep-intervals.ts +642 -0
  196. package/src/prover/smt/solver/lp/dependency.ts +51 -0
  197. package/src/prover/smt/solver/lp/dioph-eq.ts +1181 -0
  198. package/src/prover/smt/solver/lp/explanation.ts +46 -0
  199. package/src/prover/smt/solver/lp/gomory.ts +255 -0
  200. package/src/prover/smt/solver/lp/hnf-cutter.ts +125 -0
  201. package/src/prover/smt/solver/lp/hnf.ts +281 -0
  202. package/src/prover/smt/solver/lp/int-cube.ts +295 -0
  203. package/src/prover/smt/solver/lp/int-solver.ts +514 -0
  204. package/src/prover/smt/solver/lp/lar-solver.ts +816 -0
  205. package/src/prover/smt/solver/lp/lar-term.ts +62 -0
  206. package/src/prover/smt/solver/lp/lp-settings.ts +91 -0
  207. package/src/prover/smt/solver/lp/maximize-term.ts +347 -0
  208. package/src/prover/smt/solver/lp/nex-creator.ts +381 -0
  209. package/src/prover/smt/solver/lp/nex.ts +120 -0
  210. package/src/prover/smt/solver/lp/nla-backoff.ts +43 -0
  211. package/src/prover/smt/solver/lp/nla-basics.ts +398 -0
  212. package/src/prover/smt/solver/lp/nla-core.ts +968 -0
  213. package/src/prover/smt/solver/lp/nla-divisions.ts +332 -0
  214. package/src/prover/smt/solver/lp/nla-emonics.ts +373 -0
  215. package/src/prover/smt/solver/lp/nla-factorization.ts +30 -0
  216. package/src/prover/smt/solver/lp/nla-grobner.ts +904 -0
  217. package/src/prover/smt/solver/lp/nla-horner.ts +126 -0
  218. package/src/prover/smt/solver/lp/nla-intervals.ts +265 -0
  219. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +715 -0
  220. package/src/prover/smt/solver/lp/nla-monotone.ts +59 -0
  221. package/src/prover/smt/solver/lp/nla-order.ts +307 -0
  222. package/src/prover/smt/solver/lp/nla-patcher.ts +112 -0
  223. package/src/prover/smt/solver/lp/nla-tangents.ts +251 -0
  224. package/src/prover/smt/solver/lp/nla-throttle.ts +85 -0
  225. package/src/prover/smt/solver/lp/nla-types.ts +124 -0
  226. package/src/prover/smt/solver/lp/nla-var-eqs.ts +141 -0
  227. package/src/prover/smt/solver/lp/nra-solver.ts +440 -0
  228. package/src/prover/smt/solver/lp/numeric-pair.ts +65 -0
  229. package/src/prover/smt/solver/lp/pdd-interval.ts +31 -0
  230. package/src/prover/smt/solver/lp/pdd-simplifier.ts +184 -0
  231. package/src/prover/smt/solver/lp/pdd-solver.ts +408 -0
  232. package/src/prover/smt/solver/lp/pdd.ts +971 -0
  233. package/src/prover/smt/solver/lp/random-updater.ts +138 -0
  234. package/src/prover/smt/solver/lp/static-matrix.ts +246 -0
  235. package/src/prover/smt/solver/lp/union-find.ts +96 -0
  236. package/src/prover/smt/solver/mam-compiler.ts +847 -0
  237. package/src/prover/smt/solver/mam-interpreter.ts +400 -0
  238. package/src/prover/smt/solver/maximize-ac-sharing.ts +118 -0
  239. package/src/prover/smt/solver/model-checker.ts +347 -0
  240. package/src/prover/smt/solver/model-evaluator.ts +262 -0
  241. package/src/prover/smt/solver/model-finder.ts +155 -0
  242. package/src/prover/smt/solver/model-generator.ts +97 -0
  243. package/src/prover/smt/solver/model-macro-solver.ts +728 -0
  244. package/src/prover/smt/solver/nlsat/algebraic.ts +1161 -0
  245. package/src/prover/smt/solver/nlsat/atoms.ts +238 -0
  246. package/src/prover/smt/solver/nlsat/evaluator.ts +303 -0
  247. package/src/prover/smt/solver/nlsat/explain.ts +607 -0
  248. package/src/prover/smt/solver/nlsat/interval-set.ts +351 -0
  249. package/src/prover/smt/solver/nlsat/levelwise.ts +737 -0
  250. package/src/prover/smt/solver/nlsat/mpbq.ts +161 -0
  251. package/src/prover/smt/solver/nlsat/polynomial.ts +1722 -0
  252. package/src/prover/smt/solver/nlsat/solver.ts +911 -0
  253. package/src/prover/smt/solver/nlsat/types.ts +43 -0
  254. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +648 -0
  255. package/src/prover/smt/solver/nlsat/upolynomial.ts +996 -0
  256. package/src/prover/smt/solver/nnf.ts +469 -0
  257. package/src/prover/smt/solver/pattern-inference.ts +351 -0
  258. package/src/prover/smt/solver/poly-rewriter.ts +477 -0
  259. package/src/prover/smt/solver/propagate-values.ts +83 -0
  260. package/src/prover/smt/solver/proto-model.ts +551 -0
  261. package/src/prover/smt/solver/pull-quant.ts +139 -0
  262. package/src/prover/smt/solver/qe-lite-der.ts +526 -0
  263. package/src/prover/smt/solver/qe-lite-fm.ts +576 -0
  264. package/src/prover/smt/solver/qe-lite.ts +381 -0
  265. package/src/prover/smt/solver/qi-queue.ts +362 -0
  266. package/src/prover/smt/solver/quant-tactics.ts +117 -0
  267. package/src/prover/smt/solver/quantifier-analyzer.ts +562 -0
  268. package/src/prover/smt/solver/quantifier-manager.ts +186 -0
  269. package/src/prover/smt/solver/random-gen.ts +10 -0
  270. package/src/prover/smt/solver/rational.ts +165 -0
  271. package/src/prover/smt/solver/ref-vector.ts +62 -0
  272. package/src/prover/smt/solver/relevancy.ts +247 -0
  273. package/src/prover/smt/solver/rewriter-tpl.ts +1159 -0
  274. package/src/prover/smt/solver/rewriter.ts +843 -0
  275. package/src/prover/smt/solver/rlimit.ts +79 -0
  276. package/src/prover/smt/solver/smtlib-parser.ts +526 -0
  277. package/src/prover/smt/solver/solver.ts +71 -0
  278. package/src/prover/smt/solver/sort.ts +35 -0
  279. package/src/prover/smt/solver/sticky-generations.ts +69 -0
  280. package/src/prover/smt/solver/theory-lra-axioms.ts +340 -0
  281. package/src/prover/smt/solver/theory-lra-bounds.ts +226 -0
  282. package/src/prover/smt/solver/theory-lra-final-check.ts +252 -0
  283. package/src/prover/smt/solver/theory-lra-internalize.ts +476 -0
  284. package/src/prover/smt/solver/theory-lra-model.ts +243 -0
  285. package/src/prover/smt/solver/theory-lra-propagate.ts +405 -0
  286. package/src/prover/smt/solver/theory-lra-state.ts +43 -0
  287. package/src/prover/smt/solver/theory-lra.ts +56 -0
  288. package/src/prover/smt/solver/var-subst.ts +258 -0
  289. package/src/prover/smt/solver/z3-license.txt +10 -0
  290. package/src/prover/smt/table.ts +170 -0
  291. package/src/prover/tlapm/cache.ts +236 -0
  292. package/src/prover/tlapm/ocaml-marshal.ts +166 -0
  293. package/src/prover/tlapm/tlapm.ts +96 -0
  294. package/src/prover/tlaps-module.ts +510 -0
  295. package/src/prover/verdict.ts +13 -0
  296. package/src/prover/zenon/LICENSE +32 -0
  297. package/src/prover/zenon/check/check.ts +105 -0
  298. package/src/prover/zenon/check/definitions.ts +144 -0
  299. package/src/prover/zenon/check/equality.ts +182 -0
  300. package/src/prover/zenon/check/functions.ts +62 -0
  301. package/src/prover/zenon/check/keys.ts +125 -0
  302. package/src/prover/zenon/check/propositional.ts +104 -0
  303. package/src/prover/zenon/check/records.ts +188 -0
  304. package/src/prover/zenon/check/relations.ts +121 -0
  305. package/src/prover/zenon/check/rewrites.ts +224 -0
  306. package/src/prover/zenon/check/sets.ts +302 -0
  307. package/src/prover/zenon/check/terms.ts +127 -0
  308. package/src/prover/zenon/check/tla.ts +126 -0
  309. package/src/prover/zenon/decide.ts +107 -0
  310. package/src/prover/zenon/encode.ts +378 -0
  311. package/src/prover/zenon/eqrel.ts +300 -0
  312. package/src/prover/zenon/equality-rules.ts +435 -0
  313. package/src/prover/zenon/expr.ts +551 -0
  314. package/src/prover/zenon/index-table.ts +350 -0
  315. package/src/prover/zenon/isar-case.ts +513 -0
  316. package/src/prover/zenon/isar.ts +1249 -0
  317. package/src/prover/zenon/limits.ts +15 -0
  318. package/src/prover/zenon/llproof.ts +173 -0
  319. package/src/prover/zenon/mltoll.ts +1566 -0
  320. package/src/prover/zenon/node.ts +297 -0
  321. package/src/prover/zenon/ocaml.ts +169 -0
  322. package/src/prover/zenon/parse.ts +247 -0
  323. package/src/prover/zenon/phrase.ts +191 -0
  324. package/src/prover/zenon/proof.ts +198 -0
  325. package/src/prover/zenon/propositional-rules.ts +387 -0
  326. package/src/prover/zenon/rules.ts +94 -0
  327. package/src/prover/zenon/search.ts +288 -0
  328. package/src/prover/zenon/tla/functions.ts +151 -0
  329. package/src/prover/zenon/tla/llproof.ts +480 -0
  330. package/src/prover/zenon/tla/records.ts +225 -0
  331. package/src/prover/zenon/tla/rewrites.ts +447 -0
  332. package/src/prover/zenon/tla/sets.ts +304 -0
  333. package/src/prover/zenon/tla/terms.ts +162 -0
  334. package/src/prover/zenon/tla/tla.ts +506 -0
  335. package/src/randomization.ts +39 -27
  336. package/src/resolve.ts +1474 -426
  337. package/src/runtime.ts +25 -7
  338. package/src/sany/builtins.ts +147 -0
  339. package/src/sany/generator.ts +3111 -0
  340. package/src/sany/levels.ts +1205 -0
  341. package/src/sany/lexer.ts +544 -0
  342. package/src/sany/linter.ts +122 -0
  343. package/src/sany/modules.ts +1398 -0
  344. package/src/sany/nodes.ts +463 -0
  345. package/src/sany/parse-error.ts +2161 -0
  346. package/src/sany/report.ts +355 -0
  347. package/src/sany/selectors.ts +736 -0
  348. package/src/sany/source.ts +247 -0
  349. package/src/sany/xml.ts +1016 -0
  350. package/src/search.ts +969 -0
  351. package/src/spec-description.ts +66 -29
  352. package/src/{standard-levels.ts → standard-definitions.ts} +118 -2
  353. package/src/standard-modules.ts +215 -164
  354. package/src/state-graph.ts +181 -0
  355. package/src/subexpressions.ts +231 -171
  356. package/src/substitution-levels.ts +40 -19
  357. package/src/successors.ts +253 -125
  358. package/src/symmetry.ts +194 -54
  359. package/src/tableau.ts +60 -32
  360. package/src/tlc/fingerprint.ts +214 -0
  361. package/src/{tlc-modules.ts → tlc/jar-data.ts} +4 -0
  362. package/src/tlc/messages.ts +441 -0
  363. package/src/{tlc-order.ts → tlc/order.ts} +84 -16
  364. package/src/{tlc-random.ts → tlc/random.ts} +30 -189
  365. package/src/tlc/replay.ts +659 -0
  366. package/src/{tlc-summary.ts → tlc/summary.ts} +20 -5
  367. package/src/{tlc-module.ts → tlc/tlc-operators.ts} +59 -50
  368. package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +63 -45
  369. package/src/tlc/version.ts +19 -0
  370. package/src/transfer.ts +44 -32
  371. package/src/values.ts +843 -241
  372. package/src/worker.ts +62 -0
  373. package/dist/parallel.cjs +0 -12
  374. package/dist/parallel.js +0 -12
  375. package/dist/run-cli.cjs +0 -28
  376. package/dist/run-cli.js +0 -28
  377. package/src/canonical.ts +0 -39
  378. package/src/cli-options.ts +0 -58
  379. package/src/obligation-expression.ts +0 -1060
  380. package/src/obligation-module.ts +0 -1042
  381. package/src/run-cli.ts +0 -478
@@ -14,10 +14,11 @@ import type {
14
14
  SourceLocation,
15
15
  SourceRange,
16
16
  UseOrHide,
17
- } from "./ast";
18
- import { TlaProofError, TlaUnsupportedError } from "./errors";
17
+ } from "../ast";
18
+ import { TlaProofError, TlaUnsupportedError } from "../errors";
19
19
  import {
20
20
  at,
21
+ getFact,
21
22
  type Bound,
22
23
  type Builtin,
23
24
  type Defn,
@@ -27,18 +28,19 @@ import {
27
28
  type Locus,
28
29
  type Selector,
29
30
  type Sequent,
30
- } from "./obligation-expression";
31
- import type { ModuleUnit, Mule } from "./obligation-module";
31
+ } from "./expression";
32
+ import type { ModuleUnit, Mule } from "./module";
33
+ import { findPragma, readNewMethod, readOldMethod } from "./pragma";
32
34
  import {
33
35
  expandChoose,
34
36
  expandFcn,
35
37
  expandQuant,
36
38
  expandSetOf,
37
- expandSetSt,
38
39
  getUnbounded,
39
40
  type TuplyBound,
40
- } from "./obligation-tuples";
41
- import { lookupOperator, type Fixity, type Operator } from "./obligation-printer";
41
+ } from "./tuples";
42
+ import { lookupOperator, type Fixity } from "./operators";
43
+ import { regroup } from "./regroup";
42
44
  import {
43
45
  getUnique,
44
46
  type Counter,
@@ -47,7 +49,7 @@ import {
47
49
  type StepNumber,
48
50
  type UseDef,
49
51
  type Usable,
50
- } from "./obligation-proof";
52
+ } from "./proof";
51
53
 
52
54
  const BUILTINS: Record<string, Builtin> = {
53
55
  "=>": "Implies",
@@ -80,9 +82,7 @@ const BUILTINS: Record<string, Builtin> = {
80
82
  STRING: "STRING",
81
83
  };
82
84
 
83
- // Optable maps each spelling to its canonical name, and a prefix minus is the operator -.
84
- const getCanonicalName = (name: string, isPrefix = false) =>
85
- isPrefix && name === "-" ? "-." : lookupOperator(name).name;
85
+ const getCanonicalName = (name: string) => lookupOperator(name).name;
86
86
 
87
87
  const STEP_PATTERN = /^<(\d+|\*|\+)>([A-Za-z0-9_]*)\.*$/;
88
88
 
@@ -103,106 +103,17 @@ const mergeLoci = (left: Locus | undefined, right: Locus | undefined): Locus | u
103
103
  };
104
104
  };
105
105
 
106
- type Grouping =
107
- | { kind: "Attached"; expression: Expression }
108
- | { kind: "Reduced"; isFinal: boolean };
109
-
110
- const PREFIX_KEYWORDS: Partial<Record<Expression["kind"], string>> = {
111
- Always: "[]",
112
- Eventually: "<>",
113
- Enabled: "ENABLED",
114
- Unchanged: "UNCHANGED",
115
- };
116
-
117
- const isSamePosition = (left: SourceLocation | undefined, right: SourceLocation | undefined) =>
118
- left !== undefined &&
119
- right !== undefined &&
120
- left.line === right.line &&
121
- left.column === right.column;
122
-
123
- const getStart = (expression: Expression) => expression.location.range?.start;
124
-
125
- const getEnd = (expression: Expression) => expression.location.range?.end;
126
-
127
- const withEnd = (expression: Expression, end: SourceLocation | undefined): Expression => {
128
- const range = expression.location.range;
129
- return range && end
130
- ? { ...expression, location: { ...expression.location, range: { ...range, end } } }
131
- : expression;
132
- };
133
-
134
- // The operator an expression leaves open on tlapm's parse stack, with the operand after it.
135
- const getOpenOperator = (expression: Expression) => {
136
- if (expression.kind === "Apply") {
137
- const operator = lookupOperator(expression.operator);
138
- const isInfix = expression.args.length === 2 && operator.fixity.startsWith("Infix");
139
- const isPrefix = expression.args.length === 1 && operator.fixity === "Prefix";
140
- if (!isInfix && !isPrefix) return undefined;
141
- const last = expression.args.length - 1;
142
- return {
143
- operator,
144
- isInfix,
145
- operand: expression.args[last],
146
- replace: (operand: Expression): Expression => ({
147
- ...expression,
148
- args: [...expression.args.slice(0, last), operand],
149
- }),
150
- };
151
- }
152
- const keyword = PREFIX_KEYWORDS[expression.kind];
153
- if (keyword === undefined || !("expression" in expression)) return undefined;
154
- return {
155
- operator: lookupOperator(keyword),
156
- isInfix: false,
157
- operand: expression.expression,
158
- replace: (operand: Expression): Expression => ({ ...expression, expression: operand }),
159
- };
160
- };
161
-
162
- const isBelow = (left: Operator, right: Operator) => left.high < right.low;
163
-
164
- // Pco.resolve: tlapm's parser lets an operator take in every later infix operator that is not
165
- // entirely below it, so SUBSET S \ T is SUBSET (S \ T) to tlapm though SANY reads (SUBSET S) \ T.
166
- // This regroups an infix application the way tlapm does.
167
- const regroup = (expression: Extract<Expression, { kind: "Apply" }>): Expression => {
168
- const operator = lookupOperator(expression.operator);
169
- const [left, right] = expression.args;
170
- const end = getEnd(expression);
171
- const getInfix = (operand: Expression): Expression => {
172
- const range = expression.location.range;
173
- const start = getStart(operand);
174
- return {
175
- ...expression,
176
- args: [operand, right],
177
- location:
178
- range && start
179
- ? { ...expression.location, range: { ...range, start } }
180
- : expression.location,
181
- };
182
- };
183
- const attach = (node: Expression, isOpen: boolean): Grouping => {
184
- const open = isOpen ? getOpenOperator(node) : undefined;
185
- if (!open) return { kind: "Reduced", isFinal: false };
186
- const inner = attach(open.operand, isSamePosition(getEnd(open.operand), getEnd(node)));
187
- if (inner.kind === "Attached")
188
- return { kind: "Attached", expression: withEnd(open.replace(inner.expression), end) };
189
- const isReduced =
190
- !inner.isFinal &&
191
- (isBelow(operator, open.operator) ||
192
- (open.isInfix &&
193
- operator.fixity === "InfixLeft" &&
194
- open.operator.fixity === "InfixLeft" &&
195
- !isBelow(open.operator, operator)));
196
- if (isReduced) return { kind: "Reduced", isFinal: !isBelow(operator, open.operator) };
197
- return { kind: "Attached", expression: withEnd(open.replace(getInfix(open.operand)), end) };
198
- };
199
- const grouping = attach(left, isSamePosition(getStart(left), getStart(expression)));
200
- return grouping.kind === "Attached" ? grouping.expression : expression;
201
- };
202
-
203
106
  const TUPLY_FAILURE = "use instead the class`E_visit.iter_concrete`";
204
107
 
205
- export const createSource = (file: string, text: string, counter: Counter, isExpanded: boolean) => {
108
+ const isDitto = (bounds: QuantifierExpression["bounds"], index: number) =>
109
+ index > 0 && bounds[index - 1].set === bounds[index].set;
110
+
111
+ export const createSource = (
112
+ file: string,
113
+ text: string,
114
+ counter: Counter,
115
+ isExpandingTuples: boolean,
116
+ ) => {
206
117
  const lines = text.split("\n");
207
118
 
208
119
  const getRangeLocus = (range: SourceRange): Locus => ({
@@ -214,43 +125,43 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
214
125
  });
215
126
 
216
127
  const withPragma = (locus: Locus) => {
217
- const position = { line: locus.endLine - 1, column: locus.endColumn - 1 };
218
- const isBlank = (character: string | undefined) => character === " " || character === "\r";
219
- while (position.line < lines.length) {
220
- const line = lines[position.line];
221
- while (isBlank(line[position.column])) position.column++;
222
- if (position.column < line.length) break;
223
- position.line++;
224
- position.column = 0;
225
- }
226
- if (!(lines[position.line] ?? "").startsWith("(*{", position.column)) return locus;
227
- for (let index = position.line; index < lines.length; index++) {
228
- const close = lines[index].indexOf("}*)", index === position.line ? position.column : 0);
128
+ const open = findPragma(lines, { line: locus.endLine - 1, column: locus.endColumn - 1 });
129
+ if (!open) return locus;
130
+ for (let index = open.line; index < lines.length; index++) {
131
+ const close = lines[index].indexOf("}*)", index === open.line ? open.column : 0);
229
132
  if (close !== -1) return { ...locus, endLine: index + 1, endColumn: close + 4 };
230
133
  }
231
134
  return locus;
232
135
  };
233
136
 
234
- const getNameLocus = (name: string, location: SourceLocation): Locus => ({
137
+ const getMethod = (range: SourceRange | undefined) =>
138
+ range && readOldMethod(lines, { line: range.end.line - 1, column: range.end.column });
139
+
140
+ // A method pragma belongs to the node it follows, whose locus then takes it in.
141
+ const withMethod = (range: SourceRange) => {
142
+ const method = getMethod(range);
143
+ const location = getRangeLocus(range);
144
+ return method ? { location: withPragma(location), method } : { location };
145
+ };
146
+
147
+ // Module.Parser's with_meth, which wraps the expression a method follows.
148
+ const withExpressionMethod = (expression: Expr, range: SourceRange | undefined): Expr => {
149
+ const method = getMethod(range);
150
+ return method ? at({ kind: "With", expression, method }, expression) : expression;
151
+ };
152
+
153
+ const getPointLocus = (location: SourceLocation, length: number): Locus => ({
235
154
  file,
236
155
  startLine: location.line,
237
156
  startColumn: location.column,
238
157
  endLine: location.line,
239
- endColumn: location.column + name.length,
158
+ endColumn: location.column + length,
240
159
  });
241
160
 
242
161
  const getLocus = (location: SourceLocation): Locus =>
243
- location.range
244
- ? getRangeLocus(location.range)
245
- : {
246
- file,
247
- startLine: location.line,
248
- startColumn: location.column,
249
- endLine: location.line,
250
- endColumn: location.column + 1,
251
- };
162
+ location.range ? getRangeLocus(location.range) : getPointLocus(location, 1);
252
163
 
253
- const getOperator = (name: string, location: Locus | undefined): Expr => {
164
+ const convertOperator = (name: string, location: Locus | undefined): Expr => {
254
165
  const canonical = getCanonicalName(name);
255
166
  const builtin = BUILTINS[canonical];
256
167
  return at(builtin ? { kind: "Internal", builtin } : { kind: "Opaque", name: canonical }, {
@@ -259,7 +170,7 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
259
170
  };
260
171
 
261
172
  // A name with ! selects through instances, which anonymization resolves by joining the names.
262
- const getName = (
173
+ const convertName = (
263
174
  name: string,
264
175
  args: Expr[],
265
176
  location: Locus,
@@ -304,11 +215,10 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
304
215
  bounds.map((bound, index) => {
305
216
  if (bound.pattern.kind === "Tuple")
306
217
  throw new TlaProofError("Unexpected tuple declaration", { failure: TUPLY_FAILURE });
307
- const isDitto = index > 0 && bounds[index - 1].set === bound.set;
308
218
  return {
309
219
  name: bound.pattern.name,
310
220
  level: "Constant",
311
- domain: isDitto
221
+ domain: isDitto(bounds, index)
312
222
  ? { kind: "Ditto" }
313
223
  : { kind: "Domain", expression: convertExpression(bound.set, isExcept) },
314
224
  };
@@ -322,18 +232,17 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
322
232
  const domain = convertExpression(bound.set, isExcept);
323
233
  if (bound.pattern.kind === "Tuple")
324
234
  return { kind: "Tuple", names: bound.pattern.names, domain };
325
- const isDitto = index > 0 && bounds[index - 1].set === bound.set;
326
235
  return {
327
236
  kind: "Name",
328
237
  name: bound.pattern.name,
329
- domain: isDitto ? { kind: "Ditto" } : { kind: "Domain", expression: domain },
238
+ domain: isDitto(bounds, index) ? { kind: "Ditto" } : { kind: "Domain", expression: domain },
330
239
  };
331
240
  });
332
241
 
333
- const expandTuples = (expand: () => Expr, location: Locus) => {
334
- if (!isExpanded)
242
+ const expandTuples = (expanded: Expr, location: Locus) => {
243
+ if (!isExpandingTuples)
335
244
  throw new TlaProofError("Unexpected tuple declaration", { failure: TUPLY_FAILURE });
336
- return at(expand(), { location });
245
+ return at(expanded, { location });
337
246
  };
338
247
 
339
248
  const hasTuple = (bounds: QuantifierExpression["bounds"]) =>
@@ -376,10 +285,16 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
376
285
  const [integer, fraction] = expression.text.split(".");
377
286
  return at({ kind: "Num", integer, fraction }, { location });
378
287
  }
379
- case "String":
380
- return at({ kind: "String", value: expression.value }, { location });
288
+ case "String": {
289
+ // tlapm's lexer keeps a string's escapes as written. The location ends at the closing
290
+ // quote.
291
+ const written = /"((?:[^"\\]|\\.)*)"$/.exec(
292
+ (lines[location.endLine - 1] ?? "").slice(0, location.endColumn - 1),
293
+ );
294
+ return at({ kind: "String", value: written?.[1] ?? expression.value }, { location });
295
+ }
381
296
  case "Identifier":
382
- return getName(expression.name, [], location);
297
+ return convertName(expression.name, [], location);
383
298
  case "Apply": {
384
299
  if (expression.args.length === 2) {
385
300
  const regrouped = regroup(expression);
@@ -389,14 +304,14 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
389
304
  const operator = lookupOperator(expression.operator);
390
305
  if (operator.fixity !== "Nonfix") {
391
306
  return at(
392
- { kind: "Apply", operator: getOperator(expression.operator, undefined), args },
307
+ { kind: "Apply", operator: convertOperator(expression.operator, undefined), args },
393
308
  { location: getOperatorLocus(args, operator.fixity) },
394
309
  );
395
310
  }
396
- return getName(expression.operator, args, location, expression.argumentCounts);
311
+ return convertName(expression.operator, args, location, expression.argumentCounts);
397
312
  }
398
313
  case "OperatorReference":
399
- return getOperator(expression.operator, location);
314
+ return convertOperator(expression.operator, location);
400
315
  case "Lambda":
401
316
  return at(
402
317
  {
@@ -470,9 +385,14 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
470
385
  case "Forall":
471
386
  case "Exists":
472
387
  if (hasTuple(expression.bounds)) {
473
- const bounds = getTuplyBounds(expression.bounds, isExcept);
474
- const body = recurse(expression.body);
475
- return expandTuples(() => expandQuant(expression.kind, bounds, body), location);
388
+ return expandTuples(
389
+ expandQuant(
390
+ expression.kind,
391
+ getTuplyBounds(expression.bounds, isExcept),
392
+ recurse(expression.body),
393
+ ),
394
+ location,
395
+ );
476
396
  }
477
397
  return at(
478
398
  {
@@ -495,10 +415,14 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
495
415
  }
496
416
  case "Choose":
497
417
  if (expression.pattern.kind === "Tuple") {
498
- const names = expression.pattern.names;
499
- const domain = expression.set && recurse(expression.set);
500
- const body = recurse(expression.body);
501
- return expandTuples(() => expandChoose(names, domain, body), location);
418
+ return expandTuples(
419
+ expandChoose(
420
+ { kind: "Choose", domain: expression.set && recurse(expression.set) },
421
+ expression.pattern.names,
422
+ recurse(expression.body),
423
+ ),
424
+ location,
425
+ );
502
426
  }
503
427
  return at(
504
428
  {
@@ -513,10 +437,14 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
513
437
  return at({ kind: "SetEnum", elements: expression.elements.map(recurse) }, { location });
514
438
  case "SetFilter":
515
439
  if (expression.bound.pattern.kind === "Tuple") {
516
- const names = expression.bound.pattern.names;
517
- const domain = recurse(expression.bound.set);
518
- const body = recurse(expression.predicate);
519
- return expandTuples(() => expandSetSt(names, domain, body), location);
440
+ return expandTuples(
441
+ expandChoose(
442
+ { kind: "SetSt", domain: recurse(expression.bound.set) },
443
+ expression.bound.pattern.names,
444
+ recurse(expression.predicate),
445
+ ),
446
+ location,
447
+ );
520
448
  }
521
449
  return at(
522
450
  {
@@ -529,9 +457,13 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
529
457
  );
530
458
  case "SetMap":
531
459
  if (hasTuple(expression.bounds)) {
532
- const element = recurse(expression.expression);
533
- const bounds = getTuplyBounds(expression.bounds, isExcept);
534
- return expandTuples(() => expandSetOf(element, bounds), location);
460
+ return expandTuples(
461
+ expandSetOf(
462
+ recurse(expression.expression),
463
+ getTuplyBounds(expression.bounds, isExcept),
464
+ ),
465
+ location,
466
+ );
535
467
  }
536
468
  return at(
537
469
  {
@@ -556,9 +488,10 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
556
488
  );
557
489
  case "FunctionConstruction":
558
490
  if (hasTuple(expression.bounds)) {
559
- const bounds = getTuplyBounds(expression.bounds, isExcept);
560
- const body = recurse(expression.body);
561
- return expandTuples(() => expandFcn(bounds, body), location);
491
+ return expandTuples(
492
+ expandFcn(getTuplyBounds(expression.bounds, isExcept), recurse(expression.body)),
493
+ location,
494
+ );
562
495
  }
563
496
  return at(
564
497
  {
@@ -609,6 +542,8 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
609
542
  );
610
543
  case "ExceptAt":
611
544
  return at({ kind: "At", isExcept }, { location });
545
+ case "Bracket":
546
+ throw new TlaProofError("Unexpected [ without a function or subscript");
612
547
  case "FunctionApplication":
613
548
  return at(
614
549
  {
@@ -743,17 +678,17 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
743
678
  location,
744
679
  };
745
680
  }
746
- const name = getCanonicalName(
747
- definition.name,
748
- definition.kind === "Operator" && definition.params.length === 1 && definition.name === "-",
749
- );
681
+ // A prefix minus is the operator -.
682
+ const name =
683
+ definition.kind === "Operator" && definition.params.length === 1 && definition.name === "-"
684
+ ? "-."
685
+ : getCanonicalName(definition.name);
750
686
  const body = convertExpression(definition.body, isExcept);
751
687
  if (definition.kind === "Function" && hasTuple(definition.bounds)) {
752
- const bounds = getTuplyBounds(definition.bounds, isExcept);
753
688
  return {
754
689
  kind: "Operator",
755
690
  name,
756
- body: expandTuples(() => expandFcn(bounds, body), location),
691
+ body: expandTuples(expandFcn(getTuplyBounds(definition.bounds, isExcept), body), location),
757
692
  location,
758
693
  };
759
694
  }
@@ -766,24 +701,28 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
766
701
  location,
767
702
  };
768
703
  }
769
- if (definition.params.length === 0) return { kind: "Operator", name, body, location };
770
- return {
771
- kind: "Operator",
772
- name,
773
- body: at(
774
- {
775
- kind: "Lambda",
776
- params: definition.params.map((param) => ({
777
- name: getCanonicalName(param.name),
778
- shape: param.arity,
779
- ...(param.location && { location: getNameLocus(param.name, param.location) }),
780
- })),
781
- body,
782
- },
783
- { location },
784
- ),
785
- location,
786
- };
704
+ const operatorBody =
705
+ definition.params.length === 0
706
+ ? body
707
+ : at(
708
+ {
709
+ kind: "Lambda",
710
+ params: definition.params.map((param) => ({
711
+ name: getCanonicalName(param.name),
712
+ shape: param.arity,
713
+ ...(param.location && {
714
+ location: getPointLocus(param.location, param.name.length),
715
+ }),
716
+ })),
717
+ body,
718
+ },
719
+ { location },
720
+ );
721
+ const end = definition.location.range?.end;
722
+ const methods = end && readNewMethod(lines, { line: end.line - 1, column: end.column });
723
+ return methods
724
+ ? { kind: "Bpragma", name, body: operatorBody, methods, location }
725
+ : { kind: "Operator", name, body: operatorBody, location };
787
726
  };
788
727
 
789
728
  const convertNewSymbol = (symbol: NewSymbol): Hyp => {
@@ -800,23 +739,21 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
800
739
  };
801
740
  };
802
741
 
742
+ // Anonymization judges the time of each assumption once it resolves the names in it.
803
743
  const convertSequent = (statement: Expression | AssumeProve): Sequent => {
804
744
  if (statement.kind !== "AssumeProve")
805
745
  return { context: [], active: convertExpression(statement, false) };
806
746
  return {
807
747
  context: statement.assumptions.map((assumption): Hyp => {
808
748
  if (assumption.kind === "NewSymbol") return convertNewSymbol(assumption);
809
- if (assumption.kind === "AssumeProve") {
810
- const location = getLocus(assumption.location);
811
- return {
812
- kind: "Fact",
813
- expression: at({ kind: "Sequent", sequent: convertSequent(assumption) }, { location }),
814
- visibility: "Visible",
815
- location,
816
- };
817
- }
818
- const expression = convertFactLabel(assumption);
819
- return { kind: "Fact", expression, visibility: "Visible", location: expression.location };
749
+ const expression =
750
+ assumption.kind === "AssumeProve"
751
+ ? at(
752
+ { kind: "Sequent", sequent: convertSequent(assumption) },
753
+ { location: getLocus(assumption.location) },
754
+ )
755
+ : convertFactLabel(assumption);
756
+ return getFact(expression, "Visible", "Now", expression.location);
820
757
  }),
821
758
  active: convertExpression(statement.conclusion, false),
822
759
  };
@@ -862,12 +799,10 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
862
799
  defs: use.defs.map(convertDef),
863
800
  });
864
801
 
865
- const getStepNumber = (token: RegExpExecArray | null, level: number): StepNumber => {
866
- const label = token ? token[2] : "";
867
- return label === ""
868
- ? { kind: "Unnamed", level, id: getUnique(counter) }
869
- : { kind: "Named", level, label, isAnonymous: false };
870
- };
802
+ const getStepNumber = (token: RegExpExecArray | null, level: number): StepNumber =>
803
+ token?.[2]
804
+ ? { kind: "Named", level, label: token[2], isAnonymous: false }
805
+ : { kind: "Unnamed", level, id: getUnique(counter) };
871
806
 
872
807
  // to_proof: a missing proof is implicitly omitted where the enclosing step is.
873
808
  const convertProof = (
@@ -878,7 +813,7 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
878
813
  if (!proof) return { kind: "Omitted", omission: "Implicit", location: enclosing };
879
814
  switch (proof.kind) {
880
815
  case "Obvious":
881
- return { kind: "Obvious", location: withPragma(getRangeLocus(proof.keyword)) };
816
+ return { kind: "Obvious", ...withMethod(proof.keyword) };
882
817
  case "Omitted":
883
818
  return {
884
819
  kind: "Omitted",
@@ -892,6 +827,7 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
892
827
  isOnly: proof.isOnly,
893
828
  location: getRangeLocus(proof.keyword),
894
829
  step: { kind: "Unnamed", level, id: 0 },
830
+ method: getMethod(proof.location.range),
895
831
  };
896
832
  case "Steps": {
897
833
  // A <*> first step takes the enclosing level only after PROOF, and the top level
@@ -934,7 +870,11 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
934
870
  const proof = convertProof(step.proof, level + 1, head);
935
871
  return { ...make(proof), location: mergeLoci(head, proof.location), step: number };
936
872
  };
937
- const plain = (converted: Step): Step => ({ ...converted, location: head, step: number });
873
+ const withStepMethod = (converted: Step): Step => ({
874
+ ...converted,
875
+ ...withMethod(step.head),
876
+ step: number,
877
+ });
938
878
  switch (body.kind) {
939
879
  case "Use":
940
880
  case "Hide": {
@@ -944,26 +884,38 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
944
884
  );
945
885
  const usable = convertUsable(body);
946
886
  return body.kind === "Use"
947
- ? { kind: "Use", usable, isOnly: body.isOnly, location, step: number }
887
+ ? {
888
+ kind: "Use",
889
+ usable,
890
+ isOnly: body.isOnly,
891
+ location,
892
+ step: number,
893
+ method: getMethod(body.location.range),
894
+ }
948
895
  : { kind: "Hide", usable, location, step: number };
949
896
  }
950
897
  case "Instance":
951
898
  throw new TlaProofError("Unexpected keyword INSTANCE");
952
899
  case "Define":
953
- return plain({
900
+ return {
954
901
  kind: "Define",
955
902
  definitions: body.definitions.map((definition) => convertDefinition(definition)),
956
- });
903
+ location: head,
904
+ step: number,
905
+ };
957
906
  case "Have":
958
- return plain({ kind: "Have", expression: convertExpression(body.expression, false) });
907
+ return withStepMethod({
908
+ kind: "Have",
909
+ expression: convertExpression(body.expression, false),
910
+ });
959
911
  case "Take":
960
- return plain({
912
+ return withStepMethod({
961
913
  kind: "Take",
962
914
  bounds:
963
915
  body.names.length > 0 ? getUnbounded(body.names) : convertBounds(body.bounds, false),
964
916
  });
965
917
  case "Witness":
966
- return plain({
918
+ return withStepMethod({
967
919
  kind: "Witness",
968
920
  expressions: body.expressions.map((expression) => convertExpression(expression, false)),
969
921
  });
@@ -1046,17 +998,24 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
1046
998
  return {
1047
999
  kind: "Axiom",
1048
1000
  name: unit.assumption.name,
1049
- expression: convertExpression(unit.assumption.expression, false),
1001
+ expression: withExpressionMethod(
1002
+ convertExpression(unit.assumption.expression, false),
1003
+ unit.assumption.location.range,
1004
+ ),
1050
1005
  location: getLocus(unit.assumption.location),
1051
1006
  };
1052
1007
  case "Theorem": {
1053
1008
  const theorem = unit.theorem;
1054
1009
  const location = getLocus(theorem.location);
1055
1010
  const end = withPragma(location);
1011
+ const sequent = convertSequent(theorem.statement);
1056
1012
  return {
1057
1013
  kind: "Theorem",
1058
1014
  name: theorem.name,
1059
- sequent: convertSequent(theorem.statement),
1015
+ sequent: {
1016
+ ...sequent,
1017
+ active: withExpressionMethod(sequent.active, theorem.statement.location.range),
1018
+ },
1060
1019
  axiomCount: 0,
1061
1020
  proof: convertProof(theorem.proof, 0, {
1062
1021
  ...end,
@@ -1070,7 +1029,6 @@ export const createSource = (file: string, text: string, counter: Counter, isExp
1070
1029
  return {
1071
1030
  kind: "Mutate",
1072
1031
  mode: unit.use.kind,
1073
- isSuppressed: false,
1074
1032
  usable: convertUsable(unit.use),
1075
1033
  location: getUseLocus(unit.use),
1076
1034
  };