tla-ts 0.0.10-dev.8aec06f77 → 0.0.10-dev.8be00045c

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 (509) hide show
  1. package/dist/deciders.cjs +37 -36
  2. package/dist/deciders.js +55 -54
  3. package/dist/index.cjs +1 -1
  4. package/dist/index.d.cts +4 -1
  5. package/dist/index.d.ts +4 -1
  6. package/dist/index.js +1 -1
  7. package/dist/parallel-worker.cjs +1 -1
  8. package/dist/parallel-worker.js +1 -1
  9. package/dist/prove.cjs +146 -58
  10. package/dist/prove.js +143 -55
  11. package/dist/run.cjs +43 -43
  12. package/dist/run.js +45 -45
  13. package/dist/transfer.cjs +29 -26
  14. package/dist/transfer.js +43 -40
  15. package/dist/worker.cjs +1 -1
  16. package/dist/worker.js +1 -1
  17. package/package.json +1 -1
  18. package/src/ast.ts +3 -3
  19. package/src/bags.ts +46 -28
  20. package/src/check-trace.ts +2 -16
  21. package/src/check.ts +336 -88
  22. package/src/cli/runtime-invariants.ts +20 -56
  23. package/src/cli/tlapm.ts +261 -68
  24. package/src/cli/tlc-arguments.ts +2 -2
  25. package/src/cli/tlc-output.ts +4 -5
  26. package/src/cli/tlc-usage.ts +0 -1
  27. package/src/cli/tlc.ts +26 -7
  28. package/src/dependencies.ts +23 -2
  29. package/src/dfid.ts +9 -2
  30. package/src/environment.ts +27 -5
  31. package/src/errors.ts +1 -1
  32. package/src/evaluate.ts +9 -3
  33. package/src/exit-codes.ts +5 -2
  34. package/src/instances.ts +1 -1
  35. package/src/levels.ts +134 -86
  36. package/src/liveness-checker.ts +572 -204
  37. package/src/liveness.ts +47 -32
  38. package/src/obligations/action.ts +0 -2
  39. package/src/obligations/anonymize.ts +2 -6
  40. package/src/obligations/equality.ts +0 -2
  41. package/src/obligations/expression.ts +0 -2
  42. package/src/obligations/format.ts +0 -2
  43. package/src/obligations/generate.ts +0 -2
  44. package/src/obligations/index.ts +5 -3
  45. package/src/obligations/levels.ts +0 -2
  46. package/src/obligations/module.ts +0 -2
  47. package/src/obligations/normalize.ts +0 -2
  48. package/src/obligations/operators.ts +0 -2
  49. package/src/obligations/pragma.ts +2 -2
  50. package/src/obligations/printer.ts +0 -2
  51. package/src/obligations/proof.ts +0 -2
  52. package/src/obligations/regroup.ts +0 -2
  53. package/src/obligations/simplify.ts +0 -2
  54. package/src/obligations/subexpression.ts +0 -2
  55. package/src/obligations/substitution.ts +0 -2
  56. package/src/obligations/temporal.ts +0 -2
  57. package/src/obligations/tuples.ts +0 -2
  58. package/src/parallel-worker.ts +8 -2
  59. package/src/parallel.ts +7 -2
  60. package/src/parser.ts +224 -82
  61. package/src/pretty-print.ts +1 -1
  62. package/src/prover/deciders.ts +1 -8
  63. package/src/prover/isabelle/encode.ts +0 -2
  64. package/src/prover/isabelle/isar/attrib.ts +86 -49
  65. package/src/prover/isabelle/isar/context.ts +25 -26
  66. package/src/prover/isabelle/isar/induct.ts +2 -9
  67. package/src/prover/isabelle/isar/method.ts +5 -9
  68. package/src/prover/isabelle/isar/proof.ts +33 -18
  69. package/src/prover/isabelle/isar/rule-cases.ts +14 -22
  70. package/src/prover/isabelle/isar/theory.ts +16 -17
  71. package/src/prover/isabelle/isar/toplevel.ts +46 -56
  72. package/src/prover/isabelle/isar/type-check.ts +0 -2
  73. package/src/prover/isabelle/provers/blast/blast.ts +0 -2
  74. package/src/prover/isabelle/provers/blast/branch.ts +0 -2
  75. package/src/prover/isabelle/provers/blast/prove.ts +0 -2
  76. package/src/prover/isabelle/provers/blast/rules.ts +0 -2
  77. package/src/prover/isabelle/provers/blast/state.ts +0 -2
  78. package/src/prover/isabelle/provers/blast/term.ts +0 -2
  79. package/src/prover/isabelle/provers/clasimp.ts +1 -3
  80. package/src/prover/isabelle/provers/classical.ts +1 -3
  81. package/src/prover/isabelle/provers/hypsubst.ts +2 -4
  82. package/src/prover/isabelle/pure/bicompose.ts +0 -2
  83. package/src/prover/isabelle/pure/consts.ts +0 -2
  84. package/src/prover/isabelle/pure/conv.ts +0 -2
  85. package/src/prover/isabelle/pure/drule.ts +0 -2
  86. package/src/prover/isabelle/pure/envir.ts +0 -2
  87. package/src/prover/isabelle/pure/goal.ts +0 -2
  88. package/src/prover/isabelle/pure/logic.ts +0 -2
  89. package/src/prover/isabelle/pure/name.ts +0 -2
  90. package/src/prover/isabelle/pure/net.ts +0 -2
  91. package/src/prover/isabelle/pure/object-logic.ts +0 -2
  92. package/src/prover/isabelle/pure/pattern.ts +0 -2
  93. package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
  94. package/src/prover/isabelle/pure/rewriter.ts +0 -2
  95. package/src/prover/isabelle/pure/search.ts +0 -2
  96. package/src/prover/isabelle/pure/seq.ts +0 -2
  97. package/src/prover/isabelle/pure/simplifier.ts +0 -2
  98. package/src/prover/isabelle/pure/table.ts +0 -2
  99. package/src/prover/isabelle/pure/tactic.ts +0 -2
  100. package/src/prover/isabelle/pure/tactical.ts +0 -2
  101. package/src/prover/isabelle/pure/term-ord.ts +0 -2
  102. package/src/prover/isabelle/pure/term.ts +0 -2
  103. package/src/prover/isabelle/pure/thm.ts +0 -2
  104. package/src/prover/isabelle/pure/type.ts +0 -2
  105. package/src/prover/isabelle/pure/unify.ts +0 -2
  106. package/src/prover/isabelle/pure/variable.ts +0 -2
  107. package/src/prover/isabelle/tla/classical-setup.ts +0 -2
  108. package/src/prover/isabelle/tla/simpdata.ts +0 -2
  109. package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
  110. package/src/prover/ocaml.ts +4 -1
  111. package/src/prover/prep/action.ts +1 -0
  112. package/src/prover/prep/methods.ts +50 -3
  113. package/src/prover/prep/normalize.ts +4 -1
  114. package/src/prover/prove.ts +58 -32
  115. package/src/prover/ptl/decide.ts +43 -63
  116. package/src/prover/smt/data.ts +51 -45
  117. package/src/prover/smt/encode.ts +1 -2
  118. package/src/prover/smt/rewrite.ts +3 -7
  119. package/src/prover/smt/simplify.ts +1 -1
  120. package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
  121. package/src/prover/smt/solver/ackr-helper.ts +0 -3
  122. package/src/prover/smt/solver/ackr-model-converter.ts +0 -1
  123. package/src/prover/smt/solver/act-cache.ts +0 -1
  124. package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
  125. package/src/prover/smt/solver/aig-tactic.ts +25 -16
  126. package/src/prover/smt/solver/aig.ts +2 -3
  127. package/src/prover/smt/solver/arith-rewriter.ts +3 -6
  128. package/src/prover/smt/solver/arith-terms.ts +0 -2
  129. package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
  130. package/src/prover/smt/solver/array-rewriter.ts +0 -1
  131. package/src/prover/smt/solver/asserted-formulas.ts +9 -3
  132. package/src/prover/smt/solver/ast-lt.ts +1 -2
  133. package/src/prover/smt/solver/ast-util.ts +3 -3
  134. package/src/prover/smt/solver/ast.ts +112 -156
  135. package/src/prover/smt/solver/auf-solver.ts +0 -1
  136. package/src/prover/smt/solver/bit-blast-tactic.ts +0 -3
  137. package/src/prover/smt/solver/bit-blaster.ts +0 -3
  138. package/src/prover/smt/solver/bound-manager.ts +39 -29
  139. package/src/prover/smt/solver/bound-simplifier.ts +0 -2
  140. package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
  141. package/src/prover/smt/solver/bv-decl-plugin.ts +0 -1
  142. package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
  143. package/src/prover/smt/solver/bv-rewriter.ts +15 -19
  144. package/src/prover/smt/solver/bv1-blast.ts +1 -11
  145. package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
  146. package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
  147. package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
  148. package/src/prover/smt/solver/card2bv.ts +1 -4
  149. package/src/prover/smt/solver/case-split-queue.ts +0 -2
  150. package/src/prover/smt/solver/cg-table.ts +19 -16
  151. package/src/prover/smt/solver/check-logic.ts +6 -2
  152. package/src/prover/smt/solver/clause.ts +0 -1
  153. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +0 -2
  154. package/src/prover/smt/solver/conflict-resolution.ts +0 -1
  155. package/src/prover/smt/solver/context.ts +41 -14
  156. package/src/prover/smt/solver/ctx-simplify.ts +1 -3
  157. package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
  158. package/src/prover/smt/solver/datatype-decl-plugin.ts +0 -1
  159. package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
  160. package/src/prover/smt/solver/demodulator.ts +2 -5
  161. package/src/prover/smt/solver/dependent-expr-state.ts +16 -3
  162. package/src/prover/smt/solver/der.ts +0 -1
  163. package/src/prover/smt/solver/diff-neq.ts +1 -3
  164. package/src/prover/smt/solver/distribute-forall.ts +1 -11
  165. package/src/prover/smt/solver/dom-simplify.ts +1 -3
  166. package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
  167. package/src/prover/smt/solver/dyn-ack.ts +0 -1
  168. package/src/prover/smt/solver/e-matching.ts +6 -7
  169. package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
  170. package/src/prover/smt/solver/elim-uncnstr.ts +7 -23
  171. package/src/prover/smt/solver/enode.ts +15 -2
  172. package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
  173. package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
  174. package/src/prover/smt/solver/euf/arith-internalize.ts +1 -3
  175. package/src/prover/smt/solver/euf/arith-solver.ts +0 -1
  176. package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
  177. package/src/prover/smt/solver/euf/array-internalize.ts +20 -11
  178. package/src/prover/smt/solver/euf/array-solver.ts +0 -2
  179. package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
  180. package/src/prover/smt/solver/euf/bv-internalize.ts +1 -3
  181. package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
  182. package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
  183. package/src/prover/smt/solver/euf/egraph.ts +68 -43
  184. package/src/prover/smt/solver/euf/euf-solver.ts +36 -23
  185. package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
  186. package/src/prover/smt/solver/euf/mam.ts +7 -55
  187. package/src/prover/smt/solver/euf/q-ematch.ts +21 -97
  188. package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
  189. package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
  190. package/src/prover/smt/solver/euf/q-solver.ts +2 -2
  191. package/src/prover/smt/solver/euf/th-solver.ts +1 -10
  192. package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
  193. package/src/prover/smt/solver/expr-ref.ts +0 -1
  194. package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
  195. package/src/prover/smt/solver/expr2polynomial.ts +204 -80
  196. package/src/prover/smt/solver/factor.ts +37 -26
  197. package/src/prover/smt/solver/fd-solver.ts +3 -5
  198. package/src/prover/smt/solver/fingerprints.ts +0 -1
  199. package/src/prover/smt/solver/fix-dl-var.ts +1 -3
  200. package/src/prover/smt/solver/flat-literals.ts +0 -1
  201. package/src/prover/smt/solver/fm-tactic.ts +19 -14
  202. package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
  203. package/src/prover/smt/solver/fpa-rewriter.ts +2 -2
  204. package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
  205. package/src/prover/smt/solver/fpa2bv-rewriter.ts +0 -1
  206. package/src/prover/smt/solver/fpa2bv-tactic.ts +0 -2
  207. package/src/prover/smt/solver/goal.ts +3 -2
  208. package/src/prover/smt/solver/goal2nlsat.ts +57 -32
  209. package/src/prover/smt/solver/guard-set.ts +0 -1
  210. package/src/prover/smt/solver/hash.ts +0 -1
  211. package/src/prover/smt/solver/hashtable.ts +0 -1
  212. package/src/prover/smt/solver/inf-eps.ts +1 -2
  213. package/src/prover/smt/solver/inj-axiom.ts +0 -1
  214. package/src/prover/smt/solver/internalizer.ts +41 -3
  215. package/src/prover/smt/solver/lackr.ts +0 -2
  216. package/src/prover/smt/solver/lbool.ts +0 -1
  217. package/src/prover/smt/solver/lia2card.ts +0 -1
  218. package/src/prover/smt/solver/lia2pb.ts +18 -5
  219. package/src/prover/smt/solver/literal.ts +0 -1
  220. package/src/prover/smt/solver/logic-tactics.ts +0 -4
  221. package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
  222. package/src/prover/smt/solver/lp/constraints.ts +0 -1
  223. package/src/prover/smt/solver/lp/containers.ts +7 -2
  224. package/src/prover/smt/solver/lp/core-solver.ts +0 -3
  225. package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
  226. package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
  227. package/src/prover/smt/solver/lp/dependency.ts +0 -2
  228. package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
  229. package/src/prover/smt/solver/lp/explanation.ts +0 -1
  230. package/src/prover/smt/solver/lp/gomory.ts +0 -1
  231. package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
  232. package/src/prover/smt/solver/lp/hnf.ts +0 -3
  233. package/src/prover/smt/solver/lp/int-cube.ts +0 -1
  234. package/src/prover/smt/solver/lp/int-solver.ts +0 -2
  235. package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
  236. package/src/prover/smt/solver/lp/lar-term.ts +0 -1
  237. package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
  238. package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
  239. package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
  240. package/src/prover/smt/solver/lp/nex.ts +2 -2
  241. package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
  242. package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
  243. package/src/prover/smt/solver/lp/nla-core.ts +26 -7
  244. package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
  245. package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
  246. package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
  247. package/src/prover/smt/solver/lp/nla-grobner.ts +158 -82
  248. package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
  249. package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
  250. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
  251. package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
  252. package/src/prover/smt/solver/lp/nla-order.ts +0 -2
  253. package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
  254. package/src/prover/smt/solver/lp/nla-powers.ts +144 -108
  255. package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
  256. package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
  257. package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -19
  258. package/src/prover/smt/solver/lp/nla-types.ts +0 -2
  259. package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
  260. package/src/prover/smt/solver/lp/nra-solver.ts +138 -97
  261. package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
  262. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
  263. package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
  264. package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
  265. package/src/prover/smt/solver/lp/pdd.ts +725 -290
  266. package/src/prover/smt/solver/lp/random-updater.ts +0 -2
  267. package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
  268. package/src/prover/smt/solver/lp/union-find.ts +1 -2
  269. package/src/prover/smt/solver/macro-finder.ts +1 -4
  270. package/src/prover/smt/solver/mam-compiler.ts +14 -15
  271. package/src/prover/smt/solver/mam-interpreter.ts +0 -1
  272. package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
  273. package/src/prover/smt/solver/max-cliques.ts +0 -2
  274. package/src/prover/smt/solver/maxcore.ts +5 -14
  275. package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -1
  276. package/src/prover/smt/solver/maxlex.ts +0 -8
  277. package/src/prover/smt/solver/maxsmt-base.ts +7 -1
  278. package/src/prover/smt/solver/maxsmt.ts +0 -1
  279. package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
  280. package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
  281. package/src/prover/smt/solver/mbp/mbp-plugin.ts +9 -2
  282. package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
  283. package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
  284. package/src/prover/smt/solver/mbp/mbp-term-graph.ts +0 -1
  285. package/src/prover/smt/solver/model-based-opt.ts +1 -2
  286. package/src/prover/smt/solver/model-checker.ts +0 -1
  287. package/src/prover/smt/solver/model-evaluator.ts +9 -6
  288. package/src/prover/smt/solver/model-finder.ts +0 -1
  289. package/src/prover/smt/solver/model-generator.ts +3 -2
  290. package/src/prover/smt/solver/model-macro-solver.ts +3 -4
  291. package/src/prover/smt/solver/model-printer.ts +0 -1
  292. package/src/prover/smt/solver/mpf.ts +2 -5
  293. package/src/prover/smt/solver/mus.ts +1 -3
  294. package/src/prover/smt/solver/muz/dl-context.ts +67 -9
  295. package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
  296. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
  297. package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
  298. package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -2
  299. package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
  300. package/src/prover/smt/solver/muz/dl-mk-slice.ts +78 -16
  301. package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
  302. package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -1
  303. package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
  304. package/src/prover/smt/solver/muz/dl-rule.ts +95 -33
  305. package/src/prover/smt/solver/muz/hnf.ts +6 -6
  306. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
  307. package/src/prover/smt/solver/muz/horn-tactic.ts +15 -6
  308. package/src/prover/smt/solver/muz/rule-properties.ts +194 -37
  309. package/src/prover/smt/solver/muz/spacer-context.ts +104 -89
  310. package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -3
  311. package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
  312. package/src/prover/smt/solver/muz/spacer-manager.ts +0 -2
  313. package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
  314. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +3 -9
  315. package/src/prover/smt/solver/muz/spacer-util.ts +2 -3
  316. package/src/prover/smt/solver/muz/substitution.ts +88 -39
  317. package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
  318. package/src/prover/smt/solver/nlqsat.ts +4 -4
  319. package/src/prover/smt/solver/nlsat/algebraic.ts +194 -93
  320. package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
  321. package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
  322. package/src/prover/smt/solver/nlsat/explain.ts +379 -217
  323. package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
  324. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
  325. package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
  326. package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
  327. package/src/prover/smt/solver/nlsat/solver.ts +112 -99
  328. package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
  329. package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
  330. package/src/prover/smt/solver/nlsat/types.ts +0 -2
  331. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
  332. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
  333. package/src/prover/smt/solver/nlsat-tactic.ts +0 -1
  334. package/src/prover/smt/solver/nnf.ts +0 -1
  335. package/src/prover/smt/solver/normalize-bounds.ts +0 -1
  336. package/src/prover/smt/solver/occf.ts +0 -1
  337. package/src/prover/smt/solver/opt-context.ts +15 -10
  338. package/src/prover/smt/solver/opt-nlsat.ts +97 -77
  339. package/src/prover/smt/solver/opt-pareto.ts +0 -2
  340. package/src/prover/smt/solver/opt-preprocess.ts +0 -1
  341. package/src/prover/smt/solver/opt-solver.ts +22 -11
  342. package/src/prover/smt/solver/opt-value.ts +0 -1
  343. package/src/prover/smt/solver/optsmt.ts +13 -12
  344. package/src/prover/smt/solver/parallel-tactic.ts +0 -2
  345. package/src/prover/smt/solver/pattern-inference.ts +2 -3
  346. package/src/prover/smt/solver/pb-rewriter.ts +14 -20
  347. package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
  348. package/src/prover/smt/solver/poly-rewriter.ts +2 -3
  349. package/src/prover/smt/solver/probes.ts +4 -7
  350. package/src/prover/smt/solver/propagate-values.ts +4 -1
  351. package/src/prover/smt/solver/proto-model.ts +6 -7
  352. package/src/prover/smt/solver/pull-quant.ts +0 -1
  353. package/src/prover/smt/solver/purify-arith.ts +50 -16
  354. package/src/prover/smt/solver/qe-arith-plugin.ts +4 -7
  355. package/src/prover/smt/solver/qe-lite-der.ts +0 -1
  356. package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
  357. package/src/prover/smt/solver/qe-lite.ts +0 -1
  358. package/src/prover/smt/solver/qe-mbp.ts +13 -24
  359. package/src/prover/smt/solver/qe.ts +48 -57
  360. package/src/prover/smt/solver/qel.ts +0 -1
  361. package/src/prover/smt/solver/qi-queue.ts +0 -1
  362. package/src/prover/smt/solver/qsat.ts +70 -91
  363. package/src/prover/smt/solver/quant-hoist.ts +0 -1
  364. package/src/prover/smt/solver/quant-tactics.ts +0 -1
  365. package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
  366. package/src/prover/smt/solver/quantifier-manager.ts +14 -10
  367. package/src/prover/smt/solver/quasi-macros.ts +9 -20
  368. package/src/prover/smt/solver/random-gen.ts +0 -1
  369. package/src/prover/smt/solver/rational.ts +17 -1
  370. package/src/prover/smt/solver/recfun-decl-plugin.ts +35 -21
  371. package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
  372. package/src/prover/smt/solver/reduce-args.ts +0 -1
  373. package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
  374. package/src/prover/smt/solver/ref-vector.ts +0 -1
  375. package/src/prover/smt/solver/relevancy.ts +0 -1
  376. package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
  377. package/src/prover/smt/solver/rewriter.ts +1 -2
  378. package/src/prover/smt/solver/rlimit.ts +13 -1
  379. package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
  380. package/src/prover/smt/solver/sat/big.ts +0 -1
  381. package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
  382. package/src/prover/smt/solver/sat/clause.ts +1 -6
  383. package/src/prover/smt/solver/sat/cleaner.ts +0 -2
  384. package/src/prover/smt/solver/sat/config.ts +4 -7
  385. package/src/prover/smt/solver/sat/consequences.ts +1 -2
  386. package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
  387. package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
  388. package/src/prover/smt/solver/sat/inc-sat-solver.ts +4 -13
  389. package/src/prover/smt/solver/sat/model-converter.ts +2 -18
  390. package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
  391. package/src/prover/smt/solver/sat/pb-solver.ts +50 -26
  392. package/src/prover/smt/solver/sat/probing.ts +22 -21
  393. package/src/prover/smt/solver/sat/sat-tactic.ts +2 -2
  394. package/src/prover/smt/solver/sat/sat2goal.ts +9 -12
  395. package/src/prover/smt/solver/sat/scc.ts +0 -1
  396. package/src/prover/smt/solver/sat/simplifier.ts +16 -60
  397. package/src/prover/smt/solver/sat/solver.ts +45 -68
  398. package/src/prover/smt/solver/sat/var-queue.ts +0 -2
  399. package/src/prover/smt/solver/sat/watch-list.ts +7 -3
  400. package/src/prover/smt/solver/search-tree.ts +0 -1
  401. package/src/prover/smt/solver/seq-axioms.ts +20 -36
  402. package/src/prover/smt/solver/seq-decl-plugin.ts +7 -8
  403. package/src/prover/smt/solver/seq-derive.ts +9 -15
  404. package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
  405. package/src/prover/smt/solver/seq-eq-solver.ts +9 -10
  406. package/src/prover/smt/solver/seq-factory.ts +0 -1
  407. package/src/prover/smt/solver/seq-monadic.ts +7 -7
  408. package/src/prover/smt/solver/seq-range-predicate.ts +14 -3
  409. package/src/prover/smt/solver/seq-re-rewriter.ts +3 -12
  410. package/src/prover/smt/solver/seq-re-util.ts +2 -5
  411. package/src/prover/smt/solver/seq-regex-bisim.ts +2 -3
  412. package/src/prover/smt/solver/seq-regex-live.ts +6 -8
  413. package/src/prover/smt/solver/seq-rewriter.ts +31 -34
  414. package/src/prover/smt/solver/seq-skolem.ts +0 -24
  415. package/src/prover/smt/solver/seq-subset.ts +0 -1
  416. package/src/prover/smt/solver/seq-view-witness.ts +4 -6
  417. package/src/prover/smt/solver/smt-consequences.ts +0 -2
  418. package/src/prover/smt/solver/smt-kernel.ts +8 -3
  419. package/src/prover/smt/solver/smt-logics.ts +0 -1
  420. package/src/prover/smt/solver/smt-setup.ts +18 -14
  421. package/src/prover/smt/solver/smt2-printer.ts +0 -2
  422. package/src/prover/smt/solver/smtlib-parser.ts +1187 -592
  423. package/src/prover/smt/solver/smtlib-script.ts +957 -750
  424. package/src/prover/smt/solver/solve-eqs.ts +11 -19
  425. package/src/prover/smt/solver/solver.ts +1 -2
  426. package/src/prover/smt/solver/static-features.ts +0 -2
  427. package/src/prover/smt/solver/sticky-generations.ts +0 -1
  428. package/src/prover/smt/solver/tactic.ts +77 -18
  429. package/src/prover/smt/solver/term-enumeration.ts +0 -1
  430. package/src/prover/smt/solver/theory-array.ts +25 -60
  431. package/src/prover/smt/solver/theory-bv.ts +15 -54
  432. package/src/prover/smt/solver/theory-char.ts +0 -1
  433. package/src/prover/smt/solver/theory-datatype.ts +0 -1
  434. package/src/prover/smt/solver/theory-finite-set.ts +2 -2
  435. package/src/prover/smt/solver/theory-fpa.ts +46 -79
  436. package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
  437. package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
  438. package/src/prover/smt/solver/theory-lra-final-check.ts +0 -2
  439. package/src/prover/smt/solver/theory-lra-internalize.ts +8 -1
  440. package/src/prover/smt/solver/theory-lra-model.ts +0 -1
  441. package/src/prover/smt/solver/theory-lra-propagate.ts +0 -3
  442. package/src/prover/smt/solver/theory-lra-state.ts +0 -1
  443. package/src/prover/smt/solver/theory-lra.ts +0 -2
  444. package/src/prover/smt/solver/theory-pb.ts +12 -11
  445. package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
  446. package/src/prover/smt/solver/theory-recfun.ts +2 -3
  447. package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
  448. package/src/prover/smt/solver/theory-seq-solve.ts +6 -8
  449. package/src/prover/smt/solver/theory-seq-state.ts +8 -26
  450. package/src/prover/smt/solver/theory-seq.ts +32 -55
  451. package/src/prover/smt/solver/theory.ts +16 -2
  452. package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
  453. package/src/prover/smt/solver/var-subst.ts +2 -3
  454. package/src/prover/smt/table.ts +3 -2
  455. package/src/prover/zenon/decide.ts +9 -13
  456. package/src/prover/zenon/encode.ts +0 -2
  457. package/src/prover/zenon/eqrel.ts +0 -2
  458. package/src/prover/zenon/equality-rules.ts +24 -2
  459. package/src/prover/zenon/expr.ts +21 -2
  460. package/src/prover/zenon/index-table.ts +7 -4
  461. package/src/prover/zenon/isar-case.ts +1 -3
  462. package/src/prover/zenon/isar.ts +2 -4
  463. package/src/prover/zenon/llproof.ts +0 -2
  464. package/src/prover/zenon/mltoll.ts +0 -2
  465. package/src/prover/zenon/node.ts +12 -13
  466. package/src/prover/zenon/parse.ts +0 -2
  467. package/src/prover/zenon/phrase.ts +1 -3
  468. package/src/prover/zenon/proof.ts +0 -2
  469. package/src/prover/zenon/propositional-rules.ts +0 -2
  470. package/src/prover/zenon/rules.ts +2 -3
  471. package/src/prover/zenon/search.ts +0 -2
  472. package/src/prover/zenon/tla/functions.ts +0 -2
  473. package/src/prover/zenon/tla/llproof.ts +0 -2
  474. package/src/prover/zenon/tla/records.ts +0 -2
  475. package/src/prover/zenon/tla/rewrites.ts +0 -2
  476. package/src/prover/zenon/tla/sets.ts +1 -3
  477. package/src/prover/zenon/tla/terms.ts +0 -2
  478. package/src/prover/zenon/tla/tla.ts +0 -2
  479. package/src/resolve.ts +264 -77
  480. package/src/runtime.ts +6 -0
  481. package/src/sany/generation.ts +1 -13
  482. package/src/sany/generator-definitions.ts +2 -1
  483. package/src/sany/generator-expressions.ts +30 -27
  484. package/src/sany/generator-proofs.ts +1 -1
  485. package/src/sany/generator.ts +2 -1
  486. package/src/sany/levels.ts +0 -2
  487. package/src/sany/linter.ts +0 -2
  488. package/src/sany/nodes.ts +1 -1
  489. package/src/sany/selectors.ts +6 -5
  490. package/src/search.ts +198 -45
  491. package/src/simulate.ts +3 -0
  492. package/src/standard-definitions.ts +4 -0
  493. package/src/state-graph.ts +0 -2
  494. package/src/subexpressions.ts +165 -78
  495. package/src/successors.ts +1 -1
  496. package/src/symmetry.ts +2 -2
  497. package/src/tableau.ts +2 -2
  498. package/src/tlc/fingerprint.ts +81 -9
  499. package/src/tlc/jar-data.ts +12 -0
  500. package/src/tlc/order.ts +14 -3
  501. package/src/tlc/summary.ts +29 -14
  502. package/src/tlc/tlcext-operators.ts +61 -16
  503. package/src/tlc/trace-spec.ts +2 -3
  504. package/src/typed-tier.ts +6541 -0
  505. package/src/typescript/types.ts +2 -2
  506. package/src/values.ts +1 -1
  507. package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
  508. package/src/prover/smt/solver/z3-license.txt +0 -10
  509. package/src/prover/zenon/LICENSE +0 -32
