tla-ts 0.0.10-dev.f16792fed → 0.0.10-dev.f57f64938

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 (568) hide show
  1. package/README.md +2 -1
  2. package/dist/compile.cjs +6 -6
  3. package/dist/compile.js +10 -10
  4. package/dist/deciders.cjs +41 -37
  5. package/dist/deciders.js +57 -53
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +3 -0
  8. package/dist/index.d.ts +3 -0
  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.cjs +2682 -426
  13. package/dist/prove.js +2681 -425
  14. package/dist/run.cjs +45 -42
  15. package/dist/run.js +47 -44
  16. package/dist/tlapm.cjs +2 -2
  17. package/dist/tlapm.js +2 -2
  18. package/dist/transfer.cjs +42 -39
  19. package/dist/transfer.js +42 -39
  20. package/dist/worker.cjs +7 -7
  21. package/dist/worker.js +7 -7
  22. package/package.json +1 -1
  23. package/src/ast.ts +41 -36
  24. package/src/builtins.ts +4 -13
  25. package/src/check-failure.ts +116 -0
  26. package/src/check-trace.ts +282 -0
  27. package/src/check.ts +353 -549
  28. package/src/cli/options.ts +6 -31
  29. package/src/cli/shared.ts +1 -1
  30. package/src/cli/tlapm.ts +433 -70
  31. package/src/cli/tlc-arguments.ts +222 -210
  32. package/src/cli/tlc-output.ts +687 -0
  33. package/src/cli/tlc-usage.ts +1 -2
  34. package/src/cli/tlc.ts +49 -702
  35. package/src/cli/xml-exporter.ts +23 -33
  36. package/src/codegen.ts +5 -10
  37. package/src/coverage.ts +0 -2
  38. package/src/dependencies.ts +30 -14
  39. package/src/dfid.ts +16 -16
  40. package/src/environment-config.ts +315 -0
  41. package/src/environment.ts +55 -338
  42. package/src/errors.ts +33 -5
  43. package/src/evaluate.ts +5 -4
  44. package/src/exit-codes.ts +1 -0
  45. package/src/fingerprints.ts +65 -1
  46. package/src/instances.ts +47 -10
  47. package/src/json.ts +4 -7
  48. package/src/levels.ts +39 -42
  49. package/src/lexer.ts +5 -3
  50. package/src/liveness-checker.ts +553 -237
  51. package/src/liveness.ts +94 -86
  52. package/src/obligations/action.ts +14 -17
  53. package/src/obligations/anonymize.ts +37 -16
  54. package/src/obligations/enabled-axioms.ts +218 -0
  55. package/src/obligations/equality.ts +1 -3
  56. package/src/obligations/expression.ts +36 -8
  57. package/src/obligations/format.ts +0 -2
  58. package/src/obligations/generate.ts +66 -54
  59. package/src/obligations/index.ts +38 -8
  60. package/src/obligations/levels.ts +24 -11
  61. package/src/obligations/module.ts +28 -41
  62. package/src/obligations/normalize.ts +26 -14
  63. package/src/obligations/operators.ts +0 -2
  64. package/src/obligations/pragma.ts +53 -16
  65. package/src/obligations/printer.ts +43 -13
  66. package/src/obligations/proof.ts +3 -2
  67. package/src/obligations/regroup.ts +0 -2
  68. package/src/obligations/simplify.ts +55 -50
  69. package/src/obligations/source.ts +118 -74
  70. package/src/obligations/subexpression.ts +45 -18
  71. package/src/obligations/substitution.ts +1 -3
  72. package/src/obligations/temporal.ts +5 -7
  73. package/src/obligations/tuples.ts +0 -2
  74. package/src/parallel-worker.ts +10 -30
  75. package/src/parallel.ts +24 -47
  76. package/src/parser.ts +580 -180
  77. package/src/pretty-print.ts +1 -1
  78. package/src/prover/decide-pool.ts +3 -3
  79. package/src/prover/deciders.ts +12 -9
  80. package/src/prover/isabelle/decide.ts +3 -25
  81. package/src/prover/isabelle/encode.ts +72 -42
  82. package/src/prover/isabelle/isar/attrib.ts +250 -0
  83. package/src/prover/isabelle/isar/context.ts +335 -0
  84. package/src/prover/isabelle/isar/induct.ts +382 -0
  85. package/src/prover/isabelle/isar/inner-syntax.ts +158 -7
  86. package/src/prover/isabelle/isar/method.ts +509 -212
  87. package/src/prover/isabelle/isar/proof.ts +570 -14
  88. package/src/prover/isabelle/isar/rule-cases.ts +224 -0
  89. package/src/prover/isabelle/isar/theory.ts +487 -76
  90. package/src/prover/isabelle/isar/toplevel.ts +331 -0
  91. package/src/prover/isabelle/isar/type-check.ts +89 -14
  92. package/src/prover/isabelle/provers/blast/blast.ts +7 -65
  93. package/src/prover/isabelle/provers/blast/branch.ts +0 -2
  94. package/src/prover/isabelle/provers/blast/prove.ts +0 -2
  95. package/src/prover/isabelle/provers/blast/rules.ts +0 -2
  96. package/src/prover/isabelle/provers/blast/state.ts +0 -2
  97. package/src/prover/isabelle/provers/blast/term.ts +0 -2
  98. package/src/prover/isabelle/provers/clasimp.ts +0 -2
  99. package/src/prover/isabelle/provers/classical.ts +45 -20
  100. package/src/prover/isabelle/provers/hypsubst.ts +17 -28
  101. package/src/prover/isabelle/pure/bicompose.ts +9 -27
  102. package/src/prover/isabelle/pure/consts.ts +0 -2
  103. package/src/prover/isabelle/pure/conv.ts +2 -10
  104. package/src/prover/isabelle/pure/drule.ts +72 -6
  105. package/src/prover/isabelle/pure/envir.ts +0 -2
  106. package/src/prover/isabelle/pure/goal.ts +1 -3
  107. package/src/prover/isabelle/pure/logic.ts +1 -3
  108. package/src/prover/isabelle/pure/name.ts +0 -2
  109. package/src/prover/isabelle/pure/net.ts +0 -2
  110. package/src/prover/isabelle/pure/object-logic.ts +13 -7
  111. package/src/prover/isabelle/pure/pattern.ts +0 -2
  112. package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
  113. package/src/prover/isabelle/pure/rewriter.ts +6 -17
  114. package/src/prover/isabelle/pure/search.ts +0 -2
  115. package/src/prover/isabelle/pure/seq.ts +0 -2
  116. package/src/prover/isabelle/pure/simplifier.ts +26 -7
  117. package/src/prover/isabelle/pure/table.ts +2 -3
  118. package/src/prover/isabelle/pure/tactic.ts +0 -2
  119. package/src/prover/isabelle/pure/tactical.ts +42 -37
  120. package/src/prover/isabelle/pure/term-ord.ts +0 -2
  121. package/src/prover/isabelle/pure/term.ts +0 -2
  122. package/src/prover/isabelle/pure/thm.ts +14 -13
  123. package/src/prover/isabelle/pure/type.ts +0 -2
  124. package/src/prover/isabelle/pure/unify.ts +0 -2
  125. package/src/prover/isabelle/pure/variable.ts +0 -2
  126. package/src/prover/isabelle/tla/classical-setup.ts +18 -16
  127. package/src/prover/isabelle/tla/context.ts +58 -11
  128. package/src/prover/isabelle/tla/logic-data.ts +1 -1
  129. package/src/prover/isabelle/tla/logic.ts +49 -21
  130. package/src/prover/isabelle/tla/simpdata.ts +1 -12
  131. package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
  132. package/src/prover/ocaml.ts +4 -1
  133. package/src/prover/prep/action.ts +30 -31
  134. package/src/prover/prep/enabled-axioms.ts +11 -2
  135. package/src/prover/prep/fingerprint.ts +2 -5
  136. package/src/prover/prep/methods.ts +181 -51
  137. package/src/prover/prep/normalize.ts +38 -9
  138. package/src/prover/prove.ts +395 -94
  139. package/src/prover/ptl/decide.ts +95 -50
  140. package/src/prover/ptl/encode.ts +2 -3
  141. package/src/prover/ptl/tableau.ts +28 -2
  142. package/src/prover/smt/arithmetic.ts +310 -0
  143. package/src/prover/smt/axioms.ts +12 -8
  144. package/src/prover/smt/context.ts +43 -8
  145. package/src/prover/smt/data.ts +498 -379
  146. package/src/prover/smt/encode.ts +148 -57
  147. package/src/prover/smt/extensionality.ts +5 -3
  148. package/src/prover/smt/flatten.ts +4 -6
  149. package/src/prover/smt/format.ts +28 -4
  150. package/src/prover/smt/instances.ts +7 -1
  151. package/src/prover/smt/layout.ts +91 -0
  152. package/src/prover/smt/rewrite.ts +1021 -618
  153. package/src/prover/smt/simplify.ts +441 -0
  154. package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
  155. package/src/prover/smt/solver/ackr-helper.ts +179 -0
  156. package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
  157. package/src/prover/smt/solver/act-cache.ts +0 -1
  158. package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
  159. package/src/prover/smt/solver/aig-tactic.ts +52 -0
  160. package/src/prover/smt/solver/aig.ts +889 -0
  161. package/src/prover/smt/solver/arith-rewriter.ts +613 -6
  162. package/src/prover/smt/solver/arith-terms.ts +121 -0
  163. package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
  164. package/src/prover/smt/solver/array-rewriter.ts +309 -0
  165. package/src/prover/smt/solver/asserted-formulas.ts +87 -16
  166. package/src/prover/smt/solver/ast-lt.ts +166 -12
  167. package/src/prover/smt/solver/ast-util.ts +160 -2
  168. package/src/prover/smt/solver/ast.ts +1427 -41
  169. package/src/prover/smt/solver/auf-solver.ts +2 -6
  170. package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
  171. package/src/prover/smt/solver/bit-blaster.ts +871 -0
  172. package/src/prover/smt/solver/bound-manager.ts +196 -0
  173. package/src/prover/smt/solver/bound-simplifier.ts +600 -0
  174. package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
  175. package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
  176. package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
  177. package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
  178. package/src/prover/smt/solver/bv1-blast.ts +214 -0
  179. package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
  180. package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
  181. package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
  182. package/src/prover/smt/solver/card2bv.ts +110 -0
  183. package/src/prover/smt/solver/case-split-queue.ts +0 -2
  184. package/src/prover/smt/solver/cg-table.ts +39 -25
  185. package/src/prover/smt/solver/check-logic.ts +330 -0
  186. package/src/prover/smt/solver/clause.ts +0 -1
  187. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
  188. package/src/prover/smt/solver/conflict-resolution.ts +78 -2
  189. package/src/prover/smt/solver/context.ts +516 -115
  190. package/src/prover/smt/solver/ctx-simplify.ts +20 -10
  191. package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
  192. package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
  193. package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
  194. package/src/prover/smt/solver/demodulator.ts +786 -0
  195. package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
  196. package/src/prover/smt/solver/der.ts +38 -10
  197. package/src/prover/smt/solver/diff-neq.ts +206 -0
  198. package/src/prover/smt/solver/distribute-forall.ts +57 -0
  199. package/src/prover/smt/solver/dom-simplify.ts +511 -0
  200. package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
  201. package/src/prover/smt/solver/dyn-ack.ts +0 -1
  202. package/src/prover/smt/solver/e-matching.ts +7 -8
  203. package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
  204. package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
  205. package/src/prover/smt/solver/enode.ts +100 -3
  206. package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
  207. package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
  208. package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
  209. package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
  210. package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
  211. package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
  212. package/src/prover/smt/solver/euf/array-solver.ts +306 -0
  213. package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
  214. package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
  215. package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
  216. package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
  217. package/src/prover/smt/solver/euf/egraph.ts +907 -0
  218. package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
  219. package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
  220. package/src/prover/smt/solver/euf/mam.ts +1050 -0
  221. package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
  222. package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
  223. package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
  224. package/src/prover/smt/solver/euf/q-solver.ts +361 -0
  225. package/src/prover/smt/solver/euf/th-solver.ts +335 -0
  226. package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
  227. package/src/prover/smt/solver/expr-ref.ts +0 -1
  228. package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
  229. package/src/prover/smt/solver/expr2polynomial.ts +146 -0
  230. package/src/prover/smt/solver/factor.ts +141 -0
  231. package/src/prover/smt/solver/fd-solver.ts +265 -0
  232. package/src/prover/smt/solver/fingerprints.ts +15 -15
  233. package/src/prover/smt/solver/fix-dl-var.ts +148 -0
  234. package/src/prover/smt/solver/flat-literals.ts +0 -1
  235. package/src/prover/smt/solver/fm-tactic.ts +884 -0
  236. package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
  237. package/src/prover/smt/solver/fpa-rewriter.ts +640 -0
  238. package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
  239. package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
  240. package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
  241. package/src/prover/smt/solver/goal.ts +175 -15
  242. package/src/prover/smt/solver/goal2nlsat.ts +189 -0
  243. package/src/prover/smt/solver/guard-set.ts +219 -0
  244. package/src/prover/smt/solver/hash.ts +0 -1
  245. package/src/prover/smt/solver/hashtable.ts +30 -16
  246. package/src/prover/smt/solver/inf-eps.ts +63 -0
  247. package/src/prover/smt/solver/inj-axiom.ts +101 -0
  248. package/src/prover/smt/solver/internalizer.ts +110 -38
  249. package/src/prover/smt/solver/lackr.ts +381 -0
  250. package/src/prover/smt/solver/lbool.ts +0 -1
  251. package/src/prover/smt/solver/lia2card.ts +268 -0
  252. package/src/prover/smt/solver/lia2pb.ts +154 -0
  253. package/src/prover/smt/solver/literal.ts +0 -1
  254. package/src/prover/smt/solver/logic-tactics.ts +345 -0
  255. package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
  256. package/src/prover/smt/solver/lp/constraints.ts +0 -1
  257. package/src/prover/smt/solver/lp/containers.ts +0 -1
  258. package/src/prover/smt/solver/lp/core-solver.ts +18 -3
  259. package/src/prover/smt/solver/lp/cross-nested.ts +0 -1
  260. package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
  261. package/src/prover/smt/solver/lp/dependency.ts +0 -2
  262. package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
  263. package/src/prover/smt/solver/lp/explanation.ts +0 -1
  264. package/src/prover/smt/solver/lp/gomory.ts +0 -1
  265. package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
  266. package/src/prover/smt/solver/lp/hnf.ts +0 -3
  267. package/src/prover/smt/solver/lp/int-cube.ts +3 -4
  268. package/src/prover/smt/solver/lp/int-solver.ts +0 -2
  269. package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
  270. package/src/prover/smt/solver/lp/lar-term.ts +0 -1
  271. package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
  272. package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
  273. package/src/prover/smt/solver/lp/nex-creator.ts +0 -1
  274. package/src/prover/smt/solver/lp/nex.ts +0 -1
  275. package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
  276. package/src/prover/smt/solver/lp/nla-basics.ts +0 -2
  277. package/src/prover/smt/solver/lp/nla-core.ts +42 -11
  278. package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
  279. package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
  280. package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
  281. package/src/prover/smt/solver/lp/nla-grobner.ts +9 -4
  282. package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
  283. package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
  284. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
  285. package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
  286. package/src/prover/smt/solver/lp/nla-order.ts +0 -2
  287. package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
  288. package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
  289. package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
  290. package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
  291. package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
  292. package/src/prover/smt/solver/lp/nla-types.ts +0 -2
  293. package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
  294. package/src/prover/smt/solver/lp/nra-solver.ts +25 -4
  295. package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
  296. package/src/prover/smt/solver/lp/pdd-interval.ts +0 -1
  297. package/src/prover/smt/solver/lp/pdd-simplifier.ts +0 -1
  298. package/src/prover/smt/solver/lp/pdd-solver.ts +0 -2
  299. package/src/prover/smt/solver/lp/pdd.ts +2 -2
  300. package/src/prover/smt/solver/lp/random-updater.ts +0 -2
  301. package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
  302. package/src/prover/smt/solver/lp/union-find.ts +7 -2
  303. package/src/prover/smt/solver/macro-finder.ts +530 -0
  304. package/src/prover/smt/solver/mam-compiler.ts +122 -90
  305. package/src/prover/smt/solver/mam-interpreter.ts +0 -1
  306. package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
  307. package/src/prover/smt/solver/max-cliques.ts +105 -0
  308. package/src/prover/smt/solver/maxcore.ts +309 -0
  309. package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
  310. package/src/prover/smt/solver/maxlex.ts +115 -0
  311. package/src/prover/smt/solver/maxsmt-base.ts +105 -0
  312. package/src/prover/smt/solver/maxsmt.ts +92 -0
  313. package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
  314. package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
  315. package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
  316. package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
  317. package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
  318. package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
  319. package/src/prover/smt/solver/model-based-opt.ts +844 -0
  320. package/src/prover/smt/solver/model-checker.ts +18 -27
  321. package/src/prover/smt/solver/model-evaluator.ts +188 -12
  322. package/src/prover/smt/solver/model-finder.ts +12 -18
  323. package/src/prover/smt/solver/model-generator.ts +56 -29
  324. package/src/prover/smt/solver/model-macro-solver.ts +49 -46
  325. package/src/prover/smt/solver/model-printer.ts +214 -0
  326. package/src/prover/smt/solver/mpf.ts +711 -0
  327. package/src/prover/smt/solver/mus.ts +51 -0
  328. package/src/prover/smt/solver/muz/dl-context.ts +404 -0
  329. package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
  330. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
  331. package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
  332. package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
  333. package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
  334. package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
  335. package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
  336. package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
  337. package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
  338. package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
  339. package/src/prover/smt/solver/muz/hnf.ts +201 -0
  340. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
  341. package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
  342. package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
  343. package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
  344. package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
  345. package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
  346. package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
  347. package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
  348. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
  349. package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
  350. package/src/prover/smt/solver/muz/substitution.ts +203 -0
  351. package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
  352. package/src/prover/smt/solver/nlqsat.ts +484 -0
  353. package/src/prover/smt/solver/nlsat/algebraic.ts +125 -12
  354. package/src/prover/smt/solver/nlsat/atoms.ts +20 -6
  355. package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
  356. package/src/prover/smt/solver/nlsat/explain.ts +63 -23
  357. package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
  358. package/src/prover/smt/solver/nlsat/levelwise.ts +3 -9
  359. package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
  360. package/src/prover/smt/solver/nlsat/polynomial.ts +13 -6
  361. package/src/prover/smt/solver/nlsat/solver.ts +234 -36
  362. package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
  363. package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
  364. package/src/prover/smt/solver/nlsat/types.ts +0 -2
  365. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
  366. package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
  367. package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
  368. package/src/prover/smt/solver/nnf.ts +105 -23
  369. package/src/prover/smt/solver/normalize-bounds.ts +53 -0
  370. package/src/prover/smt/solver/occf.ts +97 -0
  371. package/src/prover/smt/solver/opt-context.ts +787 -0
  372. package/src/prover/smt/solver/opt-nlsat.ts +375 -0
  373. package/src/prover/smt/solver/opt-pareto.ts +282 -0
  374. package/src/prover/smt/solver/opt-preprocess.ts +101 -0
  375. package/src/prover/smt/solver/opt-solver.ts +308 -0
  376. package/src/prover/smt/solver/opt-value.ts +55 -0
  377. package/src/prover/smt/solver/optsmt.ts +692 -0
  378. package/src/prover/smt/solver/parallel-tactic.ts +299 -0
  379. package/src/prover/smt/solver/pattern-inference.ts +19 -11
  380. package/src/prover/smt/solver/pb-rewriter.ts +284 -0
  381. package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
  382. package/src/prover/smt/solver/poly-rewriter.ts +202 -57
  383. package/src/prover/smt/solver/probes.ts +512 -0
  384. package/src/prover/smt/solver/propagate-values.ts +37 -21
  385. package/src/prover/smt/solver/proto-model.ts +648 -19
  386. package/src/prover/smt/solver/pull-quant.ts +28 -12
  387. package/src/prover/smt/solver/purify-arith.ts +632 -0
  388. package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
  389. package/src/prover/smt/solver/qe-lite-der.ts +2 -3
  390. package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
  391. package/src/prover/smt/solver/qe-lite.ts +37 -17
  392. package/src/prover/smt/solver/qe-mbp.ts +270 -0
  393. package/src/prover/smt/solver/qe.ts +1498 -0
  394. package/src/prover/smt/solver/qel.ts +25 -0
  395. package/src/prover/smt/solver/qi-queue.ts +0 -1
  396. package/src/prover/smt/solver/qsat.ts +814 -0
  397. package/src/prover/smt/solver/quant-hoist.ts +196 -0
  398. package/src/prover/smt/solver/quant-tactics.ts +16 -56
  399. package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
  400. package/src/prover/smt/solver/quantifier-manager.ts +8 -16
  401. package/src/prover/smt/solver/quasi-macros.ts +243 -0
  402. package/src/prover/smt/solver/random-gen.ts +0 -1
  403. package/src/prover/smt/solver/rational.ts +45 -1
  404. package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
  405. package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
  406. package/src/prover/smt/solver/reduce-args.ts +225 -0
  407. package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
  408. package/src/prover/smt/solver/ref-vector.ts +0 -1
  409. package/src/prover/smt/solver/relevancy.ts +1 -2
  410. package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
  411. package/src/prover/smt/solver/rewriter.ts +475 -36
  412. package/src/prover/smt/solver/rlimit.ts +25 -2
  413. package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
  414. package/src/prover/smt/solver/sat/big.ts +177 -0
  415. package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
  416. package/src/prover/smt/solver/sat/clause.ts +203 -0
  417. package/src/prover/smt/solver/sat/cleaner.ts +94 -0
  418. package/src/prover/smt/solver/sat/config.ts +122 -0
  419. package/src/prover/smt/solver/sat/consequences.ts +203 -0
  420. package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
  421. package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
  422. package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
  423. package/src/prover/smt/solver/sat/model-converter.ts +136 -0
  424. package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
  425. package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
  426. package/src/prover/smt/solver/sat/probing.ts +170 -0
  427. package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
  428. package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
  429. package/src/prover/smt/solver/sat/scc.ts +142 -0
  430. package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
  431. package/src/prover/smt/solver/sat/solver.ts +2127 -0
  432. package/src/prover/smt/solver/sat/var-queue.ts +117 -0
  433. package/src/prover/smt/solver/sat/watch-list.ts +140 -0
  434. package/src/prover/smt/solver/search-tree.ts +284 -0
  435. package/src/prover/smt/solver/seq-axioms.ts +1010 -0
  436. package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
  437. package/src/prover/smt/solver/seq-derive.ts +1301 -0
  438. package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
  439. package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
  440. package/src/prover/smt/solver/seq-factory.ts +89 -0
  441. package/src/prover/smt/solver/seq-monadic.ts +728 -0
  442. package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
  443. package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
  444. package/src/prover/smt/solver/seq-re-util.ts +758 -0
  445. package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
  446. package/src/prover/smt/solver/seq-regex-live.ts +200 -0
  447. package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
  448. package/src/prover/smt/solver/seq-skolem.ts +317 -0
  449. package/src/prover/smt/solver/seq-subset.ts +165 -0
  450. package/src/prover/smt/solver/seq-view-witness.ts +353 -0
  451. package/src/prover/smt/solver/smt-consequences.ts +297 -0
  452. package/src/prover/smt/solver/smt-kernel.ts +83 -0
  453. package/src/prover/smt/solver/smt-logics.ts +66 -0
  454. package/src/prover/smt/solver/smt-setup.ts +496 -0
  455. package/src/prover/smt/solver/smt2-printer.ts +765 -0
  456. package/src/prover/smt/solver/smtlib-parser.ts +3126 -316
  457. package/src/prover/smt/solver/smtlib-script.ts +1631 -0
  458. package/src/prover/smt/solver/solve-eqs.ts +929 -0
  459. package/src/prover/smt/solver/solver.ts +113 -22
  460. package/src/prover/smt/solver/static-features.ts +314 -0
  461. package/src/prover/smt/solver/sticky-generations.ts +0 -1
  462. package/src/prover/smt/solver/tactic.ts +1986 -0
  463. package/src/prover/smt/solver/term-enumeration.ts +205 -0
  464. package/src/prover/smt/solver/theory-array.ts +1240 -0
  465. package/src/prover/smt/solver/theory-bv.ts +1200 -0
  466. package/src/prover/smt/solver/theory-char.ts +355 -0
  467. package/src/prover/smt/solver/theory-datatype.ts +598 -0
  468. package/src/prover/smt/solver/theory-finite-set.ts +30 -0
  469. package/src/prover/smt/solver/theory-fpa.ts +389 -0
  470. package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
  471. package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
  472. package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
  473. package/src/prover/smt/solver/theory-lra-internalize.ts +86 -27
  474. package/src/prover/smt/solver/theory-lra-model.ts +20 -35
  475. package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
  476. package/src/prover/smt/solver/theory-lra-state.ts +6 -22
  477. package/src/prover/smt/solver/theory-lra.ts +188 -1
  478. package/src/prover/smt/solver/theory-pb.ts +934 -0
  479. package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
  480. package/src/prover/smt/solver/theory-recfun.ts +307 -0
  481. package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
  482. package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
  483. package/src/prover/smt/solver/theory-seq-state.ts +871 -0
  484. package/src/prover/smt/solver/theory-seq.ts +961 -0
  485. package/src/prover/smt/solver/theory.ts +189 -0
  486. package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
  487. package/src/prover/smt/solver/var-subst.ts +36 -14
  488. package/src/prover/smt/table.ts +3 -2
  489. package/src/prover/smt/types.ts +146 -0
  490. package/src/prover/tlapm/cache.ts +50 -19
  491. package/src/prover/tlapm/tlapm.ts +15 -9
  492. package/src/prover/tlapm-library.ts +3208 -0
  493. package/src/prover/verdict.ts +9 -0
  494. package/src/prover/zenon/check/check.ts +1 -2
  495. package/src/prover/zenon/check/records.ts +1 -1
  496. package/src/prover/zenon/check/relations.ts +2 -1
  497. package/src/prover/zenon/check/rewrites.ts +2 -15
  498. package/src/prover/zenon/check/sets.ts +40 -58
  499. package/src/prover/zenon/check/terms.ts +1 -2
  500. package/src/prover/zenon/decide.ts +10 -7
  501. package/src/prover/zenon/encode.ts +0 -2
  502. package/src/prover/zenon/eqrel.ts +2 -2
  503. package/src/prover/zenon/equality-rules.ts +0 -2
  504. package/src/prover/zenon/expr.ts +7 -2
  505. package/src/prover/zenon/index-table.ts +9 -21
  506. package/src/prover/zenon/isar-case.ts +0 -2
  507. package/src/prover/zenon/isar.ts +35 -37
  508. package/src/prover/zenon/llproof.ts +2 -13
  509. package/src/prover/zenon/mltoll.ts +12 -30
  510. package/src/prover/zenon/node.ts +20 -5
  511. package/src/prover/zenon/parse.ts +9 -8
  512. package/src/prover/zenon/phrase.ts +0 -2
  513. package/src/prover/zenon/proof.ts +0 -2
  514. package/src/prover/zenon/propositional-rules.ts +0 -2
  515. package/src/prover/zenon/rules.ts +0 -2
  516. package/src/prover/zenon/search.ts +11 -19
  517. package/src/prover/zenon/tla/functions.ts +2 -4
  518. package/src/prover/zenon/tla/llproof.ts +9 -13
  519. package/src/prover/zenon/tla/records.ts +1 -8
  520. package/src/prover/zenon/tla/rewrites.ts +0 -2
  521. package/src/prover/zenon/tla/sets.ts +22 -22
  522. package/src/prover/zenon/tla/terms.ts +0 -2
  523. package/src/prover/zenon/tla/tla.ts +7 -8
  524. package/src/resolve.ts +56 -74
  525. package/src/runtime.ts +4 -0
  526. package/src/sany/generation.ts +394 -0
  527. package/src/sany/generator-def-entries.ts +210 -0
  528. package/src/sany/generator-definitions.ts +686 -0
  529. package/src/sany/generator-expressions.ts +1100 -0
  530. package/src/sany/generator-proofs.ts +662 -0
  531. package/src/sany/generator.ts +155 -2625
  532. package/src/sany/levels.ts +0 -2
  533. package/src/sany/lexer.ts +17 -16
  534. package/src/sany/linter.ts +0 -2
  535. package/src/sany/nodes.ts +2 -3
  536. package/src/sany/report.ts +3 -6
  537. package/src/sany/selectors.ts +35 -38
  538. package/src/sany/xml.ts +23 -55
  539. package/src/search.ts +205 -43
  540. package/src/simulate.ts +157 -133
  541. package/src/spec-description.ts +33 -48
  542. package/src/standard-definitions.ts +4 -0
  543. package/src/standard-modules.ts +16 -32
  544. package/src/state-graph.ts +0 -2
  545. package/src/substitution-levels.ts +5 -4
  546. package/src/successors.ts +6 -8
  547. package/src/symmetry.ts +2 -2
  548. package/src/tableau.ts +2 -2
  549. package/src/tlc/fingerprint.ts +81 -9
  550. package/src/tlc/messages.ts +20 -15
  551. package/src/tlc/random.ts +4 -4
  552. package/src/tlc/replay.ts +8 -15
  553. package/src/tlc/summary.ts +29 -14
  554. package/src/tlc/tlc-operators.ts +2 -3
  555. package/src/tlc/tlcext-operators.ts +44 -12
  556. package/src/tlc/trace-spec.ts +21 -40
  557. package/src/typed-tier.ts +6535 -0
  558. package/src/typescript/actions.ts +2 -4
  559. package/src/typescript/collections.ts +34 -20
  560. package/src/typescript/compile.ts +1 -3
  561. package/src/typescript/formula.ts +5 -3
  562. package/src/typescript/model.ts +4 -5
  563. package/src/typescript/steps.ts +20 -18
  564. package/src/values.ts +62 -152
  565. package/src/prover/isabelle/isar/statement.ts +0 -52
  566. package/src/prover/smt/solver/z3-license.txt +0 -10
  567. package/src/prover/tlaps-module.ts +0 -510
  568. package/src/prover/zenon/LICENSE +0 -32
