tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.1ebc153bd

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 (530) hide show
  1. package/dist/compile.cjs +3 -3
  2. package/dist/compile.js +1 -1
  3. package/dist/deciders.cjs +37 -36
  4. package/dist/deciders.js +38 -37
  5. package/dist/index.cjs +1 -1
  6. package/dist/index.d.cts +5 -1
  7. package/dist/index.d.ts +5 -1
  8. package/dist/index.js +1 -1
  9. package/dist/parallel-worker.cjs +1 -1
  10. package/dist/parallel-worker.js +1 -1
  11. package/dist/prove-worker.cjs +1 -1
  12. package/dist/prove-worker.js +1 -1
  13. package/dist/prove.cjs +146 -58
  14. package/dist/prove.js +145 -57
  15. package/dist/run.cjs +43 -43
  16. package/dist/run.js +45 -45
  17. package/dist/tlapm.cjs +1 -1
  18. package/dist/tlapm.js +2 -2
  19. package/dist/transfer.cjs +40 -37
  20. package/dist/transfer.js +38 -35
  21. package/dist/worker.cjs +6 -6
  22. package/dist/worker.js +6 -6
  23. package/package.json +1 -1
  24. package/src/ast.ts +4 -3
  25. package/src/bags.ts +46 -28
  26. package/src/check-trace.ts +2 -16
  27. package/src/check.ts +349 -91
  28. package/src/cli/runtime-invariants.ts +20 -56
  29. package/src/cli/tlapm.ts +268 -71
  30. package/src/cli/tlc-arguments.ts +2 -2
  31. package/src/cli/tlc-output.ts +4 -5
  32. package/src/cli/tlc-usage.ts +0 -1
  33. package/src/cli/tlc.ts +26 -7
  34. package/src/cli/xml-exporter.ts +1 -1
  35. package/src/codegen.ts +9 -5
  36. package/src/dependencies.ts +72 -11
  37. package/src/dfid.ts +9 -2
  38. package/src/environment.ts +65 -36
  39. package/src/errors.ts +8 -1
  40. package/src/evaluate.ts +92 -32
  41. package/src/exit-codes.ts +5 -2
  42. package/src/instances.ts +5 -5
  43. package/src/java-overrides.ts +2 -2
  44. package/src/levels.ts +138 -90
  45. package/src/liveness-checker.ts +572 -204
  46. package/src/liveness.ts +47 -32
  47. package/src/obligations/action.ts +0 -2
  48. package/src/obligations/anonymize.ts +2 -6
  49. package/src/obligations/equality.ts +0 -2
  50. package/src/obligations/expression.ts +0 -2
  51. package/src/obligations/format.ts +0 -2
  52. package/src/obligations/generate.ts +0 -2
  53. package/src/obligations/index.ts +9 -8
  54. package/src/obligations/levels.ts +0 -2
  55. package/src/obligations/module.ts +0 -2
  56. package/src/obligations/normalize.ts +1 -6
  57. package/src/obligations/operators.ts +0 -2
  58. package/src/obligations/pragma.ts +2 -2
  59. package/src/obligations/printer.ts +5 -7
  60. package/src/obligations/proof.ts +0 -2
  61. package/src/obligations/regroup.ts +0 -2
  62. package/src/obligations/simplify.ts +0 -2
  63. package/src/obligations/subexpression.ts +1 -4
  64. package/src/obligations/substitution.ts +0 -2
  65. package/src/obligations/temporal.ts +0 -2
  66. package/src/obligations/tuples.ts +0 -2
  67. package/src/parallel-worker.ts +8 -2
  68. package/src/parallel.ts +7 -2
  69. package/src/parser.ts +256 -185
  70. package/src/pretty-print.ts +1 -1
  71. package/src/prover/deciders.ts +1 -8
  72. package/src/prover/isabelle/encode.ts +0 -2
  73. package/src/prover/isabelle/isar/attrib.ts +86 -55
  74. package/src/prover/isabelle/isar/context.ts +25 -26
  75. package/src/prover/isabelle/isar/induct.ts +2 -12
  76. package/src/prover/isabelle/isar/method.ts +6 -10
  77. package/src/prover/isabelle/isar/proof.ts +40 -39
  78. package/src/prover/isabelle/isar/rule-cases.ts +14 -22
  79. package/src/prover/isabelle/isar/theory.ts +16 -17
  80. package/src/prover/isabelle/isar/toplevel.ts +46 -56
  81. package/src/prover/isabelle/isar/type-check.ts +0 -2
  82. package/src/prover/isabelle/provers/blast/blast.ts +0 -2
  83. package/src/prover/isabelle/provers/blast/branch.ts +0 -2
  84. package/src/prover/isabelle/provers/blast/prove.ts +0 -2
  85. package/src/prover/isabelle/provers/blast/rules.ts +0 -2
  86. package/src/prover/isabelle/provers/blast/state.ts +0 -2
  87. package/src/prover/isabelle/provers/blast/term.ts +0 -2
  88. package/src/prover/isabelle/provers/clasimp.ts +1 -3
  89. package/src/prover/isabelle/provers/classical.ts +1 -3
  90. package/src/prover/isabelle/provers/hypsubst.ts +2 -4
  91. package/src/prover/isabelle/pure/bicompose.ts +0 -2
  92. package/src/prover/isabelle/pure/consts.ts +0 -2
  93. package/src/prover/isabelle/pure/conv.ts +0 -2
  94. package/src/prover/isabelle/pure/drule.ts +0 -2
  95. package/src/prover/isabelle/pure/envir.ts +0 -2
  96. package/src/prover/isabelle/pure/goal.ts +0 -2
  97. package/src/prover/isabelle/pure/logic.ts +0 -2
  98. package/src/prover/isabelle/pure/name.ts +0 -2
  99. package/src/prover/isabelle/pure/net.ts +0 -2
  100. package/src/prover/isabelle/pure/object-logic.ts +0 -2
  101. package/src/prover/isabelle/pure/pattern.ts +0 -2
  102. package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
  103. package/src/prover/isabelle/pure/rewriter.ts +3 -5
  104. package/src/prover/isabelle/pure/search.ts +0 -2
  105. package/src/prover/isabelle/pure/seq.ts +0 -2
  106. package/src/prover/isabelle/pure/simplifier.ts +0 -2
  107. package/src/prover/isabelle/pure/table.ts +0 -2
  108. package/src/prover/isabelle/pure/tactic.ts +0 -2
  109. package/src/prover/isabelle/pure/tactical.ts +0 -2
  110. package/src/prover/isabelle/pure/term-ord.ts +0 -2
  111. package/src/prover/isabelle/pure/term.ts +3 -5
  112. package/src/prover/isabelle/pure/thm.ts +0 -2
  113. package/src/prover/isabelle/pure/type.ts +0 -2
  114. package/src/prover/isabelle/pure/unify.ts +0 -2
  115. package/src/prover/isabelle/pure/variable.ts +0 -2
  116. package/src/prover/isabelle/tla/classical-setup.ts +0 -2
  117. package/src/prover/isabelle/tla/simpdata.ts +0 -2
  118. package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
  119. package/src/prover/ocaml.ts +4 -1
  120. package/src/prover/prep/action.ts +1 -0
  121. package/src/prover/prep/md5.ts +26 -29
  122. package/src/prover/prep/methods.ts +55 -6
  123. package/src/prover/prep/normalize.ts +4 -1
  124. package/src/prover/prove.ts +58 -32
  125. package/src/prover/ptl/decide.ts +43 -63
  126. package/src/prover/smt/context.ts +10 -14
  127. package/src/prover/smt/data.ts +51 -45
  128. package/src/prover/smt/encode.ts +1 -2
  129. package/src/prover/smt/rewrite.ts +3 -7
  130. package/src/prover/smt/simplify.ts +1 -1
  131. package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
  132. package/src/prover/smt/solver/ackr-helper.ts +0 -3
  133. package/src/prover/smt/solver/ackr-model-converter.ts +1 -8
  134. package/src/prover/smt/solver/act-cache.ts +0 -1
  135. package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
  136. package/src/prover/smt/solver/aig-tactic.ts +25 -16
  137. package/src/prover/smt/solver/aig.ts +2 -3
  138. package/src/prover/smt/solver/arith-rewriter.ts +4 -7
  139. package/src/prover/smt/solver/arith-terms.ts +0 -2
  140. package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
  141. package/src/prover/smt/solver/array-rewriter.ts +1 -4
  142. package/src/prover/smt/solver/asserted-formulas.ts +67 -3
  143. package/src/prover/smt/solver/ast-lt.ts +2 -3
  144. package/src/prover/smt/solver/ast-util.ts +4 -5
  145. package/src/prover/smt/solver/ast.ts +171 -168
  146. package/src/prover/smt/solver/auf-solver.ts +0 -1
  147. package/src/prover/smt/solver/bit-blast-tactic.ts +2 -11
  148. package/src/prover/smt/solver/bit-blaster.ts +0 -3
  149. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  150. package/src/prover/smt/solver/bound-manager.ts +39 -29
  151. package/src/prover/smt/solver/bound-simplifier.ts +2 -5
  152. package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
  153. package/src/prover/smt/solver/bv-decl-plugin.ts +13 -11
  154. package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
  155. package/src/prover/smt/solver/bv-rewriter.ts +15 -19
  156. package/src/prover/smt/solver/bv1-blast.ts +1 -11
  157. package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
  158. package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
  159. package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
  160. package/src/prover/smt/solver/card2bv.ts +3 -7
  161. package/src/prover/smt/solver/case-split-queue.ts +0 -2
  162. package/src/prover/smt/solver/cg-table.ts +19 -16
  163. package/src/prover/smt/solver/check-logic.ts +6 -2
  164. package/src/prover/smt/solver/clause.ts +0 -1
  165. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +2 -5
  166. package/src/prover/smt/solver/conflict-resolution.ts +8 -8
  167. package/src/prover/smt/solver/context.ts +45 -15
  168. package/src/prover/smt/solver/ctx-simplify.ts +1 -3
  169. package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
  170. package/src/prover/smt/solver/datatype-decl-plugin.ts +22 -17
  171. package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
  172. package/src/prover/smt/solver/demodulator.ts +2 -5
  173. package/src/prover/smt/solver/dependent-expr-state.ts +25 -7
  174. package/src/prover/smt/solver/der.ts +0 -1
  175. package/src/prover/smt/solver/diff-neq.ts +1 -3
  176. package/src/prover/smt/solver/distribute-forall.ts +1 -11
  177. package/src/prover/smt/solver/dom-simplify.ts +1 -3
  178. package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
  179. package/src/prover/smt/solver/dyn-ack.ts +0 -1
  180. package/src/prover/smt/solver/e-matching.ts +6 -7
  181. package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
  182. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  183. package/src/prover/smt/solver/elim-uncnstr.ts +7 -23
  184. package/src/prover/smt/solver/enode.ts +16 -10
  185. package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
  186. package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
  187. package/src/prover/smt/solver/euf/arith-internalize.ts +2 -8
  188. package/src/prover/smt/solver/euf/arith-solver.ts +0 -6
  189. package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
  190. package/src/prover/smt/solver/euf/array-internalize.ts +21 -12
  191. package/src/prover/smt/solver/euf/array-solver.ts +0 -2
  192. package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
  193. package/src/prover/smt/solver/euf/bv-internalize.ts +1 -3
  194. package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
  195. package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
  196. package/src/prover/smt/solver/euf/egraph.ts +69 -53
  197. package/src/prover/smt/solver/euf/euf-solver.ts +38 -37
  198. package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
  199. package/src/prover/smt/solver/euf/mam.ts +7 -55
  200. package/src/prover/smt/solver/euf/q-ematch.ts +27 -98
  201. package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
  202. package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
  203. package/src/prover/smt/solver/euf/q-solver.ts +3 -3
  204. package/src/prover/smt/solver/euf/th-solver.ts +1 -16
  205. package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
  206. package/src/prover/smt/solver/expr-ref.ts +0 -1
  207. package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
  208. package/src/prover/smt/solver/expr2polynomial.ts +204 -80
  209. package/src/prover/smt/solver/factor.ts +37 -26
  210. package/src/prover/smt/solver/fd-solver.ts +3 -5
  211. package/src/prover/smt/solver/fingerprints.ts +0 -1
  212. package/src/prover/smt/solver/fix-dl-var.ts +2 -4
  213. package/src/prover/smt/solver/flat-literals.ts +0 -1
  214. package/src/prover/smt/solver/fm-tactic.ts +25 -14
  215. package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
  216. package/src/prover/smt/solver/fpa-rewriter.ts +12 -14
  217. package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
  218. package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -1
  219. package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
  220. package/src/prover/smt/solver/goal.ts +6 -4
  221. package/src/prover/smt/solver/goal2nlsat.ts +57 -32
  222. package/src/prover/smt/solver/guard-set.ts +0 -1
  223. package/src/prover/smt/solver/hash.ts +0 -1
  224. package/src/prover/smt/solver/hashtable.ts +4 -1
  225. package/src/prover/smt/solver/inf-eps.ts +1 -2
  226. package/src/prover/smt/solver/inj-axiom.ts +0 -1
  227. package/src/prover/smt/solver/internalizer.ts +41 -3
  228. package/src/prover/smt/solver/lackr.ts +0 -2
  229. package/src/prover/smt/solver/lbool.ts +0 -1
  230. package/src/prover/smt/solver/lia2card.ts +1 -2
  231. package/src/prover/smt/solver/lia2pb.ts +18 -5
  232. package/src/prover/smt/solver/literal.ts +0 -1
  233. package/src/prover/smt/solver/logic-tactics.ts +9 -6
  234. package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
  235. package/src/prover/smt/solver/lp/constraints.ts +0 -1
  236. package/src/prover/smt/solver/lp/containers.ts +7 -2
  237. package/src/prover/smt/solver/lp/core-solver.ts +0 -3
  238. package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
  239. package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
  240. package/src/prover/smt/solver/lp/dependency.ts +0 -2
  241. package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
  242. package/src/prover/smt/solver/lp/explanation.ts +0 -1
  243. package/src/prover/smt/solver/lp/gomory.ts +0 -1
  244. package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
  245. package/src/prover/smt/solver/lp/hnf.ts +0 -3
  246. package/src/prover/smt/solver/lp/int-cube.ts +0 -1
  247. package/src/prover/smt/solver/lp/int-solver.ts +0 -2
  248. package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
  249. package/src/prover/smt/solver/lp/lar-term.ts +0 -1
  250. package/src/prover/smt/solver/lp/lp-settings.ts +1 -2
  251. package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
  252. package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
  253. package/src/prover/smt/solver/lp/nex.ts +2 -2
  254. package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
  255. package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
  256. package/src/prover/smt/solver/lp/nla-core.ts +26 -7
  257. package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
  258. package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
  259. package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
  260. package/src/prover/smt/solver/lp/nla-grobner.ts +158 -82
  261. package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
  262. package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
  263. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
  264. package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
  265. package/src/prover/smt/solver/lp/nla-order.ts +0 -2
  266. package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
  267. package/src/prover/smt/solver/lp/nla-powers.ts +144 -108
  268. package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
  269. package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
  270. package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -19
  271. package/src/prover/smt/solver/lp/nla-types.ts +0 -2
  272. package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
  273. package/src/prover/smt/solver/lp/nra-solver.ts +138 -97
  274. package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
  275. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
  276. package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
  277. package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
  278. package/src/prover/smt/solver/lp/pdd.ts +725 -290
  279. package/src/prover/smt/solver/lp/random-updater.ts +0 -2
  280. package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
  281. package/src/prover/smt/solver/lp/union-find.ts +1 -2
  282. package/src/prover/smt/solver/macro-finder.ts +1 -4
  283. package/src/prover/smt/solver/mam-compiler.ts +14 -15
  284. package/src/prover/smt/solver/mam-interpreter.ts +0 -1
  285. package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
  286. package/src/prover/smt/solver/max-cliques.ts +0 -2
  287. package/src/prover/smt/solver/maxcore.ts +6 -15
  288. package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -2
  289. package/src/prover/smt/solver/maxlex.ts +0 -8
  290. package/src/prover/smt/solver/maxsmt-base.ts +7 -1
  291. package/src/prover/smt/solver/maxsmt.ts +0 -1
  292. package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
  293. package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
  294. package/src/prover/smt/solver/mbp/mbp-plugin.ts +10 -3
  295. package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
  296. package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
  297. package/src/prover/smt/solver/mbp/mbp-term-graph.ts +1 -19
  298. package/src/prover/smt/solver/model-based-opt.ts +1 -2
  299. package/src/prover/smt/solver/model-checker.ts +2 -3
  300. package/src/prover/smt/solver/model-evaluator.ts +9 -6
  301. package/src/prover/smt/solver/model-finder.ts +0 -1
  302. package/src/prover/smt/solver/model-generator.ts +3 -2
  303. package/src/prover/smt/solver/model-macro-solver.ts +3 -4
  304. package/src/prover/smt/solver/model-printer.ts +0 -1
  305. package/src/prover/smt/solver/mpf.ts +2 -5
  306. package/src/prover/smt/solver/mus.ts +2 -4
  307. package/src/prover/smt/solver/muz/dl-context.ts +67 -19
  308. package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
  309. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
  310. package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
  311. package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -6
  312. package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
  313. package/src/prover/smt/solver/muz/dl-mk-slice.ts +78 -16
  314. package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
  315. package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -30
  316. package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
  317. package/src/prover/smt/solver/muz/dl-rule.ts +93 -57
  318. package/src/prover/smt/solver/muz/hnf.ts +6 -6
  319. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
  320. package/src/prover/smt/solver/muz/horn-tactic.ts +15 -6
  321. package/src/prover/smt/solver/muz/rule-properties.ts +195 -37
  322. package/src/prover/smt/solver/muz/spacer-context.ts +111 -102
  323. package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -4
  324. package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
  325. package/src/prover/smt/solver/muz/spacer-manager.ts +0 -6
  326. package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
  327. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +4 -15
  328. package/src/prover/smt/solver/muz/spacer-util.ts +2 -29
  329. package/src/prover/smt/solver/muz/substitution.ts +88 -39
  330. package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
  331. package/src/prover/smt/solver/nlqsat.ts +5 -5
  332. package/src/prover/smt/solver/nlsat/algebraic.ts +197 -96
  333. package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
  334. package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
  335. package/src/prover/smt/solver/nlsat/explain.ts +379 -217
  336. package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
  337. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
  338. package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
  339. package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
  340. package/src/prover/smt/solver/nlsat/solver.ts +118 -105
  341. package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
  342. package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
  343. package/src/prover/smt/solver/nlsat/types.ts +0 -2
  344. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
  345. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
  346. package/src/prover/smt/solver/nlsat-tactic.ts +1 -2
  347. package/src/prover/smt/solver/nnf.ts +6 -3
  348. package/src/prover/smt/solver/normalize-bounds.ts +0 -1
  349. package/src/prover/smt/solver/occf.ts +0 -1
  350. package/src/prover/smt/solver/opt-context.ts +19 -13
  351. package/src/prover/smt/solver/opt-nlsat.ts +97 -77
  352. package/src/prover/smt/solver/opt-pareto.ts +0 -2
  353. package/src/prover/smt/solver/opt-preprocess.ts +1 -2
  354. package/src/prover/smt/solver/opt-solver.ts +22 -11
  355. package/src/prover/smt/solver/opt-value.ts +0 -1
  356. package/src/prover/smt/solver/optsmt.ts +13 -12
  357. package/src/prover/smt/solver/parallel-tactic.ts +0 -2
  358. package/src/prover/smt/solver/pattern-inference.ts +2 -3
  359. package/src/prover/smt/solver/pb-rewriter.ts +15 -30
  360. package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
  361. package/src/prover/smt/solver/poly-rewriter.ts +76 -21
  362. package/src/prover/smt/solver/probes.ts +91 -28
  363. package/src/prover/smt/solver/propagate-values.ts +4 -1
  364. package/src/prover/smt/solver/proto-model.ts +9 -12
  365. package/src/prover/smt/solver/pull-quant.ts +0 -1
  366. package/src/prover/smt/solver/purify-arith.ts +50 -16
  367. package/src/prover/smt/solver/qe-arith-plugin.ts +4 -7
  368. package/src/prover/smt/solver/qe-lite-der.ts +0 -1
  369. package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
  370. package/src/prover/smt/solver/qe-lite.ts +2 -3
  371. package/src/prover/smt/solver/qe-mbp.ts +13 -24
  372. package/src/prover/smt/solver/qe.ts +48 -57
  373. package/src/prover/smt/solver/qel.ts +0 -1
  374. package/src/prover/smt/solver/qi-queue.ts +0 -1
  375. package/src/prover/smt/solver/qsat.ts +71 -97
  376. package/src/prover/smt/solver/quant-hoist.ts +2 -1
  377. package/src/prover/smt/solver/quant-tactics.ts +0 -1
  378. package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
  379. package/src/prover/smt/solver/quantifier-manager.ts +14 -10
  380. package/src/prover/smt/solver/quasi-macros.ts +9 -20
  381. package/src/prover/smt/solver/random-gen.ts +0 -1
  382. package/src/prover/smt/solver/rational.ts +17 -1
  383. package/src/prover/smt/solver/recfun-decl-plugin.ts +35 -21
  384. package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
  385. package/src/prover/smt/solver/reduce-args.ts +0 -1
  386. package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
  387. package/src/prover/smt/solver/ref-vector.ts +0 -1
  388. package/src/prover/smt/solver/relevancy.ts +0 -1
  389. package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
  390. package/src/prover/smt/solver/rewriter.ts +1 -2
  391. package/src/prover/smt/solver/rlimit.ts +17 -1
  392. package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
  393. package/src/prover/smt/solver/sat/big.ts +0 -1
  394. package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
  395. package/src/prover/smt/solver/sat/clause.ts +2 -20
  396. package/src/prover/smt/solver/sat/cleaner.ts +0 -2
  397. package/src/prover/smt/solver/sat/config.ts +6 -9
  398. package/src/prover/smt/solver/sat/consequences.ts +1 -2
  399. package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
  400. package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
  401. package/src/prover/smt/solver/sat/inc-sat-solver.ts +30 -15
  402. package/src/prover/smt/solver/sat/model-converter.ts +2 -22
  403. package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
  404. package/src/prover/smt/solver/sat/pb-solver.ts +50 -26
  405. package/src/prover/smt/solver/sat/probing.ts +22 -21
  406. package/src/prover/smt/solver/sat/sat-tactic.ts +4 -4
  407. package/src/prover/smt/solver/sat/sat2goal.ts +9 -15
  408. package/src/prover/smt/solver/sat/scc.ts +1 -2
  409. package/src/prover/smt/solver/sat/simplifier.ts +16 -60
  410. package/src/prover/smt/solver/sat/solver.ts +47 -70
  411. package/src/prover/smt/solver/sat/var-queue.ts +0 -2
  412. package/src/prover/smt/solver/sat/watch-list.ts +7 -3
  413. package/src/prover/smt/solver/search-tree.ts +0 -1
  414. package/src/prover/smt/solver/seq-axioms.ts +21 -39
  415. package/src/prover/smt/solver/seq-decl-plugin.ts +10 -14
  416. package/src/prover/smt/solver/seq-derive.ts +11 -16
  417. package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
  418. package/src/prover/smt/solver/seq-eq-solver.ts +9 -10
  419. package/src/prover/smt/solver/seq-factory.ts +2 -4
  420. package/src/prover/smt/solver/seq-monadic.ts +7 -7
  421. package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
  422. package/src/prover/smt/solver/seq-re-rewriter.ts +5 -130
  423. package/src/prover/smt/solver/seq-re-util.ts +8 -27
  424. package/src/prover/smt/solver/seq-regex-bisim.ts +2 -3
  425. package/src/prover/smt/solver/seq-regex-live.ts +6 -8
  426. package/src/prover/smt/solver/seq-rewriter.ts +32 -35
  427. package/src/prover/smt/solver/seq-skolem.ts +0 -24
  428. package/src/prover/smt/solver/seq-subset.ts +0 -1
  429. package/src/prover/smt/solver/seq-view-witness.ts +4 -6
  430. package/src/prover/smt/solver/smt-consequences.ts +0 -2
  431. package/src/prover/smt/solver/smt-kernel.ts +9 -5
  432. package/src/prover/smt/solver/smt-logics.ts +0 -1
  433. package/src/prover/smt/solver/smt-setup.ts +86 -20
  434. package/src/prover/smt/solver/smt2-printer.ts +0 -2
  435. package/src/prover/smt/solver/smtlib-parser.ts +1681 -721
  436. package/src/prover/smt/solver/smtlib-script.ts +1273 -793
  437. package/src/prover/smt/solver/solve-eqs.ts +13 -23
  438. package/src/prover/smt/solver/solver.ts +1 -2
  439. package/src/prover/smt/solver/static-features.ts +0 -5
  440. package/src/prover/smt/solver/sticky-generations.ts +0 -1
  441. package/src/prover/smt/solver/tactic.ts +269 -130
  442. package/src/prover/smt/solver/term-enumeration.ts +0 -1
  443. package/src/prover/smt/solver/theory-array.ts +25 -60
  444. package/src/prover/smt/solver/theory-bv.ts +15 -54
  445. package/src/prover/smt/solver/theory-char.ts +0 -1
  446. package/src/prover/smt/solver/theory-datatype.ts +0 -1
  447. package/src/prover/smt/solver/theory-finite-set.ts +2 -2
  448. package/src/prover/smt/solver/theory-fpa.ts +46 -79
  449. package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
  450. package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
  451. package/src/prover/smt/solver/theory-lra-final-check.ts +1 -2
  452. package/src/prover/smt/solver/theory-lra-internalize.ts +9 -1
  453. package/src/prover/smt/solver/theory-lra-model.ts +0 -1
  454. package/src/prover/smt/solver/theory-lra-propagate.ts +6 -5
  455. package/src/prover/smt/solver/theory-lra-state.ts +0 -1
  456. package/src/prover/smt/solver/theory-lra.ts +0 -7
  457. package/src/prover/smt/solver/theory-pb.ts +34 -15
  458. package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
  459. package/src/prover/smt/solver/theory-recfun.ts +2 -3
  460. package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
  461. package/src/prover/smt/solver/theory-seq-solve.ts +6 -8
  462. package/src/prover/smt/solver/theory-seq-state.ts +8 -36
  463. package/src/prover/smt/solver/theory-seq.ts +32 -55
  464. package/src/prover/smt/solver/theory.ts +16 -2
  465. package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
  466. package/src/prover/smt/solver/var-subst.ts +6 -6
  467. package/src/prover/smt/table.ts +3 -2
  468. package/src/prover/tlapm/cache.ts +8 -8
  469. package/src/prover/zenon/decide.ts +9 -13
  470. package/src/prover/zenon/encode.ts +0 -2
  471. package/src/prover/zenon/eqrel.ts +0 -2
  472. package/src/prover/zenon/equality-rules.ts +24 -2
  473. package/src/prover/zenon/expr.ts +21 -2
  474. package/src/prover/zenon/index-table.ts +7 -4
  475. package/src/prover/zenon/isar-case.ts +1 -3
  476. package/src/prover/zenon/isar.ts +2 -4
  477. package/src/prover/zenon/llproof.ts +0 -2
  478. package/src/prover/zenon/mltoll.ts +0 -2
  479. package/src/prover/zenon/node.ts +12 -13
  480. package/src/prover/zenon/parse.ts +0 -2
  481. package/src/prover/zenon/phrase.ts +1 -3
  482. package/src/prover/zenon/proof.ts +0 -2
  483. package/src/prover/zenon/propositional-rules.ts +0 -2
  484. package/src/prover/zenon/rules.ts +2 -3
  485. package/src/prover/zenon/search.ts +0 -2
  486. package/src/prover/zenon/tla/functions.ts +0 -2
  487. package/src/prover/zenon/tla/llproof.ts +0 -2
  488. package/src/prover/zenon/tla/records.ts +0 -2
  489. package/src/prover/zenon/tla/rewrites.ts +0 -2
  490. package/src/prover/zenon/tla/sets.ts +1 -3
  491. package/src/prover/zenon/tla/terms.ts +0 -2
  492. package/src/prover/zenon/tla/tla.ts +0 -2
  493. package/src/resolve.ts +625 -189
  494. package/src/runtime.ts +7 -1
  495. package/src/sany/builtins.ts +10 -10
  496. package/src/sany/generation.ts +2 -13
  497. package/src/sany/generator-definitions.ts +3 -1
  498. package/src/sany/generator-expressions.ts +36 -30
  499. package/src/sany/generator-proofs.ts +5 -3
  500. package/src/sany/generator.ts +2 -1
  501. package/src/sany/levels.ts +0 -2
  502. package/src/sany/lexer.ts +3 -3
  503. package/src/sany/linter.ts +0 -2
  504. package/src/sany/modules.ts +4 -2
  505. package/src/sany/nodes.ts +1 -1
  506. package/src/sany/selectors.ts +11 -6
  507. package/src/sany/xml.ts +2 -3
  508. package/src/search.ts +209 -56
  509. package/src/simulate.ts +3 -0
  510. package/src/spec-description.ts +2 -2
  511. package/src/standard-definitions.ts +4 -0
  512. package/src/state-graph.ts +0 -2
  513. package/src/subexpressions.ts +265 -94
  514. package/src/successors.ts +2 -1
  515. package/src/symmetry.ts +3 -3
  516. package/src/tableau.ts +2 -2
  517. package/src/tlc/fingerprint.ts +81 -9
  518. package/src/tlc/jar-data.ts +10 -0
  519. package/src/tlc/messages.ts +3 -3
  520. package/src/tlc/order.ts +14 -3
  521. package/src/tlc/summary.ts +29 -14
  522. package/src/tlc/tlc-operators.ts +3 -1
  523. package/src/tlc/tlcext-operators.ts +61 -16
  524. package/src/tlc/trace-spec.ts +5 -5
  525. package/src/typed-tier.ts +6541 -0
  526. package/src/typescript/types.ts +2 -2
  527. package/src/values.ts +46 -27
  528. package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
  529. package/src/prover/smt/solver/z3-license.txt +0 -10
  530. package/src/prover/zenon/LICENSE +0 -32