package/src/parser.ts CHANGED
@@ -376,13 +376,30 @@ const getSpan = (range: SourceRange): Span => ({
376
376
  stop: { line: range.end.line, column: range.end.column + 1 },
377
377
  });
378
378
 
379
- 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
+ ) =>
380
397
  new TlaSyntaxError(message, undefined, {
381
- reason: message,
398
+ reason: `${message}${ends.set}`,
382
399
  line: span.start.line,
383
400
  column: span.start.column,
384
401
  isEnd: false,
385
- proof: { stop: span.stop, exception },
402
+ proof: { stop: span.stop, exception, printed: `${message}${ends.printed}` },
386
403
  });
387
404
 
388
405
  const FACT_KEYWORDS = new Set([
@@ -636,6 +653,7 @@ const parse = (
636
653
  return result;
637
654
  };
638
655
 
656
+ // 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
657
  const isFieldName = (token: Token) =>
640
658
  (token.kind === "Identifier" ||
641
659
  token.kind === "Keyword" ||
@@ -951,14 +969,19 @@ const parse = (
951
969
  const bullet = advance();
952
970
  offsideColumns.push(bullet.column);
953
971
  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
- }
972
+ const parseItems = () => {
973
+ while (
974
+ isBullet(peekRaw()) &&
975
+ peekRaw().text === bullet.text &&
976
+ peekRaw().column === bullet.column
977
+ ) {
978
+ cursor++;
979
+ operands.push(parseExpression());
980
+ }
981
+ };
982
+ // bulleted_list: a first item that fails leaves expr_or_op's other readings to fail after it.
983
+ if (isTlapm) commit(parseItems);
984
+ else parseItems();
962
985
  offsideColumns.pop();
963
986
  return {
964
987
  kind: bullet.text === "/\\" ? "And" : "Or",
@@ -1179,6 +1202,49 @@ const parse = (
1179
1202
  return { kind: "Name", name: token.text, args: isAt("(") ? parseArguments() : [] };
1180
1203
  };
1181
1204
 
1205
+ const parseSelections = (
1206
+ name: string,
1207
+ args: Expression[],
1208
+ argumentsRange: SourceRange | undefined,
1209
+ start: number,
1210
+ location: SourceLocation,
1211
+ ): Expression => {
1212
+ const selectors: Selector[] = [{ kind: "Name", name, args }];
1213
+ const selectorRanges = [getRange(start, start)];
1214
+ const argumentRanges = [argumentsRange];
1215
+ while (isSelectorAhead()) {
1216
+ advance();
1217
+ selectorRanges.push(getRange(cursor, cursor));
1218
+ lastArgumentsRange = undefined;
1219
+ selectors.push(parseSelector());
1220
+ argumentRanges.push(lastArgumentsRange);
1221
+ }
1222
+ const names = selectors.flatMap((selector) =>
1223
+ selector.kind === "Name" ? [selector.name] : [],
1224
+ );
1225
+ const operator = names.join("!");
1226
+ const qualifiedArgs = selectors.flatMap((selector) =>
1227
+ "args" in selector ? selector.args : [],
1228
+ );
1229
+ const argumentCounts = selectors.map((selector) =>
1230
+ "args" in selector ? selector.args.length : 0,
1231
+ );
1232
+ return names.length < selectors.length
1233
+ ? { kind: "Subexpression", selectors, selectorRanges, argumentRanges, location }
1234
+ : qualifiedArgs.length === 0
1235
+ ? { kind: "Identifier", name: operator, selectorRanges, location }
1236
+ : {
1237
+ kind: "Apply",
1238
+ operator,
1239
+ args: qualifiedArgs,
1240
+ ...(argumentCounts.slice(0, -1).some((count) => count > 0) && { argumentCounts }),
1241
+ argumentsRange: argumentRanges.at(-1) ?? getRange(start),
1242
+ selectorRanges,
1243
+ argumentRanges,
1244
+ location,
1245
+ };
1246
+ };
1247
+
1182
1248
  const parsePrimary = (preceding?: Precedence): Expression => {
1183
1249
  const start = cursor;
1184
1250
  const token = advance();
@@ -1230,56 +1296,45 @@ const parse = (
1230
1296
  if (name === "@" && !hasArguments && !isSelectorAhead())
1231
1297
  return { kind: "ExceptAt", location };
1232
1298
  const args = hasArguments ? parseArguments() : [];
1233
- const argumentRanges = [hasArguments ? lastArgumentsRange : undefined];
1234
1299
  if (!isSelectorAhead()) {
1235
1300
  return hasArguments
1236
1301
  ? { kind: "Apply", operator: name, args, argumentsRange: lastArgumentsRange, location }
1237
1302
  : { kind: "Identifier", name, location };
1238
1303
  }
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,
1304
+ return parseSelections(
1305
+ name,
1306
+ args,
1307
+ hasArguments ? lastArgumentsRange : undefined,
1308
+ start,
1309
+ location,
1257
1310
  );
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
1311
  }
1274
- if (token.kind === "Operator" && isOperatorName(token.text) && isAt("(")) {
1312
+ const isOperatorNamed =
1313
+ token.kind === "Operator" && (isOperatorName(token.text) || (token.text === "'" && !isTlapm));
1314
+ if (isOperatorNamed && isAt("(")) {
1275
1315
  const args = parseArguments();
1316
+ if (!isTlapm && isSelectorAhead()) {
1317
+ return parseSelections(token.text, args, lastArgumentsRange, start, location);
1318
+ }
1276
1319
  // 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 };
1320
+ if (mode === "tlc" && token.text === "\\X" && args.length === 2) {
1321
+ return { kind: "Product", factors: args, location };
1322
+ }
1323
+ return token.text === "'" && args.length === 1
1324
+ ? { kind: "Prime", expression: args[0], location }
1325
+ : {
1326
+ kind: "Apply",
1327
+ operator: token.text,
1328
+ spelling: token.spelling,
1329
+ args,
1330
+ argumentsRange: lastArgumentsRange,
1331
+ location,
1332
+ };
1280
1333
  }
1281
- if (token.kind === "Operator" && isOperatorName(token.text) && !isTlapm) {
1282
- return { kind: "Identifier", name: token.text, spelling: token.spelling, location };
1334
+ if (isOperatorNamed && !isTlapm) {
1335
+ return isSelectorAhead()
1336
+ ? parseSelections(token.text, [], undefined, start, location)
1337
+ : { kind: "Identifier", name: token.text, spelling: token.spelling, location };
1283
1338
  }
1284
1339
  switch (token.text) {
1285
1340
  case "(": {
@@ -1551,6 +1606,57 @@ const parse = (
1551
1606
  apply,
1552
1607
  });
1553
1608
 
1609
+ // expr_or_op's non_test: a postfix operator before an expression in parentheses is an atom.
1610
+ const parseTlapmNonfixPostfix = (token: Token) =>
1611
+ token.kind === "Operator" && DEFINABLE_POSTFIX_OPERATORS.has(token.text) && isAt("(", 1)
1612
+ ? attempt(() =>
1613
+ withBracketLayout(() => {
1614
+ advance();
1615
+ advance();
1616
+ const operand = parseExpression();
1617
+ const end = cursor - 1;
1618
+ expect(")");
1619
+ return { end, expression: getPostfixApplication(token, operand) };
1620
+ }),
1621
+ )
1622
+ : undefined;
1623
+
1624
+ // A comma directly inside the parentheses after the operator, without which non_test's
1625
+ // attempt at `(e, f)` fails. A selector's << or >> isn't a bracket.
1626
+ const hasNonfixComma = () => {
1627
+ let depth = 0;
1628
+ for (let index = cursor + 1; index < tokens.length; index++) {
1629
+ const token = tokens[index];
1630
+ if (token.kind !== "Operator") continue;
1631
+ if (depth === 1 && token.text === ",") return true;
1632
+ if (tokens[index - 1].text === "!") continue;
1633
+ if (OPENING_BRACKETS.has(token.text)) depth++;
1634
+ if (CLOSING_BRACKETS.has(token.text) && --depth === 0) return false;
1635
+ }
1636
+ return false;
1637
+ };
1638
+
1639
+ // expr_or_op's non_test: an infix operator before two expressions in parentheses is an atom.
1640
+ const parseTlapmNonfixInfix = (token: Token) =>
1641
+ isAt("(", 1) && hasNonfixComma()
1642
+ ? attempt(() =>
1643
+ withBracketLayout((): Expression => {
1644
+ advance();
1645
+ advance();
1646
+ const left = parseExpression();
1647
+ expect(",");
1648
+ const right = parseExpression();
1649
+ expect(")");
1650
+ return {
1651
+ kind: "Apply",
1652
+ operator: token.text,
1653
+ args: [left, right],
1654
+ location: getLocation(token),
1655
+ };
1656
+ }),
1657
+ )
1658
+ : undefined;
1659
+
1554
1660
  const parseTlapmItem = (isStart: boolean): TlapmItem | undefined => {
1555
1661
  const start = cursor;
1556
1662
  const token = peek();
@@ -1578,6 +1684,11 @@ const parse = (
1578
1684
  }));
1579
1685
  }
1580
1686
  if (infix) {
1687
+ // Pco.resolve has no operator to put before that atom, so the expression ends here.
1688
+ if (parseTlapmNonfixInfix(token)) {
1689
+ cursor = start;
1690
+ return undefined;
1691
+ }
1581
1692
  advance();
1582
1693
  return {
1583
1694
  ...getTlapmOperator(start, "Infix", infix, (operands) =>
@@ -1595,28 +1706,25 @@ const parse = (
1595
1706
  }
1596
1707
  if (token.kind !== "Operator" || !DEFINABLE_POSTFIX_OPERATORS.has(token.text))
1597
1708
  return undefined;
1709
+ // Pco.resolve has no operator to put before that atom, so the expression ends here.
1710
+ if (parseTlapmNonfixPostfix(token)) {
1711
+ cursor = start;
1712
+ return undefined;
1713
+ }
1598
1714
  advance();
1599
1715
  return getTlapmOperator(start, "Postfix", POSTFIX_PRECEDENCE, (operands) =>
1600
1716
  getPostfixApplication(token, operands[0].expression),
1601
1717
  );
1602
1718
  }
1603
1719
  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;
1720
+ return getTlapmOperand(parseJunctionList(), start);
1721
+ const nonfix = infix ? parseTlapmNonfixInfix(token) : undefined;
1619
1722
  if (nonfix) return getTlapmOperand(nonfix, start);
1723
+ const nonfixPostfix = parseTlapmNonfixPostfix(token);
1724
+ if (nonfixPostfix) {
1725
+ nonfixPostfix.expression.location.range = getRange(start, nonfixPostfix.end);
1726
+ return { start, end: nonfixPostfix.end, expression: nonfixPostfix.expression };
1727
+ }
1620
1728
  const prefix = isOperator ? TLAPM_PREFIX_OPERATORS.get(token.text) : undefined;
1621
1729
  if (prefix) {
1622
1730
  advance();
@@ -2156,23 +2264,50 @@ const parse = (
2156
2264
  );
2157
2265
  };
2158
2266
 
2267
+ const parseHypothesis = () => {
2268
+ if (peek().kind === "Identifier" && isAt("::", 1) && isAt("ASSUME", 2)) {
2269
+ advance();
2270
+ advance();
2271
+ }
2272
+ if (isAt("ASSUME")) return withProofScope(parseAssumeProve);
2273
+ if (peek().kind === "Keyword" && NEW_SYMBOL_STARTS.has(peek().text))
2274
+ return isTlapm ? commit(parseNewSymbol) : parseNewSymbol();
2275
+ if (!isTlapm) return parseExpression();
2276
+ // expr_or_sequent: where no expression starts, the sequent's ASSUME fails last.
2277
+ const expression = attempt(parseExpression);
2278
+ if (expression === undefined) throw createUnexpected("Expected a hypothesis");
2279
+ return expression;
2280
+ };
2281
+
2282
+ // comma1 (hyp b): Pco.star attempts the hypotheses after the first, each inside the one before,
2283
+ // so a failure that backtracks ends the list, and tlapm reports any other before the first comma.
2284
+ const parseTlapmHypotheses = () => {
2285
+ const assumptions = [parseHypothesis()];
2286
+ withRestorePoint(() => {
2287
+ while (true) {
2288
+ const assumption = attempt(() => {
2289
+ expect(",");
2290
+ return parseHypothesis();
2291
+ });
2292
+ if (assumption === undefined) break;
2293
+ assumptions.push(assumption);
2294
+ }
2295
+ });
2296
+ return assumptions;
2297
+ };
2298
+
2159
2299
  const parseAssumeProve = (): AssumeProve => {
2160
2300
  const start = cursor;
2161
2301
  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
- );
2302
+ const parseSequent = (): AssumeProve => {
2303
+ const assumptions = isTlapm ? parseTlapmHypotheses() : parseSeparated(parseHypothesis);
2304
+ expect("PROVE");
2305
+ return withRange(
2306
+ { kind: "AssumeProve", assumptions, conclusion: parseExpression(), location },
2307
+ start,
2308
+ );
2309
+ };
2310
+ return isTlapm ? commit(parseSequent) : parseSequent();
2176
2311
  };
2177
2312
 
2178
2313
  const isNameListAhead = (terminator: string) => {
@@ -2384,20 +2519,26 @@ const parse = (
2384
2519
  throw createProofError(
2385
2520
  `Unexpected end of (sub)proof at level ${level} before QED step`,
2386
2521
  levelSpan,
2522
+ NEWLINES,
2387
2523
  );
2388
2524
  }
2389
2525
  if (item.kind === "Leaf") {
2390
2526
  throw createProofError(
2391
2527
  `Expecting a proof step but found a${LEAF_NAMES[item.proof.kind]} leaf proof`,
2392
2528
  item.span,
2529
+ NEWLINES,
2393
2530
  );
2394
2531
  }
2395
2532
  if (!isFirst && item.isProof) {
2396
- throw createProofError("PROOF keyword found in step that does not begin subproof", item.span);
2533
+ throw createProofError(
2534
+ "PROOF keyword found in step that does not begin subproof",
2535
+ item.span,
2536
+ PRINTED_NEWLINE,
2537
+ );
2397
2538
  }
2398
2539
  const implicit = item.token.text[1];
2399
2540
  if (implicit === "+" && !isFirst) {
2400
- throw createProofError("<+> used but no subproof expected", item.span);
2541
+ throw createProofError("<+> used but no subproof expected", item.span, PRINTED_NEWLINE);
2401
2542
  }
2402
2543
  const stepLevel =
2403
2544
  implicit === "*"
@@ -2452,6 +2593,7 @@ const parse = (
2452
2593
  throw createProofError(
2453
2594
  "extra step(s) after finished proof",
2454
2595
  extra.span,
2596
+ NO_NEWLINES,
2455
2597
  "Proof.Parser.toplevel",
2456
2598
  );
2457
2599
  }
@@ -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
 
@@ -21,14 +21,7 @@ const DECIDERS: Record<
21
21
  > = {
22
22
  smt: decideZ3,
23
23
  z3: decideZ3,
24
- zenon: (text, options) => {
25
- const decision = decideZenon(text, options);
26
- return {
27
- verdict: decision.verdict,
28
- ...("proof" in decision && { output: decision.proof }),
29
- ...("error" in decision && { errorOutput: decision.error }),
30
- };
31
- },
24
+ zenon: decideZenon,
32
25
  isabelle: (text, options) => ({ verdict: decideIsabelle(text, options) }),
33
26
  ls4: (text, options) => ({ verdict: decidePtl(text, options) }),
34
27
  };
@@ -1,5 +1,3 @@
1
- // Ported from tlapm's src/backend/isabelle.ml (BSD licensed, see LICENSE-tlapm).
2
-
3
1
  import { TlapmBugError, TlaProverError, TlaUnsupportedError } from "../../errors";
4
2
  import { createContext, getBoundName, popNames, pushName } from "../../obligations/printer";
5
3
  import type { Bound, Builtin, Expr, Sequent } from "../../obligations/expression";
@@ -1,17 +1,21 @@
1
- // Ported from Isabelle2025's Pure/Isar/attrib.ML, Pure/Tools/rule_insts.ML and the rules they use
2
- // from Pure/drule.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet
3
- // Muenchen, and contributors, see LICENSE.
4
-
5
1
  import { TlaIsabelleError } from "../../../errors";
2
+ import { addUnsafeDest, addUnsafeElim, addUnsafeIntro, withClaset } from "../provers/classical";
6
3
  import { asmRl, compIncr, genAll, multiResolves, zeroVarIndexes } from "../pure/drule";
4
+ import { addSimps } from "../pure/raw-simplifier";
7
5
  import { chopSeq } from "../pure/seq";
8
6
  import { stripImpConcl } from "../pure/logic";
9
- import { fastypeOf, type Term, type Var } from "../pure/term";
7
+ import { fastypeOf, type Var } from "../pure/term";
10
8
  import { instantiate, instantiateTypes, type Thm } from "../pure/thm";
11
9
  import { emptyTyEnv, matchTypes, substType, type TyEnv } from "../pure/type";
12
- import { getFact, readTerms, type IsarContext } from "./context";
13
- import { rewriteRule } from "./method";
14
- import { syntaxError, type AttributeSource, type FactReference, type OuterToken } from "./theory";
10
+ import { getFact, readTerms, varsOf, type IsarContext } from "./context";
11
+ import { rewriteRule, type ProofContext } from "./method";
12
+ import {
13
+ innerText,
14
+ syntaxError,
15
+ type AttributeSource,
16
+ type FactReference,
17
+ type OuterToken,
18
+ } from "./theory";
15
19
 
16
20
  const isInnerToken = (token: OuterToken | undefined) =>
17
21
  token !== undefined &&
@@ -20,11 +24,6 @@ const isInnerToken = (token: OuterToken | undefined) =>
20
24
  token.kind === "word" ||
21
25
  token.kind === "var");
22
26
 
23
- const innerText = (token: OuterToken) =>
24
- token.kind === "cartouche"
25
- ? token.text.slice("\\<open>".length, -"\\<close>".length)
26
- : token.text;
27
-
28
27
  export const parseFactReferences = (tokens: readonly OuterToken[]): FactReference[] => {
29
28
  const references: FactReference[] = [];
30
29
  let position = 0;
@@ -66,25 +65,6 @@ export const parseFactReferences = (tokens: readonly OuterToken[]): FactReferenc
66
65
  return references;
67
66
  };
68
67
 
69
- // Vars.add_vars: the variables in the order they occur.
70
- const varsOf = (terms: readonly Term[]): Var[] => {
71
- const found: Var[] = [];
72
- const visit = (term: Term) => {
73
- if (
74
- term.kind === "Var" &&
75
- !found.some((other) => other.name === term.name && other.index === term.index)
76
- )
77
- found.push(term);
78
- if (term.kind === "Abs") visit(term.body);
79
- if (term.kind === "App") {
80
- visit(term.fun);
81
- visit(term.arg);
82
- }
83
- };
84
- for (const term of terms) visit(term);
85
- return found;
86
- };
87
-
88
68
  const varsOfThm = (thm: Thm) => varsOf([...thm.tpairs.flat(), thm.prop]);
89
69
 
90
70
  // Rule_Insts.where_rule: the terms are read against the variables' types, whose type variables
@@ -98,7 +78,10 @@ const whereRule = (
98
78
  const targets = insts.map((inst) => {
99
79
  const variable = vars.find((other) => other.name === inst.name && other.index === inst.index);
100
80
  if (variable === undefined)
101
- throw new TlaIsabelleError("ERROR", `No such variable in theorem: ?${inst.name}`);
81
+ throw new TlaIsabelleError(
82
+ "ERROR",
83
+ `No such variable in theorem: "?${inst.name}${inst.index === 0 ? "" : inst.index}"`,
84
+ );
102
85
  return variable;
103
86
  });
104
87
  const terms = readTerms(
@@ -154,14 +137,17 @@ const parseWhere = (args: readonly OuterToken[]) => {
154
137
  const insts: { name: string; index: number; text: string }[] = [];
155
138
  let position = 0;
156
139
  while (position < args.length) {
157
- if (args[position].kind === "symbol" && args[position].text === "?") position += 1;
158
140
  const variable = args[position];
159
- if (variable?.kind !== "word" || variable.text.startsWith("'")) throw syntaxError(variable);
141
+ if ((variable.kind !== "word" && variable.kind !== "var") || variable.text.startsWith("'"))
142
+ throw syntaxError(variable);
160
143
  const digits = /\d*$/.exec(variable.text)?.[0] ?? "";
161
144
  if (args[position + 1]?.text !== "=" || !isInnerToken(args[position + 2]))
162
145
  throw syntaxError(args[position + 1]);
163
146
  insts.push({
164
- name: variable.text.slice(0, variable.text.length - digits.length),
147
+ name: variable.text.slice(
148
+ variable.kind === "var" ? 1 : 0,
149
+ variable.text.length - digits.length,
150
+ ),
165
151
  index: Number(digits || 0),
166
152
  text: innerText(args[position + 2]),
167
153
  });
@@ -186,28 +172,79 @@ const ofFacts = (context: IsarContext, rule: Thm, facts: readonly Thm[]): Thm =>
186
172
  const rulify = (context: IsarContext, thm: Thm): Thm =>
187
173
  zeroVarIndexes(genAll(rewriteRule(context.tactics.limits, context.tactics.rulifyRules, thm)));
188
174
 
189
- export const applyAttribute = (context: IsarContext, attribute: AttributeSource, thm: Thm): Thm => {
175
+ // Simplifier.simp_add and Classical's unsafe_intro, unsafe_elim and unsafe_dest: the declarations
176
+ // that add the theorem to a set the methods read.
177
+ const declareRule = (tactics: ProofContext, name: string, thm: Thm): ProofContext => {
178
+ if (name === "simp")
179
+ return {
180
+ ...tactics,
181
+ simpset: addSimps({ limits: tactics.limits, simpset: tactics.simpset, bounds: 0 }, [thm]),
182
+ };
183
+ const classical = tactics.classical;
184
+ const add = name === "intro" ? addUnsafeIntro : name === "elim" ? addUnsafeElim : addUnsafeDest;
185
+ return {
186
+ ...tactics,
187
+ classical: withClaset(classical, add(classical, thm, tactics.atomizeRules)),
188
+ };
189
+ };
190
+
191
+ // Thm.apply_attribute: a rule attribute changes the theorem, a declaration the context.
192
+ const applyAttribute = (
193
+ context: IsarContext,
194
+ attribute: AttributeSource,
195
+ thm: Thm,
196
+ ): [IsarContext, Thm] => {
190
197
  switch (attribute.name) {
191
198
  case "of":
192
- return ofRule(context, attribute.args, thm);
199
+ return [context, ofRule(context, attribute.args, thm)];
193
200
  case "where":
194
- return whereRule(context, parseWhere(attribute.args), thm);
201
+ return [context, whereRule(context, parseWhere(attribute.args), thm)];
195
202
  case "rule_format":
196
203
  if (attribute.args.length > 0) throw syntaxError(attribute.args[0]);
197
- return rulify(context, thm);
204
+ return [context, rulify(context, thm)];
198
205
  case "OF":
199
- return ofFacts(context, thm, getThms(context, parseFactReferences(attribute.args)));
206
+ return [
207
+ context,
208
+ ofFacts(context, thm, getThms(context, parseFactReferences(attribute.args))),
209
+ ];
210
+ case "simp":
211
+ case "intro":
212
+ case "elim":
213
+ case "dest":
214
+ if (attribute.args.length > 0)
215
+ throw new TlaIsabelleError("ERROR", `Unsupported ${attribute.name} attribute arguments`);
216
+ return [{ ...context, tactics: declareRule(context.tactics, attribute.name, thm) }, thm];
200
217
  default:
201
218
  throw new TlaIsabelleError("ERROR", `Unsupported attribute: ${attribute.name}`);
202
219
  }
203
220
  };
204
221
 
205
- export const getThms = (context: IsarContext, references: readonly FactReference[]): Thm[] =>
206
- references.flatMap((reference) =>
207
- getFact(context, reference.name).map((thm) =>
208
- reference.attributes.reduce(
209
- (result, attribute) => applyAttribute(context, attribute, result),
210
- thm,
211
- ),
212
- ),
222
+ // Thm.proof_attributes over a fact's theorems: each attribute sees what those before it declared.
223
+ export const applyAttributes = (
224
+ context: IsarContext,
225
+ attributes: readonly AttributeSource[],
226
+ thms: readonly Thm[],
227
+ ): [IsarContext, Thm[]] =>
228
+ thms.reduce<[IsarContext, Thm[]]>(
229
+ ([current, results], thm) => {
230
+ const [declared, result] = attributes.reduce<[IsarContext, Thm]>(
231
+ ([inner, changed], attribute) => applyAttribute(inner, attribute, changed),
232
+ [current, thm],
233
+ );
234
+ return [declared, [...results, result]];
235
+ },
236
+ [context, []],
213
237
  );
238
+
239
+ // The facts a command or a method cites, where the port keeps no declaration.
240
+ export const getThms = (context: IsarContext, references: readonly FactReference[]): Thm[] =>
241
+ references.flatMap((reference) => {
242
+ const [declared, thms] = applyAttributes(
243
+ context,
244
+ reference.attributes,
245
+ getFact(context, reference.name),
246
+ );
247
+ if (declared !== context)
248
+ throw new TlaIsabelleError("ERROR", "Unsupported declaration in a fact reference");
249
+ return thms;
250
+ });