package/src/parser.ts CHANGED
@@ -35,6 +35,24 @@ interface InfixOperator extends Precedence {
35
35
  isAssociative: boolean;
36
36
  }
37
37
 
38
+ interface TlapmOperand {
39
+ start: number;
40
+ end: number;
41
+ expression: Expression;
42
+ joinedBy?: string;
43
+ }
44
+
45
+ interface TlapmOperator extends Precedence {
46
+ start: number;
47
+ end: number;
48
+ fixity: "Prefix" | "Infix" | "Postfix";
49
+ isLeft: boolean;
50
+ joins?: string;
51
+ apply: (operands: TlapmOperand[]) => Expression;
52
+ }
53
+
54
+ type TlapmItem = TlapmOperand | TlapmOperator;
55
+
38
56
  const POSTFIX_PRECEDENCE = { low: 15, high: 15 };
39
57
  const FUNCTION_PRECEDENCE = { low: 16, high: 16 };
40
58
 
@@ -144,6 +162,49 @@ const INFIX_OPERATORS = new Map<string, InfixOperator>([
144
162
 
145
163
  const NEGATION_PRECEDENCE = 12;
146
164
 
165
+ // tlapm's Optable has SANY's infix precedences, groups % and \X to the left with the operators
166
+ // SANY takes as associative, and has these prefix precedences. A function application and a field
167
+ // bind above every operator.
168
+ const isTlapmLeft = (text: string, infix: InfixOperator) =>
169
+ infix.isAssociative || text === "%" || text === "\\X";
170
+
171
+ const TLAPM_PREFIX_OPERATORS = new Map<string, Precedence>([
172
+ ["~", { low: 4, high: 4 }],
173
+ ["[]", { low: 4, high: 15 }],
174
+ ["<>", { low: 4, high: 15 }],
175
+ ["ENABLED", { low: 4, high: 15 }],
176
+ ["UNCHANGED", { low: 4, high: 15 }],
177
+ ["SUBSET", { low: 8, high: 8 }],
178
+ ["UNION", { low: 8, high: 8 }],
179
+ ["DOMAIN", { low: 9, high: 9 }],
180
+ ["-", { low: 12, high: 12 }],
181
+ ["-.", { low: 12, high: 12 }],
182
+ ]);
183
+
184
+ const TLAPM_SELECTION_PRECEDENCE = { low: 17, high: 17 };
185
+
186
+ const TLAPM_ATOM_STARTS = new Set([
187
+ "(",
188
+ "[",
189
+ "{",
190
+ "<<",
191
+ "@",
192
+ "\\A",
193
+ "\\E",
194
+ "\\AA",
195
+ "\\EE",
196
+ "IF",
197
+ "CASE",
198
+ "LET",
199
+ "CHOOSE",
200
+ "LAMBDA",
201
+ "WF_",
202
+ "SF_",
203
+ ]);
204
+
205
+ // The brackets whose contents tlapm reads without committing, so a failure in them backtracks.
206
+ const TLAPM_OPEN_BRACKETS = new Set(["(", "{", "<<"]);
207
+
147
208
  const POSTFIX_OPERATORS = new Set(["^+", "^*", "^#"]);
148
209
 
149
210
  const DEFINABLE_POSTFIX_OPERATORS = new Set([...POSTFIX_OPERATORS, "'"]);
@@ -315,13 +376,30 @@ const getSpan = (range: SourceRange): Span => ({
315
376
  stop: { line: range.end.line, column: range.end.column + 1 },
316
377
  });
317
378
 
318
- const createProofError = (message: string, span: Span, exception = "Proof.Parser") =>
379
+ interface ProofErrorEnds {
380
+ printed: string;
381
+ set: string;
382
+ }
383
+
384
+ const NO_NEWLINES: ProofErrorEnds = { printed: "", set: "" };
385
+
386
+ const PRINTED_NEWLINE: ProofErrorEnds = { printed: "\n", set: "" };
387
+
388
+ const NEWLINES: ProofErrorEnds = { printed: "\n", set: "\n" };
389
+
390
+ // p_parser.ml ends some of the messages it prints, and of those it sets, with a newline.
391
+ const createProofError = (
392
+ message: string,
393
+ span: Span,
394
+ ends: ProofErrorEnds,
395
+ exception = "Proof.Parser",
396
+ ) =>
319
397
  new TlaSyntaxError(message, undefined, {
320
- reason: message,
398
+ reason: `${message}${ends.set}`,
321
399
  line: span.start.line,
322
400
  column: span.start.column,
323
401
  isEnd: false,
324
- proof: { stop: span.stop, exception },
402
+ proof: { stop: span.stop, exception, printed: `${message}${ends.printed}` },
325
403
  });
326
404
 
327
405
  const FACT_KEYWORDS = new Set([
@@ -426,6 +504,11 @@ const parse = (
426
504
  const factNames = new Set<string>();
427
505
  const proofScopes: Set<string>[] = [];
428
506
  const openModules: Module[] = [];
507
+ // Pco's backtracking: a failure not past a commit rewinds to its attempt's frame.
508
+ let attemptFrame: number | undefined;
509
+ let attemptCount = 0;
510
+ const restorePoints: number[] = [];
511
+ const backtracks = new WeakMap<TlaSyntaxError, number>();
429
512
 
430
513
  const isRecursiveName = (name: string) => recursiveScopes[recursiveScopes.length - 1].has(name);
431
514
 
@@ -473,15 +556,6 @@ const parse = (
473
556
  const describeToken = (token: Token) =>
474
557
  token.kind === "End" ? "end of input" : JSON.stringify(token.text);
475
558
 
476
- let unitStart = 0;
477
-
478
- const getDefinitionEnd = (fallback: Point) => {
479
- const equals = tokens
480
- .slice(unitStart, cursor)
481
- .find((token) => token.text === "==" && token.kind !== "String");
482
- return equals ? { line: equals.line, column: equals.endColumn + 1 } : fallback;
483
- };
484
-
485
559
  const isTlapmKeyword = (token: Token) =>
486
560
  isTlapm && (token.kind === "Keyword" || BUILTIN_CONSTANTS.has(token.text));
487
561
 
@@ -496,6 +570,7 @@ const parse = (
496
570
  };
497
571
 
498
572
  const getTlapmName = (token: Token) => {
573
+ if (token.kind === "End") return "EOF";
499
574
  if (/^-{4,}$/.test(token.text)) return "----";
500
575
  if (/^={4,}$/.test(token.text)) return "====";
501
576
  if (TLAPM_PUNCTUATION.has(token.text) || token.kind === "Number" || token.kind === "Decimal")
@@ -509,36 +584,75 @@ const parse = (
509
584
  const createError = (message: string, token: Point = peekRaw(), unexpected?: Token) => {
510
585
  const end = tokens[tokens.length - 1];
511
586
  const isEnd = token.line === end.line && token.column === end.column;
512
- return new TlaSyntaxError(
587
+ const error = new TlaSyntaxError(
513
588
  `${message} at line ${token.line}, column ${token.column}`,
514
589
  undefined,
515
590
  getFailure(message, token, isEnd, unexpected),
516
591
  );
592
+ if (attemptFrame !== undefined) backtracks.set(error, attemptFrame);
593
+ return error;
517
594
  };
518
595
 
596
+ // tlapm reports a failure after the last token it read before the outermost attempt around it.
519
597
  const getFailure = (
520
598
  message: string,
521
599
  token: Point,
522
600
  isEnd: boolean,
523
601
  unexpected: Token | undefined,
524
602
  ) => {
525
- if (isTlapm && isEnd) {
526
- const end = tokens[tokens.length - 1];
527
- return { reason: "Unexpected EOF", ...getDefinitionEnd(getPreviousEnd(end)), isEnd };
528
- }
529
- if (isTlapm && unexpected) {
530
- return {
531
- reason: `Unexpected ${getTlapmName(unexpected)}`,
532
- ...getPreviousEnd(unexpected),
533
- isEnd,
534
- };
535
- }
536
- return { reason: message, line: token.line, column: token.column, isEnd };
603
+ if (!isTlapm) return { reason: message, line: token.line, column: token.column, isEnd };
604
+ const restored = tokens[restorePoints[0] - 1];
605
+ const reason = unexpected ? `Unexpected ${getTlapmName(unexpected)}` : message;
606
+ if (restored) return { reason, line: restored.line, column: restored.endColumn + 1, isEnd };
607
+ const position = unexpected ? getPreviousEnd(unexpected) : token;
608
+ return { reason, line: position.line, column: position.column, isEnd };
537
609
  };
538
610
 
539
611
  const createUnexpected = (message: string, token: Token = peekRaw()) =>
540
612
  createError(message, token, token);
541
613
 
614
+ // Pco.attempt: a failure that backtracks to it leaves the input as it was, and gives undefined.
615
+ const attempt = <Result>(parse: () => Result): Result | undefined => {
616
+ const saved = {
617
+ cursor,
618
+ frame: attemptFrame,
619
+ restorePoints: restorePoints.length,
620
+ offsideColumns: offsideColumns.length,
621
+ recursiveScopes: recursiveScopes.length,
622
+ };
623
+ const frame = ++attemptCount;
624
+ attemptFrame = frame;
625
+ try {
626
+ const result = parse();
627
+ attemptFrame = saved.frame;
628
+ return result;
629
+ } catch (error) {
630
+ if (!(error instanceof TlaSyntaxError) || backtracks.get(error) !== frame) throw error;
631
+ cursor = saved.cursor;
632
+ attemptFrame = saved.frame;
633
+ restorePoints.length = saved.restorePoints;
634
+ offsideColumns.length = saved.offsideColumns;
635
+ recursiveScopes.length = saved.recursiveScopes;
636
+ return undefined;
637
+ }
638
+ };
639
+
640
+ // Pco.commit: a failure in parse no longer backtracks.
641
+ const commit = <Result>(parse: () => Result) => {
642
+ const frame = attemptFrame;
643
+ attemptFrame = undefined;
644
+ const result = parse();
645
+ attemptFrame = frame;
646
+ return result;
647
+ };
648
+
649
+ const withRestorePoint = <Result>(parse: () => Result) => {
650
+ restorePoints.push(cursor);
651
+ const result = parse();
652
+ restorePoints.pop();
653
+ return result;
654
+ };
655
+
542
656
  const isFieldName = (token: Token) =>
543
657
  (token.kind === "Identifier" ||
544
658
  token.kind === "Keyword" ||
@@ -552,7 +666,7 @@ const parse = (
552
666
 
553
667
  const advance = () => {
554
668
  const token = peek();
555
- if (token.kind === "End") throw createError("Unexpected end of expression");
669
+ if (token.kind === "End") throw createUnexpected("Unexpected end of expression");
556
670
  cursor++;
557
671
  return token;
558
672
  };
@@ -622,13 +736,13 @@ const parse = (
622
736
  return items;
623
737
  };
624
738
 
625
- const isBoundAhead = () => {
626
- if (isAt("<<")) {
627
- let offset = 1;
739
+ const isBoundAhead = (start = 0) => {
740
+ if (isAt("<<", start)) {
741
+ let offset = start + 1;
628
742
  while (peek(offset).kind === "Identifier" || isAt(",", offset)) offset++;
629
743
  return isAt(">>", offset) && isAt("\\in", offset + 1);
630
744
  }
631
- let offset = 0;
745
+ let offset = start;
632
746
  while (peek(offset).kind === "Identifier") {
633
747
  if (isAt("\\in", offset + 1)) return true;
634
748
  if (!isAt(",", offset + 1)) return false;
@@ -655,13 +769,21 @@ const parse = (
655
769
  return { kind: "Tuple", names: names.names, ranges: names.ranges };
656
770
  };
657
771
 
658
- const parseBounds = () =>
659
- parseSeparated(() => {
772
+ // tlapm's func_boundeds reads another bound only where names and \in follow the comma.
773
+ const parseBounds = () => {
774
+ const parseBound = () => {
660
775
  const patterns = parseSeparated(parsePattern);
661
776
  expect("\\in");
662
- const set = parseExpression();
777
+ const set = commit(parseExpression);
663
778
  return patterns.map((pattern) => ({ pattern, set }));
664
- }).flat();
779
+ };
780
+ const bounds = [parseBound()];
781
+ while (isAt(",") && (!isTlapm || isBoundAhead(1))) {
782
+ advance();
783
+ bounds.push(parseBound());
784
+ }
785
+ return bounds.flat();
786
+ };
665
787
 
666
788
  const parseSubscript = (): { subscript: Expression; lastArgs: Expression[] } => {
667
789
  const token = peek();
@@ -823,7 +945,11 @@ const parse = (
823
945
  start,
824
946
  );
825
947
  }
826
- return parseExpression();
948
+ if (!isTlapm) return parseExpression();
949
+ // tlapm's oparg reads an operator where an expression doesn't start, and fails otherwise.
950
+ const argument = attempt(parseExpression);
951
+ if (argument) return argument;
952
+ throw createUnexpected(`Unexpected ${describeToken(peek())}`);
827
953
  };
828
954
 
829
955
  let lastArgumentsRange: SourceRange | undefined;
@@ -842,14 +968,19 @@ const parse = (
842
968
  const bullet = advance();
843
969
  offsideColumns.push(bullet.column);
844
970
  const operands = [parseExpression()];
845
- while (
846
- isBullet(peekRaw()) &&
847
- peekRaw().text === bullet.text &&
848
- peekRaw().column === bullet.column
849
- ) {
850
- cursor++;
851
- operands.push(parseExpression());
852
- }
971
+ const parseItems = () => {
972
+ while (
973
+ isBullet(peekRaw()) &&
974
+ peekRaw().text === bullet.text &&
975
+ peekRaw().column === bullet.column
976
+ ) {
977
+ cursor++;
978
+ operands.push(parseExpression());
979
+ }
980
+ };
981
+ // bulleted_list: a first item that fails leaves expr_or_op's other readings to fail after it.
982
+ if (isTlapm) commit(parseItems);
983
+ else parseItems();
853
984
  offsideColumns.pop();
854
985
  return {
855
986
  kind: bullet.text === "/\\" ? "And" : "Or",
@@ -940,7 +1071,7 @@ const parse = (
940
1071
  const element = withRange(parsePrefix(), start);
941
1072
  const location = getLocation(advance());
942
1073
  return withRange(
943
- { kind: "Apply", operator: "\\in", args: [element, parseExpression()], location },
1074
+ { kind: "Apply", operator: "\\in", args: [element, commit(parseExpression)], location },
944
1075
  start,
945
1076
  );
946
1077
  };
@@ -953,9 +1084,9 @@ const parse = (
953
1084
  const checkpoint = cursor;
954
1085
  const pattern = parsePattern();
955
1086
  expect("\\in");
956
- const set = parseExpression();
1087
+ const set = commit(parseExpression);
957
1088
  if (accept(":")) {
958
- const predicate = parseExpression();
1089
+ const predicate = commit(parseExpression);
959
1090
  expect("}");
960
1091
  return { kind: "SetFilter", bound: { pattern, set }, predicate, location };
961
1092
  }
@@ -985,7 +1116,7 @@ const parse = (
985
1116
  return {
986
1117
  kind: "AngleAction",
987
1118
  action: elements[0],
988
- subscript: parseSubscript().subscript,
1119
+ subscript: commit(parseSubscript).subscript,
989
1120
  location,
990
1121
  };
991
1122
  }
@@ -1079,10 +1210,8 @@ const parse = (
1079
1210
  expect(":");
1080
1211
  return { kind: "Lambda", params, body: parseExpression(), location };
1081
1212
  }
1082
- if (token.kind === "Number") {
1083
- if (isTlapm && /^\\[BOH]/.test(token.text)) throw createError("incomplete expression", token);
1213
+ if (token.kind === "Number")
1084
1214
  return { kind: "Number", value: getNumeralValue(token.text), text: token.text, location };
1085
- }
1086
1215
  if (token.kind === "Decimal") return { kind: "Decimal", text: token.text, location };
1087
1216
  if (token.kind === "String") return { kind: "String", value: token.text, location };
1088
1217
  const isStep = token.kind === "Step" && isStepReference(token);
@@ -1207,8 +1336,7 @@ const parse = (
1207
1336
  const instances: Instance[] = [];
1208
1337
  recursiveScopes.push(new Set());
1209
1338
  while (!accept("IN")) {
1210
- if (isTlapm && isAt("RECURSIVE"))
1211
- throw createError("Unexpected keyword RECURSIVE", getDefinitionEnd(peekRaw()));
1339
+ if (isTlapm && isAt("RECURSIVE")) throw createUnexpected("Unexpected keyword RECURSIVE");
1212
1340
  if (accept("RECURSIVE")) {
1213
1341
  declareRecursive();
1214
1342
  continue;
@@ -1254,14 +1382,12 @@ const parse = (
1254
1382
 
1255
1383
  const parsePrefixOperand = (operator: Token, low: number, high: number) => {
1256
1384
  lastOperator = precedingOperator = { low, high };
1257
- const operand = parseExpression(
1258
- isTlapm ? Math.min(high + 1, POSTFIX_PRECEDENCE.low) : high + 1,
1259
- );
1385
+ const operand = parseExpression(high + 1);
1260
1386
  const next = peek();
1261
1387
  const nextHigh = DEFINABLE_POSTFIX_OPERATORS.has(next.text)
1262
1388
  ? POSTFIX_PRECEDENCE.high
1263
1389
  : INFIX_OPERATORS.get(next.text)?.high;
1264
- if (!isTlapm && next.kind === "Operator" && nextHigh !== undefined && nextHigh >= low) {
1390
+ if (next.kind === "Operator" && nextHigh !== undefined && nextHigh >= low) {
1265
1391
  throw createError(`Precedence conflict between ${operator.text} and ${next.text}`, next);
1266
1392
  }
1267
1393
  return operand;
@@ -1275,26 +1401,6 @@ const parse = (
1275
1401
  if (token.kind === "Operator" && isBullet(token)) {
1276
1402
  return parseJunctionList();
1277
1403
  }
1278
- if (isTlapm && INFIX_OPERATORS.has(token.text) && isAt("(", 1)) {
1279
- const start = cursor;
1280
- const nonfix = withBracketLayout(() => {
1281
- advance();
1282
- advance();
1283
- const left = parseExpression();
1284
- if (!accept(",")) return undefined;
1285
- const right = parseExpression();
1286
- expect(")");
1287
- const apply: Expression = {
1288
- kind: "Apply",
1289
- operator: token.text,
1290
- args: [left, right],
1291
- location,
1292
- };
1293
- return withRange(apply, start);
1294
- });
1295
- if (nonfix !== undefined) return nonfix;
1296
- cursor = start;
1297
- }
1298
1404
  if (token.kind === "Operator" || token.kind === "Keyword") {
1299
1405
  switch (token.text) {
1300
1406
  case "~":
@@ -1306,8 +1412,6 @@ const parse = (
1306
1412
  location,
1307
1413
  };
1308
1414
  case "-":
1309
- case "-.":
1310
- if (token.text === "-." && !isTlapm) break;
1311
1415
  advance();
1312
1416
  return {
1313
1417
  kind: "Apply",
@@ -1316,17 +1420,11 @@ const parse = (
1316
1420
  location,
1317
1421
  };
1318
1422
  case "[]":
1319
- advance();
1320
- return { kind: "Always", expression: parsePrefixOperand(token, 4, 15), location };
1321
1423
  case "<>":
1322
- advance();
1323
- return { kind: "Eventually", expression: parsePrefixOperand(token, 4, 15), location };
1324
1424
  case "ENABLED":
1325
- advance();
1326
- return { kind: "Enabled", expression: parsePrefixOperand(token, 4, 15), location };
1327
1425
  case "UNCHANGED":
1328
1426
  advance();
1329
- return { kind: "Unchanged", expression: parsePrefixOperand(token, 4, 15), location };
1427
+ return getOperatorApplication(token.text, parsePrefixOperand(token, 4, 15), location);
1330
1428
  case "SUBSET":
1331
1429
  case "UNION":
1332
1430
  case "DOMAIN":
@@ -1334,7 +1432,7 @@ const parse = (
1334
1432
  return {
1335
1433
  kind: "Apply",
1336
1434
  operator: token.text,
1337
- args: [isTlapm ? parseExpression(9) : parsePrefixOperand(token, 10, 13)],
1435
+ args: [parsePrefixOperand(token, 10, 13)],
1338
1436
  location,
1339
1437
  };
1340
1438
  }
@@ -1342,7 +1440,57 @@ const parse = (
1342
1440
  return parsePrimary(preceding);
1343
1441
  };
1344
1442
 
1345
- const parseExpression = (minimumPrecedence = 0): Expression => {
1443
+ const getInfixApplication = (
1444
+ token: Token,
1445
+ left: Expression,
1446
+ right: Expression,
1447
+ isChained: boolean,
1448
+ prefixEnd: Point,
1449
+ ): Expression => {
1450
+ const location = getLocation(token);
1451
+ if (token.text === "/\\" || token.text === "\\/") {
1452
+ const kind = token.text === "/\\" ? "And" : "Or";
1453
+ return left.kind === kind && isChained
1454
+ ? {
1455
+ ...left,
1456
+ operands: [...left.operands, right],
1457
+ prefixEnds: [...(left.prefixEnds ?? []), prefixEnd],
1458
+ }
1459
+ : { kind, operands: [left, right], prefixEnds: [prefixEnd], location };
1460
+ }
1461
+ if (token.text === "\\X") {
1462
+ return left.kind === "Product" && isChained
1463
+ ? { ...left, factors: [...left.factors, right] }
1464
+ : { kind: "Product", factors: [left, right], location };
1465
+ }
1466
+ return {
1467
+ kind: "Apply",
1468
+ operator: token.text,
1469
+ spelling: token.spelling,
1470
+ args: [left, right],
1471
+ location,
1472
+ };
1473
+ };
1474
+
1475
+ const getPostfixApplication = (token: Token, operand: Expression): Expression =>
1476
+ token.text === "'"
1477
+ ? { kind: "Prime", expression: operand, location: getLocation(token) }
1478
+ : {
1479
+ kind: "Apply",
1480
+ operator: token.text,
1481
+ spelling: token.spelling,
1482
+ args: [operand],
1483
+ location: getLocation(token),
1484
+ };
1485
+
1486
+ const parseFunctionArguments = () => {
1487
+ advance();
1488
+ const args = withBracketLayout(() => parseSeparated(() => parseExpression()));
1489
+ withBracketLayout(() => expect("]"));
1490
+ return args;
1491
+ };
1492
+
1493
+ const parseSanyExpression = (minimumPrecedence: number): Expression => {
1346
1494
  const start = cursor;
1347
1495
  const prefix = parsePrefix();
1348
1496
  let left = prefix.location.range ? prefix : withRange(prefix, start);
@@ -1351,31 +1499,14 @@ const parse = (
1351
1499
  const token = peek();
1352
1500
  if (token.kind !== "Operator") break;
1353
1501
  const location = getLocation(token);
1354
- if (token.text === "'" && minimumPrecedence <= 15) {
1502
+ if (DEFINABLE_POSTFIX_OPERATORS.has(token.text) && minimumPrecedence <= 15) {
1355
1503
  advance();
1356
1504
  lastOperator = POSTFIX_PRECEDENCE;
1357
- left = withRange({ kind: "Prime", expression: left, location }, start);
1358
- continue;
1359
- }
1360
- if (POSTFIX_OPERATORS.has(token.text) && minimumPrecedence <= 15) {
1361
- advance();
1362
- lastOperator = POSTFIX_PRECEDENCE;
1363
- left = withRange(
1364
- {
1365
- kind: "Apply",
1366
- operator: token.text,
1367
- spelling: token.spelling,
1368
- args: [left],
1369
- location,
1370
- },
1371
- start,
1372
- );
1505
+ left = withRange(getPostfixApplication(token, left), start);
1373
1506
  continue;
1374
1507
  }
1375
1508
  if (token.text === "[") {
1376
- advance();
1377
- const args = withBracketLayout(() => parseSeparated(() => parseExpression()));
1378
- withBracketLayout(() => expect("]"));
1509
+ const args = parseFunctionArguments();
1379
1510
  lastOperator = FUNCTION_PRECEDENCE;
1380
1511
  left = withRange({ kind: "FunctionApplication", function: left, args, location }, start);
1381
1512
  continue;
@@ -1399,42 +1530,260 @@ const parse = (
1399
1530
  }
1400
1531
  }
1401
1532
  advance();
1402
- if (!isTlapm && infix.low > NEGATION_PRECEDENCE && isAt("-")) {
1533
+ if (infix.low > NEGATION_PRECEDENCE && isAt("-")) {
1403
1534
  throw createError(`Precedence conflict between ${token.text} and -`, peek());
1404
1535
  }
1405
1536
  lastOperator = precedingOperator = infix;
1406
1537
  const right = parseExpression(infix.high + 1);
1407
- if (token.text === "/\\" || token.text === "\\/") {
1408
- const kind = token.text === "/\\" ? "And" : "Or";
1409
- const prefixEnds = [getRange(start).end];
1410
- left =
1411
- left.kind === kind && previous?.text === token.text
1412
- ? {
1413
- ...left,
1414
- operands: [...left.operands, right],
1415
- prefixEnds: [...(left.prefixEnds ?? []), ...prefixEnds],
1416
- }
1417
- : { kind, operands: [left, right], prefixEnds, location };
1418
- } else if (token.text === "\\X") {
1419
- left =
1420
- left.kind === "Product" && previous?.text === "\\X"
1421
- ? { ...left, factors: [...left.factors, right] }
1422
- : { kind: "Product", factors: [left, right], location };
1423
- } else {
1424
- left = {
1425
- kind: "Apply",
1426
- operator: token.text,
1427
- spelling: token.spelling,
1428
- args: [left, right],
1538
+ const isChained = previous?.text === token.text;
1539
+ left = withRange(
1540
+ getInfixApplication(token, left, right, isChained, getRange(start).end),
1541
+ start,
1542
+ );
1543
+ previous = { ...infix, text: token.text };
1544
+ }
1545
+ return left;
1546
+ };
1547
+
1548
+ const isTlapmAtomStart = (token: Token) =>
1549
+ token.kind === "Number" ||
1550
+ token.kind === "Decimal" ||
1551
+ token.kind === "String" ||
1552
+ token.kind === "Identifier" ||
1553
+ (token.kind === "Step" && isStepReference(token) && /^<\d/.test(token.text)) ||
1554
+ ((token.kind === "Operator" || token.kind === "Keyword") && TLAPM_ATOM_STARTS.has(token.text));
1555
+
1556
+ const getTlapmOperand = (expression: Expression, start: number): TlapmOperand => ({
1557
+ start,
1558
+ end: cursor - 1,
1559
+ expression: expression.location.range ? expression : withRange(expression, start),
1560
+ });
1561
+
1562
+ const getTlapmOperator = (
1563
+ start: number,
1564
+ fixity: TlapmOperator["fixity"],
1565
+ precedence: Precedence,
1566
+ apply: TlapmOperator["apply"],
1567
+ ): TlapmOperator => ({
1568
+ ...precedence,
1569
+ start,
1570
+ end: cursor - 1,
1571
+ fixity,
1572
+ isLeft: false,
1573
+ apply,
1574
+ });
1575
+
1576
+ // expr_or_op's non_test: a postfix operator before an expression in parentheses is an atom.
1577
+ const parseTlapmNonfixPostfix = (token: Token) =>
1578
+ token.kind === "Operator" && DEFINABLE_POSTFIX_OPERATORS.has(token.text) && isAt("(", 1)
1579
+ ? attempt(() =>
1580
+ withBracketLayout(() => {
1581
+ advance();
1582
+ advance();
1583
+ const operand = parseExpression();
1584
+ const end = cursor - 1;
1585
+ expect(")");
1586
+ return { end, expression: getPostfixApplication(token, operand) };
1587
+ }),
1588
+ )
1589
+ : undefined;
1590
+
1591
+ // A comma directly inside the parentheses after the operator, without which non_test's
1592
+ // attempt at `(e, f)` fails. A selector's << or >> isn't a bracket.
1593
+ const hasNonfixComma = () => {
1594
+ let depth = 0;
1595
+ for (let index = cursor + 1; index < tokens.length; index++) {
1596
+ const token = tokens[index];
1597
+ if (token.kind !== "Operator") continue;
1598
+ if (depth === 1 && token.text === ",") return true;
1599
+ if (tokens[index - 1].text === "!") continue;
1600
+ if (OPENING_BRACKETS.has(token.text)) depth++;
1601
+ if (CLOSING_BRACKETS.has(token.text) && --depth === 0) return false;
1602
+ }
1603
+ return false;
1604
+ };
1605
+
1606
+ // expr_or_op's non_test: an infix operator before two expressions in parentheses is an atom.
1607
+ const parseTlapmNonfixInfix = (token: Token) =>
1608
+ isAt("(", 1) && hasNonfixComma()
1609
+ ? attempt(() =>
1610
+ withBracketLayout((): Expression => {
1611
+ advance();
1612
+ advance();
1613
+ const left = parseExpression();
1614
+ expect(",");
1615
+ const right = parseExpression();
1616
+ expect(")");
1617
+ return {
1618
+ kind: "Apply",
1619
+ operator: token.text,
1620
+ args: [left, right],
1621
+ location: getLocation(token),
1622
+ };
1623
+ }),
1624
+ )
1625
+ : undefined;
1626
+
1627
+ const parseTlapmItem = (isStart: boolean): TlapmItem | undefined => {
1628
+ const start = cursor;
1629
+ const token = peek();
1630
+ const location = getLocation(token);
1631
+ const isOperator = token.kind === "Operator" || token.kind === "Keyword";
1632
+ const infix = isOperator ? INFIX_OPERATORS.get(token.text) : undefined;
1633
+ if (!isStart) {
1634
+ if (isAt("[")) {
1635
+ const args = parseFunctionArguments();
1636
+ return getTlapmOperator(start, "Postfix", TLAPM_SELECTION_PRECEDENCE, (operands) => ({
1637
+ kind: "FunctionApplication",
1638
+ function: operands[0].expression,
1639
+ args,
1640
+ location,
1641
+ }));
1642
+ }
1643
+ if (isAt(".") && isFieldName(peek(1))) {
1644
+ advance();
1645
+ const field = advance().text;
1646
+ return getTlapmOperator(start, "Postfix", TLAPM_SELECTION_PRECEDENCE, (operands) => ({
1647
+ kind: "FieldAccess",
1648
+ record: operands[0].expression,
1649
+ field,
1429
1650
  location,
1651
+ }));
1652
+ }
1653
+ if (infix) {
1654
+ // Pco.resolve has no operator to put before that atom, so the expression ends here.
1655
+ if (parseTlapmNonfixInfix(token)) {
1656
+ cursor = start;
1657
+ return undefined;
1658
+ }
1659
+ advance();
1660
+ return {
1661
+ ...getTlapmOperator(start, "Infix", infix, (operands) =>
1662
+ getInfixApplication(
1663
+ token,
1664
+ operands[0].expression,
1665
+ operands[1].expression,
1666
+ operands[0].joinedBy === token.text,
1667
+ getRange(operands[0].start, operands[1].end).end,
1668
+ ),
1669
+ ),
1670
+ isLeft: isTlapmLeft(token.text, infix),
1671
+ joins: token.text,
1430
1672
  };
1431
1673
  }
1432
- left = withRange(left, start);
1433
- previous = { ...infix, text: token.text };
1674
+ if (token.kind !== "Operator" || !DEFINABLE_POSTFIX_OPERATORS.has(token.text))
1675
+ return undefined;
1676
+ // Pco.resolve has no operator to put before that atom, so the expression ends here.
1677
+ if (parseTlapmNonfixPostfix(token)) {
1678
+ cursor = start;
1679
+ return undefined;
1680
+ }
1681
+ advance();
1682
+ return getTlapmOperator(start, "Postfix", POSTFIX_PRECEDENCE, (operands) =>
1683
+ getPostfixApplication(token, operands[0].expression),
1684
+ );
1434
1685
  }
1435
- return left;
1686
+ if (token.kind === "Operator" && isBullet(token))
1687
+ return getTlapmOperand(parseJunctionList(), start);
1688
+ const nonfix = infix ? parseTlapmNonfixInfix(token) : undefined;
1689
+ if (nonfix) return getTlapmOperand(nonfix, start);
1690
+ const nonfixPostfix = parseTlapmNonfixPostfix(token);
1691
+ if (nonfixPostfix) {
1692
+ nonfixPostfix.expression.location.range = getRange(start, nonfixPostfix.end);
1693
+ return { start, end: nonfixPostfix.end, expression: nonfixPostfix.expression };
1694
+ }
1695
+ const prefix = isOperator ? TLAPM_PREFIX_OPERATORS.get(token.text) : undefined;
1696
+ if (prefix) {
1697
+ advance();
1698
+ return getTlapmOperator(start, "Prefix", prefix, (operands) =>
1699
+ getOperatorApplication(
1700
+ token.text === "-" ? "-." : token.text,
1701
+ operands[0].expression,
1702
+ location,
1703
+ ),
1704
+ );
1705
+ }
1706
+ if (!isTlapmAtomStart(token)) return undefined;
1707
+ const isTransparent = token.kind === "Operator" && TLAPM_OPEN_BRACKETS.has(token.text);
1708
+ return getTlapmOperand(isTransparent ? parsePrimary() : commit(parsePrimary), start);
1436
1709
  };
1437
1710
 
1711
+ const isTlapmOperator = (item: TlapmItem | undefined): item is TlapmOperator =>
1712
+ item !== undefined && "fixity" in item;
1713
+
1714
+ const isTlapmOperand = (item: TlapmItem | undefined): item is TlapmOperand =>
1715
+ item !== undefined && !("fixity" in item);
1716
+
1717
+ const applyTlapmOperator = (operator: TlapmOperator, operands: TlapmOperand[]) => {
1718
+ const start = Math.min(operator.start, operands[0].start);
1719
+ const end = Math.max(operator.end, operands[operands.length - 1].end);
1720
+ const expression = operator.apply(operands);
1721
+ expression.location.range = getRange(start, end);
1722
+ return { start, end, expression, joinedBy: operator.joins };
1723
+ };
1724
+
1725
+ const reduceTlapmItems = (stack: TlapmItem[]) => {
1726
+ const right = stack.pop();
1727
+ const operator = stack.pop();
1728
+ if (!isTlapmOperand(right) || !isTlapmOperator(operator)) {
1729
+ throw createError("incomplete expression");
1730
+ }
1731
+ const left = operator.fixity === "Infix" ? stack.pop() : undefined;
1732
+ stack.push(applyTlapmOperator(operator, isTlapmOperand(left) ? [left, right] : [right]));
1733
+ };
1734
+
1735
+ const getPreviousOperator = (stack: TlapmItem[]) => {
1736
+ const previous = stack[stack.length - 2];
1737
+ return isTlapmOperator(previous) ? previous : undefined;
1738
+ };
1739
+
1740
+ const isBelow = (left: Precedence, right: Precedence | undefined) =>
1741
+ right !== undefined && left.high < right.low;
1742
+
1743
+ // Port of Pco.resolve. A failure after the first item backtracks no further than its attempt.
1744
+ const parseTlapmExpression = (): Expression =>
1745
+ withRestorePoint(() => {
1746
+ const first = attempt(() => parseTlapmItem(true));
1747
+ if (first === undefined) {
1748
+ const token = peekRaw();
1749
+ throw token.kind === "End"
1750
+ ? createUnexpected("Unexpected end of expression", token)
1751
+ : createError(`required expressions(s) missing before '${getTlapmName(token)}'`, token);
1752
+ }
1753
+ return commit(() => {
1754
+ const stack = [first];
1755
+ while (true) {
1756
+ const item = attempt(() => parseTlapmItem(isTlapmOperator(stack[stack.length - 1])));
1757
+ if (item === undefined) break;
1758
+ if (isTlapmOperand(item) || item.fixity === "Prefix") {
1759
+ stack.push(item);
1760
+ continue;
1761
+ }
1762
+ while (isBelow(item, getPreviousOperator(stack))) reduceTlapmItems(stack);
1763
+ const operand = stack[stack.length - 1];
1764
+ if (item.fixity === "Postfix" && isTlapmOperand(operand)) {
1765
+ stack.splice(-1, 1, applyTlapmOperator(item, [operand]));
1766
+ continue;
1767
+ }
1768
+ const previous = getPreviousOperator(stack);
1769
+ const isLeftChain =
1770
+ previous?.fixity === "Infix" &&
1771
+ previous.isLeft &&
1772
+ item.isLeft &&
1773
+ !isBelow(previous, item);
1774
+ if (isLeftChain) reduceTlapmItems(stack);
1775
+ stack.push(item);
1776
+ }
1777
+ while (stack.length > 1) reduceTlapmItems(stack);
1778
+ const result = stack[0];
1779
+ if (!isTlapmOperand(result)) throw createError("incomplete expression");
1780
+ return result.expression;
1781
+ });
1782
+ });
1783
+
1784
+ const parseExpression = (minimumPrecedence = 0) =>
1785
+ isTlapm ? parseTlapmExpression() : parseSanyExpression(minimumPrecedence);
1786
+
1438
1787
  const parseParams = () => {
1439
1788
  if (!accept("(")) return [];
1440
1789
  const params = parseDeclarations();
@@ -1783,8 +2132,26 @@ const parse = (
1783
2132
  return defs;
1784
2133
  };
1785
2134
 
2135
+ // tlapm's usebody reads facts while an expression starts after the comma.
2136
+ const parseTlapmFacts = (): Fact[] => {
2137
+ const first = attempt(parseExpression);
2138
+ if (!first) return [];
2139
+ const facts = [first];
2140
+ withRestorePoint(() => {
2141
+ while (isAt(",")) {
2142
+ const fact = attempt(() => {
2143
+ advance();
2144
+ return parseExpression();
2145
+ });
2146
+ if (!fact) return;
2147
+ facts.push(fact);
2148
+ }
2149
+ });
2150
+ return facts;
2151
+ };
2152
+
1786
2153
  const parseFacts = () => {
1787
- const facts = isFactAhead() ? parseSeparated(parseFact) : [];
2154
+ const facts = isTlapm ? parseTlapmFacts() : isFactAhead() ? parseSeparated(parseFact) : [];
1788
2155
  const isDef = accept("DEF") || accept("DEFS");
1789
2156
  if (isTlapm && facts.length === 0 && !isDef) throw createUnexpected("Expected a fact");
1790
2157
  return { facts, defs: isDef ? parseDefs() : [] };
@@ -1864,23 +2231,50 @@ const parse = (
1864
2231
  );
1865
2232
  };
1866
2233
 
2234
+ const parseHypothesis = () => {
2235
+ if (peek().kind === "Identifier" && isAt("::", 1) && isAt("ASSUME", 2)) {
2236
+ advance();
2237
+ advance();
2238
+ }
2239
+ if (isAt("ASSUME")) return withProofScope(parseAssumeProve);
2240
+ if (peek().kind === "Keyword" && NEW_SYMBOL_STARTS.has(peek().text))
2241
+ return isTlapm ? commit(parseNewSymbol) : parseNewSymbol();
2242
+ if (!isTlapm) return parseExpression();
2243
+ // expr_or_sequent: where no expression starts, the sequent's ASSUME fails last.
2244
+ const expression = attempt(parseExpression);
2245
+ if (expression === undefined) throw createUnexpected("Expected a hypothesis");
2246
+ return expression;
2247
+ };
2248
+
2249
+ // comma1 (hyp b): Pco.star attempts the hypotheses after the first, each inside the one before,
2250
+ // so a failure that backtracks ends the list, and tlapm reports any other before the first comma.
2251
+ const parseTlapmHypotheses = () => {
2252
+ const assumptions = [parseHypothesis()];
2253
+ withRestorePoint(() => {
2254
+ while (true) {
2255
+ const assumption = attempt(() => {
2256
+ expect(",");
2257
+ return parseHypothesis();
2258
+ });
2259
+ if (assumption === undefined) break;
2260
+ assumptions.push(assumption);
2261
+ }
2262
+ });
2263
+ return assumptions;
2264
+ };
2265
+
1867
2266
  const parseAssumeProve = (): AssumeProve => {
1868
2267
  const start = cursor;
1869
2268
  const location = getLocation(expect("ASSUME"));
1870
- const assumptions = parseSeparated(() => {
1871
- if (peek().kind === "Identifier" && isAt("::", 1) && isAt("ASSUME", 2)) {
1872
- advance();
1873
- advance();
1874
- }
1875
- if (isAt("ASSUME")) return withProofScope(parseAssumeProve);
1876
- if (peek().kind === "Keyword" && NEW_SYMBOL_STARTS.has(peek().text)) return parseNewSymbol();
1877
- return parseExpression();
1878
- });
1879
- expect("PROVE");
1880
- return withRange(
1881
- { kind: "AssumeProve", assumptions, conclusion: parseExpression(), location },
1882
- start,
1883
- );
2269
+ const parseSequent = (): AssumeProve => {
2270
+ const assumptions = isTlapm ? parseTlapmHypotheses() : parseSeparated(parseHypothesis);
2271
+ expect("PROVE");
2272
+ return withRange(
2273
+ { kind: "AssumeProve", assumptions, conclusion: parseExpression(), location },
2274
+ start,
2275
+ );
2276
+ };
2277
+ return isTlapm ? commit(parseSequent) : parseSequent();
1884
2278
  };
1885
2279
 
1886
2280
  const isNameListAhead = (terminator: string) => {
@@ -1903,7 +2297,7 @@ const parse = (
1903
2297
  const parseStepBody = (): StepBody => {
1904
2298
  const token = peek();
1905
2299
  if (isAt("USE") || isAt("HIDE")) return parseUseOrHide();
1906
- if (isAt("INSTANCE")) {
2300
+ if (!isTlapm && isAt("INSTANCE")) {
1907
2301
  const start = cursor;
1908
2302
  return withRange(parseInstance(undefined, [], false, getLocation(token)), start);
1909
2303
  }
@@ -2092,20 +2486,26 @@ const parse = (
2092
2486
  throw createProofError(
2093
2487
  `Unexpected end of (sub)proof at level ${level} before QED step`,
2094
2488
  levelSpan,
2489
+ NEWLINES,
2095
2490
  );
2096
2491
  }
2097
2492
  if (item.kind === "Leaf") {
2098
2493
  throw createProofError(
2099
2494
  `Expecting a proof step but found a${LEAF_NAMES[item.proof.kind]} leaf proof`,
2100
2495
  item.span,
2496
+ NEWLINES,
2101
2497
  );
2102
2498
  }
2103
2499
  if (!isFirst && item.isProof) {
2104
- throw createProofError("PROOF keyword found in step that does not begin subproof", item.span);
2500
+ throw createProofError(
2501
+ "PROOF keyword found in step that does not begin subproof",
2502
+ item.span,
2503
+ PRINTED_NEWLINE,
2504
+ );
2105
2505
  }
2106
2506
  const implicit = item.token.text[1];
2107
2507
  if (implicit === "+" && !isFirst) {
2108
- throw createProofError("<+> used but no subproof expected", item.span);
2508
+ throw createProofError("<+> used but no subproof expected", item.span, PRINTED_NEWLINE);
2109
2509
  }
2110
2510
  const stepLevel =
2111
2511
  implicit === "*"
@@ -2160,15 +2560,29 @@ const parse = (
2160
2560
  throw createProofError(
2161
2561
  "extra step(s) after finished proof",
2162
2562
  extra.span,
2563
+ NO_NEWLINES,
2163
2564
  "Proof.Parser.toplevel",
2164
2565
  );
2165
2566
  }
2166
2567
  return nested.proof;
2167
2568
  };
2168
2569
 
2169
- const addFactDefinition = (module: Module, definition: Definition) => {
2170
- if (module.definitions.some((other) => other.name === definition.name)) return;
2171
- module.definitions.push(definition);
2570
+ const addFactDefinition = (
2571
+ module: Module,
2572
+ name: string,
2573
+ body: Expression,
2574
+ location: SourceLocation,
2575
+ ) => {
2576
+ if (module.definitions.some((other) => other.name === name)) return;
2577
+ module.definitions.push({
2578
+ kind: "Operator",
2579
+ name,
2580
+ params: [],
2581
+ body,
2582
+ isLocal: false,
2583
+ isRecursive: false,
2584
+ location,
2585
+ });
2172
2586
  };
2173
2587
 
2174
2588
  const parseFactName = () => {
@@ -2179,12 +2593,21 @@ const parse = (
2179
2593
  return name;
2180
2594
  };
2181
2595
 
2596
+ // A theorem whose statement fails to start backtracks in tlapm, whose module ends there.
2597
+ const parseTheoremExpression = () => {
2598
+ if (!isTlapm) return parseExpression();
2599
+ const token = peekRaw();
2600
+ const statement = attempt(parseExpression);
2601
+ if (statement) return statement;
2602
+ throw createUnexpected(`Expected "====" but found ${describeToken(token)}`, token);
2603
+ };
2604
+
2182
2605
  const parseTheorem = (module: Module) => {
2183
2606
  const start = cursor;
2184
2607
  const keyword = advance();
2185
2608
  const name = parseFactName();
2186
2609
  const parsed = withProofScope(() => {
2187
- const statement = isAt("ASSUME") ? parseAssumeProve() : parseExpression();
2610
+ const statement = isAt("ASSUME") ? parseAssumeProve() : parseTheoremExpression();
2188
2611
  if (isTlapm) return { statement, proof: parseTlapmProof() };
2189
2612
  return { statement, proof: isProofStart(peek()) ? parseProof() : undefined };
2190
2613
  });
@@ -2196,21 +2619,7 @@ const parse = (
2196
2619
  module.theorems.push(theorem);
2197
2620
  module.units.push({ kind: "Theorem", theorem });
2198
2621
  if (name === undefined || statement.kind === "AssumeProve") return;
2199
- addFactDefinition(
2200
- module,
2201
- withRange(
2202
- {
2203
- kind: "Operator",
2204
- name,
2205
- params: [],
2206
- body: statement,
2207
- isLocal: false,
2208
- isRecursive: false,
2209
- location: getLocation(keyword),
2210
- },
2211
- start,
2212
- ),
2213
- );
2622
+ addFactDefinition(module, name, statement, theorem.location);
2214
2623
  };
2215
2624
 
2216
2625
  const parseAssumption = (): Assumption => {
@@ -2259,7 +2668,6 @@ const parse = (
2259
2668
  }
2260
2669
  while (true) {
2261
2670
  const tokenIndex = cursor;
2262
- unitStart = tokenIndex;
2263
2671
  const token = peek();
2264
2672
  if (token.kind === "ModuleEnd") {
2265
2673
  location.range = {
@@ -2312,15 +2720,7 @@ const parse = (
2312
2720
  module.assumptions.push(assumption);
2313
2721
  module.units.push({ kind: "Assumption", assumption });
2314
2722
  if (assumption.name !== undefined) {
2315
- addFactDefinition(module, {
2316
- kind: "Operator",
2317
- name: assumption.name,
2318
- params: [],
2319
- body: assumption.expression,
2320
- isLocal: false,
2321
- isRecursive: false,
2322
- location: assumption.location,
2323
- });
2723
+ addFactDefinition(module, assumption.name, assumption.expression, assumption.location);
2324
2724
  }
2325
2725
  continue;
2326
2726
  }