package/src/parser.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  import type {
2
2
  AssumeProve,
3
3
  Assumption,
4
- Bound,
5
4
  BoundPattern,
6
5
  CaseArm,
7
6
  Declaration,
@@ -22,7 +21,7 @@ import type {
22
21
  StepBody,
23
22
  UseOrHide,
24
23
  } from "./ast";
25
- import { createSanyError, formatRange, TlaSyntaxError } from "./errors";
24
+ import { TlaSyntaxError } from "./errors";
26
25
  import { getNumeralValue, readAtAsIdentifier, tokenize, type Token } from "./lexer";
27
26
  import { getSanyParseError } from "./sany/parse-error";
28
27
 
@@ -376,13 +375,30 @@ const getSpan = (range: SourceRange): Span => ({
376
375
  stop: { line: range.end.line, column: range.end.column + 1 },
377
376
  });
378
377
 
379
- const createProofError = (message: string, span: Span, exception = "Proof.Parser") =>
378
+ interface ProofErrorEnds {
379
+ printed: string;
380
+ set: string;
381
+ }
382
+
383
+ const NO_NEWLINES: ProofErrorEnds = { printed: "", set: "" };
384
+
385
+ const PRINTED_NEWLINE: ProofErrorEnds = { printed: "\n", set: "" };
386
+
387
+ const NEWLINES: ProofErrorEnds = { printed: "\n", set: "\n" };
388
+
389
+ // p_parser.ml ends some of the messages it prints, and of those it sets, with a newline.
390
+ const createProofError = (
391
+ message: string,
392
+ span: Span,
393
+ ends: ProofErrorEnds,
394
+ exception = "Proof.Parser",
395
+ ) =>
380
396
  new TlaSyntaxError(message, undefined, {
381
- reason: message,
397
+ reason: `${message}${ends.set}`,
382
398
  line: span.start.line,
383
399
  column: span.start.column,
384
400
  isEnd: false,
385
- proof: { stop: span.stop, exception },
401
+ proof: { stop: span.stop, exception, printed: `${message}${ends.printed}` },
386
402
  });
387
403
 
388
404
  const FACT_KEYWORDS = new Set([
@@ -484,8 +500,6 @@ const parse = (
484
500
  let lastOperator: Precedence | undefined;
485
501
  let precedingOperator: Precedence | undefined;
486
502
  const recursiveScopes: Set<string>[] = [];
487
- const factNames = new Set<string>();
488
- const proofScopes: Set<string>[] = [];
489
503
  const openModules: Module[] = [];
490
504
  // Pco's backtracking: a failure not past a commit rewinds to its attempt's frame.
491
505
  let attemptFrame: number | undefined;
@@ -636,6 +650,7 @@ const parse = (
636
650
  return result;
637
651
  };
638
652
 
653
+ // Deviation from SANY: TLAplusParser#belchDEF reads a field named THEOREM, AXIOM, DOMAIN or a like keyword as that keyword, so SANY rejects the definition after it.
639
654
  const isFieldName = (token: Token) =>
640
655
  (token.kind === "Identifier" ||
641
656
  token.kind === "Keyword" ||
@@ -951,14 +966,19 @@ const parse = (
951
966
  const bullet = advance();
952
967
  offsideColumns.push(bullet.column);
953
968
  const operands = [parseExpression()];
954
- while (
955
- isBullet(peekRaw()) &&
956
- peekRaw().text === bullet.text &&
957
- peekRaw().column === bullet.column
958
- ) {
959
- cursor++;
960
- operands.push(parseExpression());
961
- }
969
+ const parseItems = () => {
970
+ while (
971
+ isBullet(peekRaw()) &&
972
+ peekRaw().text === bullet.text &&
973
+ peekRaw().column === bullet.column
974
+ ) {
975
+ cursor++;
976
+ operands.push(parseExpression());
977
+ }
978
+ };
979
+ // bulleted_list: a first item that fails leaves expr_or_op's other readings to fail after it.
980
+ if (isTlapm) commit(parseItems);
981
+ else parseItems();
962
982
  offsideColumns.pop();
963
983
  return {
964
984
  kind: bullet.text === "/\\" ? "And" : "Or",
@@ -1179,6 +1199,55 @@ const parse = (
1179
1199
  return { kind: "Name", name: token.text, args: isAt("(") ? parseArguments() : [] };
1180
1200
  };
1181
1201
 
1202
+ const parseSelections = (
1203
+ name: string,
1204
+ args: Expression[],
1205
+ argumentsRange: SourceRange | undefined,
1206
+ start: number,
1207
+ location: SourceLocation,
1208
+ ): Expression => {
1209
+ const selectors: Selector[] = [{ kind: "Name", name, args }];
1210
+ const selectorRanges = [getRange(start, start)];
1211
+ const argumentRanges = [argumentsRange];
1212
+ while (isSelectorAhead()) {
1213
+ advance();
1214
+ const selectorStart = cursor;
1215
+ lastArgumentsRange = undefined;
1216
+ const selector = parseSelector();
1217
+ selectorRanges.push(
1218
+ selector.kind === "Bound"
1219
+ ? getRange(selectorStart)
1220
+ : getRange(selectorStart, selectorStart),
1221
+ );
1222
+ selectors.push(selector);
1223
+ argumentRanges.push(lastArgumentsRange);
1224
+ }
1225
+ const names = selectors.flatMap((selector) =>
1226
+ selector.kind === "Name" ? [selector.name] : [],
1227
+ );
1228
+ const operator = names.join("!");
1229
+ const qualifiedArgs = selectors.flatMap((selector) =>
1230
+ "args" in selector ? selector.args : [],
1231
+ );
1232
+ const argumentCounts = selectors.map((selector) =>
1233
+ "args" in selector ? selector.args.length : 0,
1234
+ );
1235
+ return names.length < selectors.length
1236
+ ? { kind: "Subexpression", selectors, selectorRanges, argumentRanges, location }
1237
+ : qualifiedArgs.length === 0
1238
+ ? { kind: "Identifier", name: operator, selectorRanges, location }
1239
+ : {
1240
+ kind: "Apply",
1241
+ operator,
1242
+ args: qualifiedArgs,
1243
+ ...(argumentCounts.slice(0, -1).some((count) => count > 0) && { argumentCounts }),
1244
+ argumentsRange: argumentRanges.at(-1) ?? getRange(start),
1245
+ selectorRanges,
1246
+ argumentRanges,
1247
+ location,
1248
+ };
1249
+ };
1250
+
1182
1251
  const parsePrimary = (preceding?: Precedence): Expression => {
1183
1252
  const start = cursor;
1184
1253
  const token = advance();
@@ -1230,56 +1299,45 @@ const parse = (
1230
1299
  if (name === "@" && !hasArguments && !isSelectorAhead())
1231
1300
  return { kind: "ExceptAt", location };
1232
1301
  const args = hasArguments ? parseArguments() : [];
1233
- const argumentRanges = [hasArguments ? lastArgumentsRange : undefined];
1234
1302
  if (!isSelectorAhead()) {
1235
1303
  return hasArguments
1236
1304
  ? { kind: "Apply", operator: name, args, argumentsRange: lastArgumentsRange, location }
1237
1305
  : { kind: "Identifier", name, location };
1238
1306
  }
1239
- const selectors: Selector[] = [{ kind: "Name", name, args }];
1240
- const selectorRanges = [getRange(start, start)];
1241
- while (isSelectorAhead()) {
1242
- advance();
1243
- selectorRanges.push(getRange(cursor, cursor));
1244
- lastArgumentsRange = undefined;
1245
- selectors.push(parseSelector());
1246
- argumentRanges.push(lastArgumentsRange);
1247
- }
1248
- const names = selectors.flatMap((selector) =>
1249
- selector.kind === "Name" ? [selector.name] : [],
1250
- );
1251
- const operator = names.join("!");
1252
- const qualifiedArgs = selectors.flatMap((selector) =>
1253
- "args" in selector ? selector.args : [],
1254
- );
1255
- const argumentCounts = selectors.map((selector) =>
1256
- "args" in selector ? selector.args.length : 0,
1307
+ return parseSelections(
1308
+ name,
1309
+ args,
1310
+ hasArguments ? lastArgumentsRange : undefined,
1311
+ start,
1312
+ location,
1257
1313
  );
1258
- const argumentsRange = argumentRanges.at(-1) ?? getRange(start);
1259
- return names.length < selectors.length
1260
- ? { kind: "Subexpression", selectors, selectorRanges, argumentRanges, location }
1261
- : qualifiedArgs.length === 0
1262
- ? { kind: "Identifier", name: operator, selectorRanges, location }
1263
- : {
1264
- kind: "Apply",
1265
- operator,
1266
- args: qualifiedArgs,
1267
- ...(argumentCounts.slice(0, -1).some((count) => count > 0) && { argumentCounts }),
1268
- argumentsRange,
1269
- selectorRanges,
1270
- argumentRanges,
1271
- location,
1272
- };
1273
1314
  }
1274
- if (token.kind === "Operator" && isOperatorName(token.text) && isAt("(")) {
1315
+ const isOperatorNamed =
1316
+ token.kind === "Operator" && (isOperatorName(token.text) || (token.text === "'" && !isTlapm));
1317
+ if (isOperatorNamed && isAt("(")) {
1275
1318
  const args = parseArguments();
1319
+ if (!isTlapm && isSelectorAhead()) {
1320
+ return parseSelections(token.text, args, lastArgumentsRange, start, location);
1321
+ }
1276
1322
  // Deviation from TLC: SANY's built-in \X has no definition for TLC to evaluate, a TLC bug.
1277
- return mode === "tlc" && token.text === "\\X" && args.length === 2
1278
- ? { kind: "Product", factors: args, location }
1279
- : { kind: "Apply", operator: token.text, spelling: token.spelling, args, location };
1323
+ if (mode === "tlc" && token.text === "\\X" && args.length === 2) {
1324
+ return { kind: "Product", factors: args, location };
1325
+ }
1326
+ return token.text === "'" && args.length === 1
1327
+ ? { kind: "Prime", expression: args[0], location }
1328
+ : {
1329
+ kind: "Apply",
1330
+ operator: token.text,
1331
+ spelling: token.spelling,
1332
+ args,
1333
+ argumentsRange: lastArgumentsRange,
1334
+ location,
1335
+ };
1280
1336
  }
1281
- if (token.kind === "Operator" && isOperatorName(token.text) && !isTlapm) {
1282
- return { kind: "Identifier", name: token.text, spelling: token.spelling, location };
1337
+ if (isOperatorNamed && !isTlapm) {
1338
+ return isSelectorAhead()
1339
+ ? parseSelections(token.text, [], undefined, start, location)
1340
+ : { kind: "Identifier", name: token.text, spelling: token.spelling, location };
1283
1341
  }
1284
1342
  switch (token.text) {
1285
1343
  case "(": {
@@ -1312,11 +1370,12 @@ const parse = (
1312
1370
  case "LET": {
1313
1371
  const definitions: Definition[] = [];
1314
1372
  const instances: Instance[] = [];
1373
+ const recursive: Declaration[] = [];
1315
1374
  recursiveScopes.push(new Set());
1316
1375
  while (!accept("IN")) {
1317
1376
  if (isTlapm && isAt("RECURSIVE")) throw createUnexpected("Unexpected keyword RECURSIVE");
1318
1377
  if (accept("RECURSIVE")) {
1319
- declareRecursive();
1378
+ recursive.push(...declareRecursive());
1320
1379
  continue;
1321
1380
  }
1322
1381
  const unit = parseDefinition(!isTlapm && accept("LOCAL"));
@@ -1324,10 +1383,14 @@ const parse = (
1324
1383
  else definitions.push(unit);
1325
1384
  }
1326
1385
  recursiveScopes.pop();
1327
- const body = parseExpression();
1328
- return instances.length === 0
1329
- ? { kind: "Let", definitions, body, location }
1330
- : { kind: "Let", definitions, instances, body, location };
1386
+ return {
1387
+ kind: "Let",
1388
+ definitions,
1389
+ ...(instances.length > 0 && { instances }),
1390
+ ...(recursive.length > 0 && { recursive }),
1391
+ body: parseExpression(),
1392
+ location,
1393
+ };
1331
1394
  }
1332
1395
  case "CHOOSE": {
1333
1396
  const pattern = parsePattern();
@@ -1551,6 +1614,57 @@ const parse = (
1551
1614
  apply,
1552
1615
  });
1553
1616
 
1617
+ // expr_or_op's non_test: a postfix operator before an expression in parentheses is an atom.
1618
+ const parseTlapmNonfixPostfix = (token: Token) =>
1619
+ token.kind === "Operator" && DEFINABLE_POSTFIX_OPERATORS.has(token.text) && isAt("(", 1)
1620
+ ? attempt(() =>
1621
+ withBracketLayout(() => {
1622
+ advance();
1623
+ advance();
1624
+ const operand = parseExpression();
1625
+ const end = cursor - 1;
1626
+ expect(")");
1627
+ return { end, expression: getPostfixApplication(token, operand) };
1628
+ }),
1629
+ )
1630
+ : undefined;
1631
+
1632
+ // A comma directly inside the parentheses after the operator, without which non_test's
1633
+ // attempt at `(e, f)` fails. A selector's << or >> isn't a bracket.
1634
+ const hasNonfixComma = () => {
1635
+ let depth = 0;
1636
+ for (let index = cursor + 1; index < tokens.length; index++) {
1637
+ const token = tokens[index];
1638
+ if (token.kind !== "Operator") continue;
1639
+ if (depth === 1 && token.text === ",") return true;
1640
+ if (tokens[index - 1].text === "!") continue;
1641
+ if (OPENING_BRACKETS.has(token.text)) depth++;
1642
+ if (CLOSING_BRACKETS.has(token.text) && --depth === 0) return false;
1643
+ }
1644
+ return false;
1645
+ };
1646
+
1647
+ // expr_or_op's non_test: an infix operator before two expressions in parentheses is an atom.
1648
+ const parseTlapmNonfixInfix = (token: Token) =>
1649
+ isAt("(", 1) && hasNonfixComma()
1650
+ ? attempt(() =>
1651
+ withBracketLayout((): Expression => {
1652
+ advance();
1653
+ advance();
1654
+ const left = parseExpression();
1655
+ expect(",");
1656
+ const right = parseExpression();
1657
+ expect(")");
1658
+ return {
1659
+ kind: "Apply",
1660
+ operator: token.text,
1661
+ args: [left, right],
1662
+ location: getLocation(token),
1663
+ };
1664
+ }),
1665
+ )
1666
+ : undefined;
1667
+
1554
1668
  const parseTlapmItem = (isStart: boolean): TlapmItem | undefined => {
1555
1669
  const start = cursor;
1556
1670
  const token = peek();
@@ -1578,6 +1692,11 @@ const parse = (
1578
1692
  }));
1579
1693
  }
1580
1694
  if (infix) {
1695
+ // Pco.resolve has no operator to put before that atom, so the expression ends here.
1696
+ if (parseTlapmNonfixInfix(token)) {
1697
+ cursor = start;
1698
+ return undefined;
1699
+ }
1581
1700
  advance();
1582
1701
  return {
1583
1702
  ...getTlapmOperator(start, "Infix", infix, (operands) =>
@@ -1595,28 +1714,25 @@ const parse = (
1595
1714
  }
1596
1715
  if (token.kind !== "Operator" || !DEFINABLE_POSTFIX_OPERATORS.has(token.text))
1597
1716
  return undefined;
1717
+ // Pco.resolve has no operator to put before that atom, so the expression ends here.
1718
+ if (parseTlapmNonfixPostfix(token)) {
1719
+ cursor = start;
1720
+ return undefined;
1721
+ }
1598
1722
  advance();
1599
1723
  return getTlapmOperator(start, "Postfix", POSTFIX_PRECEDENCE, (operands) =>
1600
1724
  getPostfixApplication(token, operands[0].expression),
1601
1725
  );
1602
1726
  }
1603
1727
  if (token.kind === "Operator" && isBullet(token))
1604
- return getTlapmOperand(commit(parseJunctionList), start);
1605
- const nonfix =
1606
- infix && isAt("(", 1)
1607
- ? attempt(() =>
1608
- withBracketLayout((): Expression => {
1609
- advance();
1610
- advance();
1611
- const left = parseExpression();
1612
- expect(",");
1613
- const right = parseExpression();
1614
- expect(")");
1615
- return { kind: "Apply", operator: token.text, args: [left, right], location };
1616
- }),
1617
- )
1618
- : undefined;
1728
+ return getTlapmOperand(parseJunctionList(), start);
1729
+ const nonfix = infix ? parseTlapmNonfixInfix(token) : undefined;
1619
1730
  if (nonfix) return getTlapmOperand(nonfix, start);
1731
+ const nonfixPostfix = parseTlapmNonfixPostfix(token);
1732
+ if (nonfixPostfix) {
1733
+ nonfixPostfix.expression.location.range = getRange(start, nonfixPostfix.end);
1734
+ return { start, end: nonfixPostfix.end, expression: nonfixPostfix.expression };
1735
+ }
1620
1736
  const prefix = isOperator ? TLAPM_PREFIX_OPERATORS.get(token.text) : undefined;
1621
1737
  if (prefix) {
1622
1738
  advance();
@@ -1953,23 +2069,6 @@ const parse = (
1953
2069
  return isFirst ? level > outer : proofLevels[top] === level;
1954
2070
  };
1955
2071
 
1956
- const isDeclared = (name: string) =>
1957
- !factNames.has(name) &&
1958
- openModules.some(
1959
- (module) =>
1960
- module.constants.some((constant) => constant.name === name) ||
1961
- module.variables.some((variable) => variable.name === name) ||
1962
- module.definitions.some((definition) => definition.name === name),
1963
- );
1964
-
1965
- const isHideFact = (fact: Fact) => {
1966
- if (fact.kind === "ModuleFact" || fact.kind === "Subexpression") return true;
1967
- if (fact.kind === "Apply") return fact.operator.includes("!");
1968
- if (fact.kind !== "Identifier") return false;
1969
- if (fact.name.startsWith("<") || fact.name.includes("!")) return true;
1970
- return !BUILTIN_CONSTANTS.has(fact.name) && !isDeclared(fact.name);
1971
- };
1972
-
1973
2072
  const isFactAhead = () => {
1974
2073
  const token = peek();
1975
2074
  if (token.kind === "Step") return isStepReference(token);
@@ -2006,23 +2105,6 @@ const parse = (
2006
2105
  );
2007
2106
  };
2008
2107
 
2009
- const declareProofSymbol = (name: string) => proofScopes[proofScopes.length - 1]?.add(name);
2010
-
2011
- const withProofScope = <Result>(parse: () => Result) => {
2012
- proofScopes.push(new Set());
2013
- const result = parse();
2014
- proofScopes.pop();
2015
- return result;
2016
- };
2017
-
2018
- const isDeclaredSymbol = (name: string) =>
2019
- proofScopes.some((scope) => scope.has(name)) ||
2020
- openModules.some(
2021
- (module) =>
2022
- module.constants.some((constant) => constant.name === name) ||
2023
- module.variables.some((variable) => variable.name === name),
2024
- );
2025
-
2026
2108
  const parseDefinable = (): Fact => {
2027
2109
  const start = cursor;
2028
2110
  const token = peek();
@@ -2044,18 +2126,7 @@ const parse = (
2044
2126
  );
2045
2127
  };
2046
2128
 
2047
- const parseDefs = () => {
2048
- if (isTlapm) return parseSeparated(parseDefinable);
2049
- const defs = parseSeparated(parseFact);
2050
- const invalid =
2051
- mode === "tlc"
2052
- ? defs.find((def) => def.kind === "Identifier" && isDeclaredSymbol(def.name))
2053
- : undefined;
2054
- if (invalid) {
2055
- throw createError("DEF clause entry should describe a defined operator", invalid.location);
2056
- }
2057
- return defs;
2058
- };
2129
+ const parseDefs = () => parseSeparated(isTlapm ? parseDefinable : parseFact);
2059
2130
 
2060
2131
  // tlapm's usebody reads facts while an expression starts after the comma.
2061
2132
  const parseTlapmFacts = (): Fact[] => {
@@ -2087,25 +2158,16 @@ const parse = (
2087
2158
  const keyword = advance();
2088
2159
  const isOnly = keyword.text === "USE" && accept("ONLY");
2089
2160
  const keywordRange = getRange(start);
2090
- const use: UseOrHide = {
2091
- kind: keyword.text === "USE" ? "Use" : "Hide",
2092
- isOnly,
2093
- ...parseFacts(),
2094
- keyword: keywordRange,
2095
- location: getLocation(keyword),
2096
- };
2097
- const invalid =
2098
- use.kind === "Hide" && mode === "tlc" ? use.facts.filter((fact) => !isHideFact(fact)) : [];
2099
- if (invalid.length > 0) {
2100
- throw createSanyError(
2101
- invalid.map((fact) => ({
2102
- location: formatRange(fact.location.range ?? getRange(start)),
2103
- message:
2104
- "The only expression allowed as a fact in a HIDE is \nthe name of a theorem, assumption, or step.",
2105
- })),
2106
- );
2107
- }
2108
- return withRange(use, start);
2161
+ return withRange(
2162
+ {
2163
+ kind: keyword.text === "USE" ? "Use" : "Hide",
2164
+ isOnly,
2165
+ ...parseFacts(),
2166
+ keyword: keywordRange,
2167
+ location: getLocation(keyword),
2168
+ },
2169
+ start,
2170
+ );
2109
2171
  };
2110
2172
 
2111
2173
  const parseNewSymbol = (): NewSymbol => {
@@ -2121,7 +2183,6 @@ const parse = (
2121
2183
  if (level !== undefined) advance();
2122
2184
  if (level === "Variable") {
2123
2185
  const named = expectName();
2124
- declareProofSymbol(named.name);
2125
2186
  return withRange(
2126
2187
  {
2127
2188
  kind: "NewSymbol",
@@ -2136,7 +2197,6 @@ const parse = (
2136
2197
  );
2137
2198
  }
2138
2199
  const declaration = parseDeclaration();
2139
- declareProofSymbol(declaration.name);
2140
2200
  const isBounded = (level ?? "Constant") === "Constant" && isAt("\\in");
2141
2201
  if (isBounded && declaration.arity > 0) {
2142
2202
  throw createError("declared symbol with arguments before \\in");
@@ -2156,23 +2216,50 @@ const parse = (
2156
2216
  );
2157
2217
  };
2158
2218
 
2219
+ const parseHypothesis = () => {
2220
+ if (peek().kind === "Identifier" && isAt("::", 1) && isAt("ASSUME", 2)) {
2221
+ advance();
2222
+ advance();
2223
+ }
2224
+ if (isAt("ASSUME")) return parseAssumeProve();
2225
+ if (peek().kind === "Keyword" && NEW_SYMBOL_STARTS.has(peek().text))
2226
+ return isTlapm ? commit(parseNewSymbol) : parseNewSymbol();
2227
+ if (!isTlapm) return parseExpression();
2228
+ // expr_or_sequent: where no expression starts, the sequent's ASSUME fails last.
2229
+ const expression = attempt(parseExpression);
2230
+ if (expression === undefined) throw createUnexpected("Expected a hypothesis");
2231
+ return expression;
2232
+ };
2233
+
2234
+ // comma1 (hyp b): Pco.star attempts the hypotheses after the first, each inside the one before,
2235
+ // so a failure that backtracks ends the list, and tlapm reports any other before the first comma.
2236
+ const parseTlapmHypotheses = () => {
2237
+ const assumptions = [parseHypothesis()];
2238
+ withRestorePoint(() => {
2239
+ while (true) {
2240
+ const assumption = attempt(() => {
2241
+ expect(",");
2242
+ return parseHypothesis();
2243
+ });
2244
+ if (assumption === undefined) break;
2245
+ assumptions.push(assumption);
2246
+ }
2247
+ });
2248
+ return assumptions;
2249
+ };
2250
+
2159
2251
  const parseAssumeProve = (): AssumeProve => {
2160
2252
  const start = cursor;
2161
2253
  const location = getLocation(expect("ASSUME"));
2162
- const assumptions = parseSeparated(() => {
2163
- if (peek().kind === "Identifier" && isAt("::", 1) && isAt("ASSUME", 2)) {
2164
- advance();
2165
- advance();
2166
- }
2167
- if (isAt("ASSUME")) return withProofScope(parseAssumeProve);
2168
- if (peek().kind === "Keyword" && NEW_SYMBOL_STARTS.has(peek().text)) return parseNewSymbol();
2169
- return parseExpression();
2170
- });
2171
- expect("PROVE");
2172
- return withRange(
2173
- { kind: "AssumeProve", assumptions, conclusion: parseExpression(), location },
2174
- start,
2175
- );
2254
+ const parseSequent = (): AssumeProve => {
2255
+ const assumptions = isTlapm ? parseTlapmHypotheses() : parseSeparated(parseHypothesis);
2256
+ expect("PROVE");
2257
+ return withRange(
2258
+ { kind: "AssumeProve", assumptions, conclusion: parseExpression(), location },
2259
+ start,
2260
+ );
2261
+ };
2262
+ return isTlapm ? commit(parseSequent) : parseSequent();
2176
2263
  };
2177
2264
 
2178
2265
  const isNameListAhead = (terminator: string) => {
@@ -2183,15 +2270,6 @@ const parse = (
2183
2270
  return peek(offset).kind === "Identifier" && isAt(terminator, offset + 1);
2184
2271
  };
2185
2272
 
2186
- const declareProofSymbols = (names: string[], bounds: Bound[]) => {
2187
- names.forEach(declareProofSymbol);
2188
- bounds.forEach((bound) =>
2189
- (bound.pattern.kind === "Name" ? [bound.pattern.name] : bound.pattern.names).forEach(
2190
- declareProofSymbol,
2191
- ),
2192
- );
2193
- };
2194
-
2195
2273
  const parseStepBody = (): StepBody => {
2196
2274
  const token = peek();
2197
2275
  if (isAt("USE") || isAt("HIDE")) return parseUseOrHide();
@@ -2212,7 +2290,6 @@ const parse = (
2212
2290
  const isBounded = isBoundAhead();
2213
2291
  const names = getNames(isBounded ? [] : parseSeparated(expectName));
2214
2292
  const bounds = isBounded ? parseBounds() : [];
2215
- declareProofSymbols(names.names, bounds);
2216
2293
  return { kind: "Take", names: names.names, nameRanges: names.ranges, bounds };
2217
2294
  }
2218
2295
  if (accept("WITNESS")) {
@@ -2222,7 +2299,6 @@ const parse = (
2222
2299
  const isNames = isNameListAhead(":");
2223
2300
  const names = getNames(isNames ? parseSeparated(expectName) : []);
2224
2301
  const bounds = isNames ? [] : parseBounds();
2225
- declareProofSymbols(names.names, bounds);
2226
2302
  expect(":");
2227
2303
  return {
2228
2304
  kind: "Pick",
@@ -2259,8 +2335,6 @@ const parse = (
2259
2335
  const start = cursor;
2260
2336
  const step = parseStepStart(isAt("QED", 1));
2261
2337
  const statementStart = cursor;
2262
- const scope = new Set<string>();
2263
- proofScopes.push(scope);
2264
2338
  const body: StepBody = accept("QED") ? { kind: "Qed" } : parseStepBody();
2265
2339
  const head = getRange(start);
2266
2340
  const statement = getRange(statementStart);
@@ -2269,8 +2343,6 @@ const parse = (
2269
2343
  throw createError("Proof of a step that does not take a proof");
2270
2344
  }
2271
2345
  const proof = hasProof ? parseProof() : undefined;
2272
- proofScopes.pop();
2273
- if (body.kind !== "Assert" || body.isSuffices) scope.forEach(declareProofSymbol);
2274
2346
  return withRange({ ...step, body, head, statement, proof }, start);
2275
2347
  };
2276
2348
 
@@ -2302,7 +2374,7 @@ const parse = (
2302
2374
  const parseProof = (): Proof => {
2303
2375
  const start = cursor;
2304
2376
  proofLevels.push(-1);
2305
- const proof = withProofScope(parseProofBody);
2377
+ const proof = parseProofBody();
2306
2378
  proofLevels.pop();
2307
2379
  return withRange(proof, start);
2308
2380
  };
@@ -2384,20 +2456,26 @@ const parse = (
2384
2456
  throw createProofError(
2385
2457
  `Unexpected end of (sub)proof at level ${level} before QED step`,
2386
2458
  levelSpan,
2459
+ NEWLINES,
2387
2460
  );
2388
2461
  }
2389
2462
  if (item.kind === "Leaf") {
2390
2463
  throw createProofError(
2391
2464
  `Expecting a proof step but found a${LEAF_NAMES[item.proof.kind]} leaf proof`,
2392
2465
  item.span,
2466
+ NEWLINES,
2393
2467
  );
2394
2468
  }
2395
2469
  if (!isFirst && item.isProof) {
2396
- throw createProofError("PROOF keyword found in step that does not begin subproof", item.span);
2470
+ throw createProofError(
2471
+ "PROOF keyword found in step that does not begin subproof",
2472
+ item.span,
2473
+ PRINTED_NEWLINE,
2474
+ );
2397
2475
  }
2398
2476
  const implicit = item.token.text[1];
2399
2477
  if (implicit === "+" && !isFirst) {
2400
- throw createProofError("<+> used but no subproof expected", item.span);
2478
+ throw createProofError("<+> used but no subproof expected", item.span, PRINTED_NEWLINE);
2401
2479
  }
2402
2480
  const stepLevel =
2403
2481
  implicit === "*"
@@ -2452,6 +2530,7 @@ const parse = (
2452
2530
  throw createProofError(
2453
2531
  "extra step(s) after finished proof",
2454
2532
  extra.span,
2533
+ NO_NEWLINES,
2455
2534
  "Proof.Parser.toplevel",
2456
2535
  );
2457
2536
  }
@@ -2479,7 +2558,6 @@ const parse = (
2479
2558
  const parseFactName = () => {
2480
2559
  if (peek().kind !== "Identifier" || !isAt("==", 1)) return undefined;
2481
2560
  const name = expectIdentifier();
2482
- factNames.add(name);
2483
2561
  advance();
2484
2562
  return name;
2485
2563
  };
@@ -2497,16 +2575,9 @@ const parse = (
2497
2575
  const start = cursor;
2498
2576
  const keyword = advance();
2499
2577
  const name = parseFactName();
2500
- const parsed = withProofScope(() => {
2501
- const statement = isAt("ASSUME") ? parseAssumeProve() : parseTheoremExpression();
2502
- if (isTlapm) return { statement, proof: parseTlapmProof() };
2503
- return { statement, proof: isProofStart(peek()) ? parseProof() : undefined };
2504
- });
2505
- const statement = parsed.statement;
2506
- const theorem = withRange(
2507
- { name, statement, proof: parsed.proof, location: getLocation(keyword) },
2508
- start,
2509
- );
2578
+ const statement = isAt("ASSUME") ? parseAssumeProve() : parseTheoremExpression();
2579
+ const proof = isTlapm ? parseTlapmProof() : isProofStart(peek()) ? parseProof() : undefined;
2580
+ const theorem = withRange({ name, statement, proof, location: getLocation(keyword) }, start);
2510
2581
  module.theorems.push(theorem);
2511
2582
  module.units.push({ kind: "Theorem", theorem });
2512
2583
  if (name === undefined || statement.kind === "AssumeProve") return;
@@ -1,4 +1,4 @@
1
- // A port of TLC's tlc2.pprint package. TLC prints the original text whenever the parse fails.
1
+ // TLC prints the original text whenever the parse fails.
2
2
 
3
3
  import { skipWhile } from "./lexer";
4
4