tla-ts 0.0.10-dev.b4a856304 → 0.0.10-dev.c92e6a4ea

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 (586) hide show
  1. package/README.md +2 -1
  2. package/dist/compile.cjs +6 -6
  3. package/dist/compile.js +10 -10
  4. package/dist/deciders.cjs +41 -37
  5. package/dist/deciders.js +57 -53
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +37 -0
  8. package/dist/index.d.ts +37 -0
  9. package/dist/index.js +1 -1
  10. package/dist/parallel-worker.cjs +1 -1
  11. package/dist/parallel-worker.js +1 -1
  12. package/dist/prove.cjs +2683 -427
  13. package/dist/prove.js +2681 -425
  14. package/dist/run.cjs +45 -44
  15. package/dist/run.js +45 -44
  16. package/dist/tlapm.cjs +2 -2
  17. package/dist/tlapm.js +2 -2
  18. package/dist/transfer.cjs +44 -41
  19. package/dist/transfer.js +45 -42
  20. package/dist/worker.cjs +7 -7
  21. package/dist/worker.js +7 -7
  22. package/package.json +1 -1
  23. package/src/ast.ts +41 -41
  24. package/src/bags.ts +2 -5
  25. package/src/builtins.ts +5 -21
  26. package/src/check-failure.ts +116 -0
  27. package/src/check-trace.ts +268 -0
  28. package/src/check.ts +578 -757
  29. package/src/cli/options.ts +6 -31
  30. package/src/cli/run.ts +0 -2
  31. package/src/cli/runtime-invariants.ts +27 -62
  32. package/src/cli/shared.ts +1 -5
  33. package/src/cli/tlapm.ts +433 -70
  34. package/src/cli/tlc-arguments.ts +246 -240
  35. package/src/cli/tlc-output.ts +686 -0
  36. package/src/cli/tlc-usage.ts +3 -5
  37. package/src/cli/tlc.ts +59 -707
  38. package/src/cli/xml-exporter.ts +23 -33
  39. package/src/codegen.ts +5 -10
  40. package/src/coverage.ts +3 -10
  41. package/src/dependencies.ts +30 -14
  42. package/src/dfid.ts +16 -16
  43. package/src/environment-config.ts +315 -0
  44. package/src/environment.ts +73 -338
  45. package/src/errors.ts +33 -5
  46. package/src/evaluate.ts +34 -107
  47. package/src/exit-codes.ts +3 -0
  48. package/src/fingerprints.ts +65 -1
  49. package/src/instances.ts +47 -10
  50. package/src/java-hash.ts +7 -0
  51. package/src/java-overrides.ts +4 -9
  52. package/src/json-reader.ts +1 -2
  53. package/src/json.ts +8 -18
  54. package/src/levels.ts +46 -57
  55. package/src/lexer.ts +76 -85
  56. package/src/liveness-checker.ts +634 -306
  57. package/src/liveness.ts +104 -120
  58. package/src/obligations/action.ts +14 -17
  59. package/src/obligations/anonymize.ts +37 -16
  60. package/src/obligations/enabled-axioms.ts +218 -0
  61. package/src/obligations/equality.ts +1 -3
  62. package/src/obligations/expression.ts +36 -8
  63. package/src/obligations/format.ts +0 -2
  64. package/src/obligations/generate.ts +66 -54
  65. package/src/obligations/index.ts +38 -8
  66. package/src/obligations/levels.ts +24 -11
  67. package/src/obligations/module.ts +28 -41
  68. package/src/obligations/normalize.ts +26 -14
  69. package/src/obligations/operators.ts +0 -2
  70. package/src/obligations/pragma.ts +53 -16
  71. package/src/obligations/printer.ts +43 -13
  72. package/src/obligations/proof.ts +3 -2
  73. package/src/obligations/regroup.ts +0 -2
  74. package/src/obligations/simplify.ts +55 -50
  75. package/src/obligations/source.ts +118 -74
  76. package/src/obligations/subexpression.ts +45 -18
  77. package/src/obligations/substitution.ts +1 -3
  78. package/src/obligations/temporal.ts +5 -7
  79. package/src/obligations/tuples.ts +0 -2
  80. package/src/parallel-worker.ts +17 -31
  81. package/src/parallel.ts +55 -80
  82. package/src/parser.ts +722 -385
  83. package/src/pcal/ast.ts +53 -65
  84. package/src/pcal/parse.ts +144 -191
  85. package/src/pcal/tokenize.ts +91 -115
  86. package/src/pcal/translate.ts +83 -98
  87. package/src/pcal/validate.ts +48 -50
  88. package/src/pretty-print.ts +7 -7
  89. package/src/prover/decide-pool.ts +3 -3
  90. package/src/prover/deciders.ts +12 -9
  91. package/src/prover/isabelle/decide.ts +3 -25
  92. package/src/prover/isabelle/encode.ts +72 -42
  93. package/src/prover/isabelle/isar/attrib.ts +250 -0
  94. package/src/prover/isabelle/isar/context.ts +335 -0
  95. package/src/prover/isabelle/isar/induct.ts +382 -0
  96. package/src/prover/isabelle/isar/inner-syntax.ts +158 -7
  97. package/src/prover/isabelle/isar/method.ts +509 -212
  98. package/src/prover/isabelle/isar/proof.ts +570 -14
  99. package/src/prover/isabelle/isar/rule-cases.ts +224 -0
  100. package/src/prover/isabelle/isar/theory.ts +487 -76
  101. package/src/prover/isabelle/isar/toplevel.ts +331 -0
  102. package/src/prover/isabelle/isar/type-check.ts +89 -14
  103. package/src/prover/isabelle/provers/blast/blast.ts +7 -65
  104. package/src/prover/isabelle/provers/blast/branch.ts +0 -2
  105. package/src/prover/isabelle/provers/blast/prove.ts +0 -2
  106. package/src/prover/isabelle/provers/blast/rules.ts +0 -2
  107. package/src/prover/isabelle/provers/blast/state.ts +0 -2
  108. package/src/prover/isabelle/provers/blast/term.ts +0 -2
  109. package/src/prover/isabelle/provers/clasimp.ts +0 -2
  110. package/src/prover/isabelle/provers/classical.ts +45 -20
  111. package/src/prover/isabelle/provers/hypsubst.ts +17 -28
  112. package/src/prover/isabelle/pure/bicompose.ts +9 -27
  113. package/src/prover/isabelle/pure/consts.ts +0 -2
  114. package/src/prover/isabelle/pure/conv.ts +2 -10
  115. package/src/prover/isabelle/pure/drule.ts +72 -6
  116. package/src/prover/isabelle/pure/envir.ts +0 -2
  117. package/src/prover/isabelle/pure/goal.ts +1 -3
  118. package/src/prover/isabelle/pure/logic.ts +1 -3
  119. package/src/prover/isabelle/pure/name.ts +0 -2
  120. package/src/prover/isabelle/pure/net.ts +0 -2
  121. package/src/prover/isabelle/pure/object-logic.ts +13 -7
  122. package/src/prover/isabelle/pure/pattern.ts +0 -2
  123. package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
  124. package/src/prover/isabelle/pure/rewriter.ts +6 -17
  125. package/src/prover/isabelle/pure/search.ts +0 -2
  126. package/src/prover/isabelle/pure/seq.ts +0 -2
  127. package/src/prover/isabelle/pure/simplifier.ts +26 -7
  128. package/src/prover/isabelle/pure/table.ts +2 -3
  129. package/src/prover/isabelle/pure/tactic.ts +0 -2
  130. package/src/prover/isabelle/pure/tactical.ts +42 -37
  131. package/src/prover/isabelle/pure/term-ord.ts +0 -2
  132. package/src/prover/isabelle/pure/term.ts +0 -2
  133. package/src/prover/isabelle/pure/thm.ts +14 -13
  134. package/src/prover/isabelle/pure/type.ts +0 -2
  135. package/src/prover/isabelle/pure/unify.ts +0 -2
  136. package/src/prover/isabelle/pure/variable.ts +0 -2
  137. package/src/prover/isabelle/tla/classical-setup.ts +18 -16
  138. package/src/prover/isabelle/tla/context.ts +58 -11
  139. package/src/prover/isabelle/tla/logic-data.ts +1 -1
  140. package/src/prover/isabelle/tla/logic.ts +49 -21
  141. package/src/prover/isabelle/tla/simpdata.ts +1 -12
  142. package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
  143. package/src/prover/ocaml.ts +4 -1
  144. package/src/prover/prep/action.ts +30 -31
  145. package/src/prover/prep/enabled-axioms.ts +11 -2
  146. package/src/prover/prep/fingerprint.ts +2 -5
  147. package/src/prover/prep/methods.ts +181 -51
  148. package/src/prover/prep/normalize.ts +38 -9
  149. package/src/prover/prove.ts +395 -94
  150. package/src/prover/ptl/decide.ts +95 -50
  151. package/src/prover/ptl/encode.ts +2 -3
  152. package/src/prover/ptl/tableau.ts +28 -2
  153. package/src/prover/smt/arithmetic.ts +310 -0
  154. package/src/prover/smt/axioms.ts +12 -8
  155. package/src/prover/smt/context.ts +43 -8
  156. package/src/prover/smt/data.ts +498 -379
  157. package/src/prover/smt/encode.ts +148 -57
  158. package/src/prover/smt/extensionality.ts +5 -3
  159. package/src/prover/smt/flatten.ts +4 -6
  160. package/src/prover/smt/format.ts +28 -4
  161. package/src/prover/smt/instances.ts +7 -1
  162. package/src/prover/smt/layout.ts +91 -0
  163. package/src/prover/smt/rewrite.ts +1021 -618
  164. package/src/prover/smt/simplify.ts +441 -0
  165. package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
  166. package/src/prover/smt/solver/ackr-helper.ts +179 -0
  167. package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
  168. package/src/prover/smt/solver/act-cache.ts +0 -1
  169. package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
  170. package/src/prover/smt/solver/aig-tactic.ts +52 -0
  171. package/src/prover/smt/solver/aig.ts +889 -0
  172. package/src/prover/smt/solver/arith-rewriter.ts +613 -6
  173. package/src/prover/smt/solver/arith-terms.ts +121 -0
  174. package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
  175. package/src/prover/smt/solver/array-rewriter.ts +309 -0
  176. package/src/prover/smt/solver/asserted-formulas.ts +87 -16
  177. package/src/prover/smt/solver/ast-lt.ts +166 -12
  178. package/src/prover/smt/solver/ast-util.ts +160 -2
  179. package/src/prover/smt/solver/ast.ts +1427 -41
  180. package/src/prover/smt/solver/auf-solver.ts +2 -6
  181. package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
  182. package/src/prover/smt/solver/bit-blaster.ts +871 -0
  183. package/src/prover/smt/solver/bound-manager.ts +196 -0
  184. package/src/prover/smt/solver/bound-simplifier.ts +600 -0
  185. package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
  186. package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
  187. package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
  188. package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
  189. package/src/prover/smt/solver/bv1-blast.ts +214 -0
  190. package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
  191. package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
  192. package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
  193. package/src/prover/smt/solver/card2bv.ts +110 -0
  194. package/src/prover/smt/solver/case-split-queue.ts +0 -2
  195. package/src/prover/smt/solver/cg-table.ts +39 -25
  196. package/src/prover/smt/solver/check-logic.ts +330 -0
  197. package/src/prover/smt/solver/clause.ts +0 -1
  198. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
  199. package/src/prover/smt/solver/conflict-resolution.ts +78 -2
  200. package/src/prover/smt/solver/context.ts +516 -115
  201. package/src/prover/smt/solver/ctx-simplify.ts +20 -10
  202. package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
  203. package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
  204. package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
  205. package/src/prover/smt/solver/demodulator.ts +786 -0
  206. package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
  207. package/src/prover/smt/solver/der.ts +38 -10
  208. package/src/prover/smt/solver/diff-neq.ts +206 -0
  209. package/src/prover/smt/solver/distribute-forall.ts +57 -0
  210. package/src/prover/smt/solver/dom-simplify.ts +511 -0
  211. package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
  212. package/src/prover/smt/solver/dyn-ack.ts +0 -1
  213. package/src/prover/smt/solver/e-matching.ts +7 -8
  214. package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
  215. package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
  216. package/src/prover/smt/solver/enode.ts +100 -3
  217. package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
  218. package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
  219. package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
  220. package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
  221. package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
  222. package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
  223. package/src/prover/smt/solver/euf/array-solver.ts +306 -0
  224. package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
  225. package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
  226. package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
  227. package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
  228. package/src/prover/smt/solver/euf/egraph.ts +908 -0
  229. package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
  230. package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
  231. package/src/prover/smt/solver/euf/mam.ts +1050 -0
  232. package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
  233. package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
  234. package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
  235. package/src/prover/smt/solver/euf/q-solver.ts +361 -0
  236. package/src/prover/smt/solver/euf/th-solver.ts +335 -0
  237. package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
  238. package/src/prover/smt/solver/expr-ref.ts +0 -1
  239. package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
  240. package/src/prover/smt/solver/expr2polynomial.ts +146 -0
  241. package/src/prover/smt/solver/factor.ts +141 -0
  242. package/src/prover/smt/solver/fd-solver.ts +265 -0
  243. package/src/prover/smt/solver/fingerprints.ts +15 -15
  244. package/src/prover/smt/solver/fix-dl-var.ts +148 -0
  245. package/src/prover/smt/solver/flat-literals.ts +0 -1
  246. package/src/prover/smt/solver/fm-tactic.ts +884 -0
  247. package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
  248. package/src/prover/smt/solver/fpa-rewriter.ts +640 -0
  249. package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
  250. package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
  251. package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
  252. package/src/prover/smt/solver/goal.ts +175 -15
  253. package/src/prover/smt/solver/goal2nlsat.ts +189 -0
  254. package/src/prover/smt/solver/guard-set.ts +219 -0
  255. package/src/prover/smt/solver/hash.ts +0 -1
  256. package/src/prover/smt/solver/hashtable.ts +30 -16
  257. package/src/prover/smt/solver/inf-eps.ts +63 -0
  258. package/src/prover/smt/solver/inj-axiom.ts +101 -0
  259. package/src/prover/smt/solver/internalizer.ts +110 -38
  260. package/src/prover/smt/solver/lackr.ts +381 -0
  261. package/src/prover/smt/solver/lbool.ts +0 -1
  262. package/src/prover/smt/solver/lia2card.ts +268 -0
  263. package/src/prover/smt/solver/lia2pb.ts +154 -0
  264. package/src/prover/smt/solver/literal.ts +0 -1
  265. package/src/prover/smt/solver/logic-tactics.ts +345 -0
  266. package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
  267. package/src/prover/smt/solver/lp/constraints.ts +0 -1
  268. package/src/prover/smt/solver/lp/containers.ts +7 -2
  269. package/src/prover/smt/solver/lp/core-solver.ts +18 -3
  270. package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
  271. package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
  272. package/src/prover/smt/solver/lp/dependency.ts +0 -2
  273. package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
  274. package/src/prover/smt/solver/lp/explanation.ts +0 -1
  275. package/src/prover/smt/solver/lp/gomory.ts +0 -1
  276. package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
  277. package/src/prover/smt/solver/lp/hnf.ts +0 -3
  278. package/src/prover/smt/solver/lp/int-cube.ts +3 -4
  279. package/src/prover/smt/solver/lp/int-solver.ts +0 -2
  280. package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
  281. package/src/prover/smt/solver/lp/lar-term.ts +0 -1
  282. package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
  283. package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
  284. package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
  285. package/src/prover/smt/solver/lp/nex.ts +2 -2
  286. package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
  287. package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
  288. package/src/prover/smt/solver/lp/nla-core.ts +67 -16
  289. package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
  290. package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
  291. package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
  292. package/src/prover/smt/solver/lp/nla-grobner.ts +165 -83
  293. package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
  294. package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
  295. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
  296. package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
  297. package/src/prover/smt/solver/lp/nla-order.ts +0 -2
  298. package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
  299. package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
  300. package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
  301. package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
  302. package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
  303. package/src/prover/smt/solver/lp/nla-types.ts +0 -2
  304. package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
  305. package/src/prover/smt/solver/lp/nra-solver.ts +122 -64
  306. package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
  307. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
  308. package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
  309. package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
  310. package/src/prover/smt/solver/lp/pdd.ts +725 -289
  311. package/src/prover/smt/solver/lp/random-updater.ts +0 -2
  312. package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
  313. package/src/prover/smt/solver/lp/union-find.ts +7 -2
  314. package/src/prover/smt/solver/macro-finder.ts +530 -0
  315. package/src/prover/smt/solver/mam-compiler.ts +122 -90
  316. package/src/prover/smt/solver/mam-interpreter.ts +0 -1
  317. package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
  318. package/src/prover/smt/solver/max-cliques.ts +105 -0
  319. package/src/prover/smt/solver/maxcore.ts +309 -0
  320. package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
  321. package/src/prover/smt/solver/maxlex.ts +115 -0
  322. package/src/prover/smt/solver/maxsmt-base.ts +105 -0
  323. package/src/prover/smt/solver/maxsmt.ts +92 -0
  324. package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
  325. package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
  326. package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
  327. package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
  328. package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
  329. package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
  330. package/src/prover/smt/solver/model-based-opt.ts +844 -0
  331. package/src/prover/smt/solver/model-checker.ts +18 -27
  332. package/src/prover/smt/solver/model-evaluator.ts +188 -12
  333. package/src/prover/smt/solver/model-finder.ts +12 -18
  334. package/src/prover/smt/solver/model-generator.ts +56 -29
  335. package/src/prover/smt/solver/model-macro-solver.ts +49 -46
  336. package/src/prover/smt/solver/model-printer.ts +214 -0
  337. package/src/prover/smt/solver/mpf.ts +711 -0
  338. package/src/prover/smt/solver/mus.ts +51 -0
  339. package/src/prover/smt/solver/muz/dl-context.ts +404 -0
  340. package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
  341. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
  342. package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
  343. package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
  344. package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
  345. package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
  346. package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
  347. package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
  348. package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
  349. package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
  350. package/src/prover/smt/solver/muz/hnf.ts +201 -0
  351. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
  352. package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
  353. package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
  354. package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
  355. package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
  356. package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
  357. package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
  358. package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
  359. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
  360. package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
  361. package/src/prover/smt/solver/muz/substitution.ts +203 -0
  362. package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
  363. package/src/prover/smt/solver/nlqsat.ts +484 -0
  364. package/src/prover/smt/solver/nlsat/algebraic.ts +125 -12
  365. package/src/prover/smt/solver/nlsat/atoms.ts +20 -6
  366. package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
  367. package/src/prover/smt/solver/nlsat/explain.ts +63 -23
  368. package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
  369. package/src/prover/smt/solver/nlsat/levelwise.ts +3 -9
  370. package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
  371. package/src/prover/smt/solver/nlsat/polynomial.ts +13 -6
  372. package/src/prover/smt/solver/nlsat/solver.ts +236 -45
  373. package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
  374. package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
  375. package/src/prover/smt/solver/nlsat/types.ts +0 -2
  376. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
  377. package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
  378. package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
  379. package/src/prover/smt/solver/nnf.ts +105 -23
  380. package/src/prover/smt/solver/normalize-bounds.ts +53 -0
  381. package/src/prover/smt/solver/occf.ts +97 -0
  382. package/src/prover/smt/solver/opt-context.ts +787 -0
  383. package/src/prover/smt/solver/opt-nlsat.ts +375 -0
  384. package/src/prover/smt/solver/opt-pareto.ts +282 -0
  385. package/src/prover/smt/solver/opt-preprocess.ts +101 -0
  386. package/src/prover/smt/solver/opt-solver.ts +308 -0
  387. package/src/prover/smt/solver/opt-value.ts +55 -0
  388. package/src/prover/smt/solver/optsmt.ts +692 -0
  389. package/src/prover/smt/solver/parallel-tactic.ts +299 -0
  390. package/src/prover/smt/solver/pattern-inference.ts +19 -11
  391. package/src/prover/smt/solver/pb-rewriter.ts +284 -0
  392. package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
  393. package/src/prover/smt/solver/poly-rewriter.ts +202 -57
  394. package/src/prover/smt/solver/probes.ts +512 -0
  395. package/src/prover/smt/solver/propagate-values.ts +37 -21
  396. package/src/prover/smt/solver/proto-model.ts +648 -19
  397. package/src/prover/smt/solver/pull-quant.ts +28 -12
  398. package/src/prover/smt/solver/purify-arith.ts +632 -0
  399. package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
  400. package/src/prover/smt/solver/qe-lite-der.ts +2 -3
  401. package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
  402. package/src/prover/smt/solver/qe-lite.ts +37 -17
  403. package/src/prover/smt/solver/qe-mbp.ts +270 -0
  404. package/src/prover/smt/solver/qe.ts +1498 -0
  405. package/src/prover/smt/solver/qel.ts +25 -0
  406. package/src/prover/smt/solver/qi-queue.ts +0 -1
  407. package/src/prover/smt/solver/qsat.ts +814 -0
  408. package/src/prover/smt/solver/quant-hoist.ts +196 -0
  409. package/src/prover/smt/solver/quant-tactics.ts +16 -56
  410. package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
  411. package/src/prover/smt/solver/quantifier-manager.ts +8 -16
  412. package/src/prover/smt/solver/quasi-macros.ts +243 -0
  413. package/src/prover/smt/solver/random-gen.ts +0 -1
  414. package/src/prover/smt/solver/rational.ts +45 -1
  415. package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
  416. package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
  417. package/src/prover/smt/solver/reduce-args.ts +225 -0
  418. package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
  419. package/src/prover/smt/solver/ref-vector.ts +0 -1
  420. package/src/prover/smt/solver/relevancy.ts +1 -2
  421. package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
  422. package/src/prover/smt/solver/rewriter.ts +475 -36
  423. package/src/prover/smt/solver/rlimit.ts +38 -2
  424. package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
  425. package/src/prover/smt/solver/sat/big.ts +177 -0
  426. package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
  427. package/src/prover/smt/solver/sat/clause.ts +203 -0
  428. package/src/prover/smt/solver/sat/cleaner.ts +94 -0
  429. package/src/prover/smt/solver/sat/config.ts +122 -0
  430. package/src/prover/smt/solver/sat/consequences.ts +203 -0
  431. package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
  432. package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
  433. package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
  434. package/src/prover/smt/solver/sat/model-converter.ts +136 -0
  435. package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
  436. package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
  437. package/src/prover/smt/solver/sat/probing.ts +170 -0
  438. package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
  439. package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
  440. package/src/prover/smt/solver/sat/scc.ts +142 -0
  441. package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
  442. package/src/prover/smt/solver/sat/solver.ts +2127 -0
  443. package/src/prover/smt/solver/sat/var-queue.ts +117 -0
  444. package/src/prover/smt/solver/sat/watch-list.ts +140 -0
  445. package/src/prover/smt/solver/search-tree.ts +284 -0
  446. package/src/prover/smt/solver/seq-axioms.ts +1010 -0
  447. package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
  448. package/src/prover/smt/solver/seq-derive.ts +1298 -0
  449. package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
  450. package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
  451. package/src/prover/smt/solver/seq-factory.ts +89 -0
  452. package/src/prover/smt/solver/seq-monadic.ts +728 -0
  453. package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
  454. package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
  455. package/src/prover/smt/solver/seq-re-util.ts +758 -0
  456. package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
  457. package/src/prover/smt/solver/seq-regex-live.ts +200 -0
  458. package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
  459. package/src/prover/smt/solver/seq-skolem.ts +317 -0
  460. package/src/prover/smt/solver/seq-subset.ts +165 -0
  461. package/src/prover/smt/solver/seq-view-witness.ts +353 -0
  462. package/src/prover/smt/solver/smt-consequences.ts +297 -0
  463. package/src/prover/smt/solver/smt-kernel.ts +83 -0
  464. package/src/prover/smt/solver/smt-logics.ts +66 -0
  465. package/src/prover/smt/solver/smt-setup.ts +496 -0
  466. package/src/prover/smt/solver/smt2-printer.ts +765 -0
  467. package/src/prover/smt/solver/smtlib-parser.ts +3126 -316
  468. package/src/prover/smt/solver/smtlib-script.ts +1631 -0
  469. package/src/prover/smt/solver/solve-eqs.ts +929 -0
  470. package/src/prover/smt/solver/solver.ts +113 -22
  471. package/src/prover/smt/solver/static-features.ts +314 -0
  472. package/src/prover/smt/solver/sticky-generations.ts +0 -1
  473. package/src/prover/smt/solver/tactic.ts +1986 -0
  474. package/src/prover/smt/solver/term-enumeration.ts +205 -0
  475. package/src/prover/smt/solver/theory-array.ts +1240 -0
  476. package/src/prover/smt/solver/theory-bv.ts +1200 -0
  477. package/src/prover/smt/solver/theory-char.ts +355 -0
  478. package/src/prover/smt/solver/theory-datatype.ts +598 -0
  479. package/src/prover/smt/solver/theory-finite-set.ts +30 -0
  480. package/src/prover/smt/solver/theory-fpa.ts +389 -0
  481. package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
  482. package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
  483. package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
  484. package/src/prover/smt/solver/theory-lra-internalize.ts +94 -27
  485. package/src/prover/smt/solver/theory-lra-model.ts +20 -35
  486. package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
  487. package/src/prover/smt/solver/theory-lra-state.ts +6 -22
  488. package/src/prover/smt/solver/theory-lra.ts +188 -1
  489. package/src/prover/smt/solver/theory-pb.ts +934 -0
  490. package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
  491. package/src/prover/smt/solver/theory-recfun.ts +307 -0
  492. package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
  493. package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
  494. package/src/prover/smt/solver/theory-seq-state.ts +871 -0
  495. package/src/prover/smt/solver/theory-seq.ts +961 -0
  496. package/src/prover/smt/solver/theory.ts +189 -0
  497. package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
  498. package/src/prover/smt/solver/var-subst.ts +36 -14
  499. package/src/prover/smt/table.ts +3 -2
  500. package/src/prover/smt/types.ts +146 -0
  501. package/src/prover/tlapm/cache.ts +50 -19
  502. package/src/prover/tlapm/tlapm.ts +15 -9
  503. package/src/prover/tlapm-library.ts +3208 -0
  504. package/src/prover/verdict.ts +9 -0
  505. package/src/prover/zenon/check/check.ts +1 -2
  506. package/src/prover/zenon/check/records.ts +1 -1
  507. package/src/prover/zenon/check/relations.ts +2 -1
  508. package/src/prover/zenon/check/rewrites.ts +2 -15
  509. package/src/prover/zenon/check/sets.ts +40 -58
  510. package/src/prover/zenon/check/terms.ts +1 -2
  511. package/src/prover/zenon/decide.ts +10 -7
  512. package/src/prover/zenon/encode.ts +0 -2
  513. package/src/prover/zenon/eqrel.ts +2 -2
  514. package/src/prover/zenon/equality-rules.ts +24 -2
  515. package/src/prover/zenon/expr.ts +28 -2
  516. package/src/prover/zenon/index-table.ts +11 -21
  517. package/src/prover/zenon/isar-case.ts +0 -2
  518. package/src/prover/zenon/isar.ts +35 -37
  519. package/src/prover/zenon/llproof.ts +2 -13
  520. package/src/prover/zenon/mltoll.ts +12 -30
  521. package/src/prover/zenon/node.ts +20 -5
  522. package/src/prover/zenon/parse.ts +9 -8
  523. package/src/prover/zenon/phrase.ts +0 -2
  524. package/src/prover/zenon/proof.ts +0 -2
  525. package/src/prover/zenon/propositional-rules.ts +0 -2
  526. package/src/prover/zenon/rules.ts +2 -3
  527. package/src/prover/zenon/search.ts +11 -19
  528. package/src/prover/zenon/tla/functions.ts +2 -4
  529. package/src/prover/zenon/tla/llproof.ts +9 -13
  530. package/src/prover/zenon/tla/records.ts +1 -8
  531. package/src/prover/zenon/tla/rewrites.ts +0 -2
  532. package/src/prover/zenon/tla/sets.ts +22 -22
  533. package/src/prover/zenon/tla/terms.ts +0 -2
  534. package/src/prover/zenon/tla/tla.ts +7 -8
  535. package/src/randomization.ts +1 -4
  536. package/src/resolve.ts +67 -143
  537. package/src/runtime.ts +17 -18
  538. package/src/sany/builtins.ts +1 -3
  539. package/src/sany/generation.ts +394 -0
  540. package/src/sany/generator-def-entries.ts +210 -0
  541. package/src/sany/generator-definitions.ts +686 -0
  542. package/src/sany/generator-expressions.ts +1100 -0
  543. package/src/sany/generator-proofs.ts +662 -0
  544. package/src/sany/generator.ts +160 -2683
  545. package/src/sany/levels.ts +5 -11
  546. package/src/sany/lexer.ts +57 -60
  547. package/src/sany/linter.ts +0 -3
  548. package/src/sany/nodes.ts +6 -13
  549. package/src/sany/report.ts +3 -6
  550. package/src/sany/selectors.ts +35 -38
  551. package/src/sany/xml.ts +23 -55
  552. package/src/search.ts +244 -53
  553. package/src/simulate.ts +202 -184
  554. package/src/spec-description.ts +56 -82
  555. package/src/standard-definitions.ts +4 -3
  556. package/src/standard-modules.ts +17 -44
  557. package/src/state-graph.ts +3 -17
  558. package/src/subexpressions.ts +38 -47
  559. package/src/substitution-levels.ts +5 -4
  560. package/src/successors.ts +20 -43
  561. package/src/symmetry.ts +6 -21
  562. package/src/tableau.ts +2 -2
  563. package/src/tlc/fingerprint.ts +96 -30
  564. package/src/tlc/jar-data.ts +0 -1
  565. package/src/tlc/messages.ts +22 -36
  566. package/src/tlc/order.ts +36 -50
  567. package/src/tlc/random.ts +22 -34
  568. package/src/tlc/replay.ts +21 -48
  569. package/src/tlc/summary.ts +64 -58
  570. package/src/tlc/tlc-operators.ts +6 -17
  571. package/src/tlc/tlcext-operators.ts +70 -29
  572. package/src/tlc/trace-spec.ts +26 -51
  573. package/src/tlc/value-stream.ts +9 -13
  574. package/src/tlc/version.ts +0 -1
  575. package/src/typed-tier.ts +6535 -0
  576. package/src/typescript/actions.ts +2 -4
  577. package/src/typescript/collections.ts +34 -20
  578. package/src/typescript/compile.ts +1 -3
  579. package/src/typescript/formula.ts +5 -3
  580. package/src/typescript/model.ts +4 -5
  581. package/src/typescript/steps.ts +20 -18
  582. package/src/values.ts +136 -338
  583. package/src/prover/isabelle/isar/statement.ts +0 -52
  584. package/src/prover/smt/solver/z3-license.txt +0 -10
  585. package/src/prover/tlaps-module.ts +0 -510
  586. package/src/prover/zenon/LICENSE +0 -32
@@ -16,6 +16,7 @@ import { TlaProofError, TlaUnsupportedError } from "../errors";
16
16
  import {
17
17
  at,
18
18
  getFact,
19
+ mapChildren,
19
20
  type Bound,
20
21
  type Builtin,
21
22
  type Defn,
@@ -27,7 +28,7 @@ import {
27
28
  type Sequent,
28
29
  } from "./expression";
29
30
  import type { ModuleUnit, Mule } from "./module";
30
- import { findPragma, readNewMethod, readOldMethod } from "./pragma";
31
+ import { findPragma, findSuppressPragma, readNewMethod, readOldMethod } from "./pragma";
31
32
  import {
32
33
  expandChoose,
33
34
  expandFcn,
@@ -48,36 +49,38 @@ import {
48
49
  type Usable,
49
50
  } from "./proof";
50
51
 
51
- const BUILTINS: Record<string, Builtin> = {
52
- "=>": "Implies",
53
- "<=>": "Equiv",
54
- "/\\": "Conj",
55
- "\\/": "Disj",
56
- "~": "Neg",
57
- "=": "Eq",
58
- "#": "Neq",
59
- SUBSET: "SUBSET",
60
- UNION: "UNION",
61
- DOMAIN: "DOMAIN",
62
- "\\subseteq": "Subseteq",
63
- "\\in": "Mem",
64
- "\\notin": "Notmem",
65
- "\\": "Setminus",
66
- "\\cap": "Cap",
67
- "\\cup": "Cup",
68
- "'": "Prime",
69
- "~>": "Leadsto",
70
- ENABLED: "ENABLED",
71
- UNCHANGED: "UNCHANGED",
72
- "\\cdot": "Cdot",
73
- "-+->": "Actplus",
74
- "[]": "BoxTrue",
75
- "<>": "Diamond",
76
- TRUE: "TRUE",
77
- FALSE: "FALSE",
78
- BOOLEAN: "BOOLEAN",
79
- STRING: "STRING",
80
- };
52
+ const BUILTINS = new Map<string, Builtin>(
53
+ Object.entries({
54
+ "=>": "Implies",
55
+ "<=>": "Equiv",
56
+ "/\\": "Conj",
57
+ "\\/": "Disj",
58
+ "~": "Neg",
59
+ "=": "Eq",
60
+ "#": "Neq",
61
+ SUBSET: "SUBSET",
62
+ UNION: "UNION",
63
+ DOMAIN: "DOMAIN",
64
+ "\\subseteq": "Subseteq",
65
+ "\\in": "Mem",
66
+ "\\notin": "Notmem",
67
+ "\\": "Setminus",
68
+ "\\cap": "Cap",
69
+ "\\cup": "Cup",
70
+ "'": "Prime",
71
+ "~>": "Leadsto",
72
+ ENABLED: "ENABLED",
73
+ UNCHANGED: "UNCHANGED",
74
+ "\\cdot": "Cdot",
75
+ "-+->": "Actplus",
76
+ "[]": "BoxTrue",
77
+ "<>": "Diamond",
78
+ TRUE: "TRUE",
79
+ FALSE: "FALSE",
80
+ BOOLEAN: "BOOLEAN",
81
+ STRING: "STRING",
82
+ }),
83
+ );
81
84
 
82
85
  const getCanonicalName = (name: string) => lookupOperator(name).name;
83
86
 
@@ -101,11 +104,12 @@ const mergeLoci = (left: Locus | undefined, right: Locus | undefined): Locus | u
101
104
  };
102
105
 
103
106
  const TUPLY_FAILURE = "use instead the class`E_visit.iter_concrete`";
107
+ const STEP_TUPLY_FAILURE = "use instead the class `P_visit.map_concrete`";
104
108
 
105
109
  const isDitto = (bounds: QuantifierExpression["bounds"], index: number) =>
106
110
  index > 0 && bounds[index - 1].set === bounds[index].set;
107
111
 
108
- export const createSource = (
112
+ export const createModuleConverter = (
109
113
  file: string,
110
114
  text: string,
111
115
  counter: Counter,
@@ -134,6 +138,11 @@ export const createSource = (
134
138
  const getMethod = (range: SourceRange | undefined) =>
135
139
  range && readOldMethod(lines, { line: range.end.line - 1, column: range.end.column });
136
140
 
141
+ const getSuppressPragma = (keyword: SourceRange) =>
142
+ findSuppressPragma(lines, { line: keyword.start.line - 1, column: keyword.start.column - 1 });
143
+
144
+ const isSuppressed = (keyword: SourceRange) => getSuppressPragma(keyword) !== undefined;
145
+
137
146
  const withMethod = (range: SourceRange) => {
138
147
  const method = getMethod(range);
139
148
  const location = getRangeLocus(range);
@@ -158,7 +167,7 @@ export const createSource = (
158
167
 
159
168
  const convertOperator = (name: string, location: Locus | undefined): Expr => {
160
169
  const canonical = getCanonicalName(name);
161
- const builtin = BUILTINS[canonical];
170
+ const builtin = BUILTINS.get(canonical);
162
171
  return at(builtin ? { kind: "Internal", builtin } : { kind: "Opaque", name: canonical }, {
163
172
  location,
164
173
  });
@@ -174,7 +183,7 @@ export const createSource = (
174
183
  const operator = at({ kind: "Opaque", name }, { location });
175
184
  return at({ kind: "Bang", expression: operator, selectors: [] }, { location });
176
185
  }
177
- const builtin = BUILTINS[name];
186
+ const builtin = BUILTINS.get(name);
178
187
  if (builtin && args.length === 0) return at({ kind: "Internal", builtin }, { location });
179
188
  const names = name.split("!");
180
189
  if (names.length === 1) {
@@ -209,12 +218,14 @@ export const createSource = (
209
218
  bounds.map((bound, index) => {
210
219
  if (bound.pattern.kind === "Tuple")
211
220
  throw new TlaProofError("Unexpected tuple declaration", { failure: TUPLY_FAILURE });
221
+ const range = bound.pattern.ranges?.[0];
212
222
  return {
213
223
  name: bound.pattern.name,
214
224
  level: "Constant",
215
225
  domain: isDitto(bounds, index)
216
226
  ? { kind: "Ditto" }
217
227
  : { kind: "Domain", expression: convertExpression(bound.set, isExcept) },
228
+ ...(range && { location: getRangeLocus(range) }),
218
229
  };
219
230
  });
220
231
 
@@ -233,6 +244,13 @@ export const createSource = (
233
244
  };
234
245
  });
235
246
 
247
+ // P_visit.map fails on the tuples a TAKE or PICK declares before the expression visitors do.
248
+ const convertStepBounds = (body: { names: string[]; bounds: QuantifierExpression["bounds"] }) => {
249
+ if (body.bounds.some((bound) => bound.pattern.kind === "Tuple"))
250
+ throw new TlaProofError("Unexpected tuple declaration", { failure: STEP_TUPLY_FAILURE });
251
+ return body.names.length > 0 ? getUnbounded(body.names) : convertBounds(body.bounds, false);
252
+ };
253
+
236
254
  const expandTuples = (expanded: Expr, location: Locus) => {
237
255
  if (!isExpandingTuples)
238
256
  throw new TlaProofError("Unexpected tuple declaration", { failure: TUPLY_FAILURE });
@@ -293,9 +311,18 @@ export const createSource = (
293
311
  const args = expression.args.map(recurse);
294
312
  const operator = lookupOperator(expression.operator);
295
313
  if (operator.fixity !== "Nonfix") {
314
+ const operatorLocus = getPointLocus(expression.location, 1);
315
+ const first = args[0]?.location;
316
+ const isNonfix =
317
+ args.length === 2 &&
318
+ first !== undefined &&
319
+ (operatorLocus.startLine < first.startLine ||
320
+ (operatorLocus.startLine === first.startLine &&
321
+ operatorLocus.startColumn < first.startColumn));
322
+ const operands = getOperatorLocus(args, operator.fixity);
296
323
  return at(
297
324
  { kind: "Apply", operator: convertOperator(expression.operator, undefined), args },
298
- { location: getOperatorLocus(args, operator.fixity) },
325
+ { location: isNonfix ? mergeLoci(operatorLocus, operands) : operands },
299
326
  );
300
327
  }
301
328
  return convertName(expression.operator, args, location, expression.argumentCounts);
@@ -552,22 +579,14 @@ export const createSource = (
552
579
  case "Always":
553
580
  case "Eventually": {
554
581
  const inner = expression.expression;
555
- if (expression.kind === "Always" && inner.kind === "BoxAction") {
556
- return at(
557
- {
558
- kind: "Tsub",
559
- modal: "Box",
560
- action: recurse(inner.action),
561
- subscript: recurse(inner.subscript),
562
- },
563
- { location },
564
- );
565
- }
566
- if (expression.kind === "Eventually" && inner.kind === "AngleAction") {
582
+ if (
583
+ (expression.kind === "Always" && inner.kind === "BoxAction") ||
584
+ (expression.kind === "Eventually" && inner.kind === "AngleAction")
585
+ ) {
567
586
  return at(
568
587
  {
569
588
  kind: "Tsub",
570
- modal: "Dia",
589
+ modal: expression.kind === "Always" ? "Box" : "Dia",
571
590
  action: recurse(inner.action),
572
591
  subscript: recurse(inner.subscript),
573
592
  },
@@ -588,22 +607,39 @@ export const createSource = (
588
607
  { location },
589
608
  );
590
609
  case "WeakFairness":
591
- case "StrongFairness":
610
+ case "StrongFairness": {
611
+ // tlapm lexes WF_vars as WF_ and vars, both located at the whole word.
612
+ const isGlued = /\w/.test(lines[location.startLine - 1]?.[location.startColumn + 2] ?? "");
613
+ const moveGluedStart = (inner: Expr): Expr =>
614
+ isGlued &&
615
+ inner.location?.startLine === location.startLine &&
616
+ inner.location.startColumn === location.startColumn + 3
617
+ ? mapChildren(
618
+ { ...inner, location: { ...inner.location, startColumn: location.startColumn } },
619
+ moveGluedStart,
620
+ )
621
+ : inner;
592
622
  return at(
593
623
  {
594
624
  kind: "Fair",
595
625
  fairness: expression.kind === "WeakFairness" ? "Weak" : "Strong",
596
- subscript: recurse(expression.subscript),
626
+ subscript: moveGluedStart(recurse(expression.subscript)),
597
627
  action: recurse(expression.action),
598
628
  },
599
629
  { location },
600
630
  );
631
+ }
601
632
  case "Label":
602
633
  return at(
603
634
  {
604
635
  kind: "Parens",
605
636
  expression: recurse(expression.body),
606
- form: { kind: "Nlabel", label: expression.name, names: expression.params },
637
+ form: {
638
+ kind: "Nlabel",
639
+ label: expression.name,
640
+ names: expression.params,
641
+ location: expression.head && getRangeLocus(expression.head),
642
+ },
607
643
  },
608
644
  { location },
609
645
  );
@@ -648,11 +684,13 @@ export const createSource = (
648
684
 
649
685
  const convertInstance = (instance: Instance): InstanceDefinition => ({
650
686
  location: getRangeLocus(instance.definitionRange ?? instance.instanceRange),
687
+ instanceLocation: getRangeLocus(instance.instanceRange),
651
688
  args: instance.params.map((param) => param.name),
652
689
  module: instance.module,
653
690
  substitutions: instance.substitutions.map((substitution) => ({
654
691
  name: getCanonicalName(substitution.name),
655
692
  expression: convertExpression(substitution.expression, false),
693
+ location: getRangeLocus(substitution.nameRange),
656
694
  })),
657
695
  });
658
696
 
@@ -672,20 +710,16 @@ export const createSource = (
672
710
  ? "-."
673
711
  : getCanonicalName(definition.name);
674
712
  const body = convertExpression(definition.body, isExcept);
675
- if (definition.kind === "Function" && hasTuple(definition.bounds)) {
676
- return {
677
- kind: "Operator",
678
- name,
679
- body: expandTuples(expandFcn(getTuplyBounds(definition.bounds, isExcept), body), location),
680
- location,
681
- };
682
- }
683
713
  if (definition.kind === "Function") {
684
- const bounds = convertBounds(definition.bounds, isExcept);
685
714
  return {
686
715
  kind: "Operator",
687
716
  name,
688
- body: at({ kind: "Fcn", bounds, body }, { location }),
717
+ body: hasTuple(definition.bounds)
718
+ ? expandTuples(expandFcn(getTuplyBounds(definition.bounds, isExcept), body), location)
719
+ : at(
720
+ { kind: "Fcn", bounds: convertBounds(definition.bounds, isExcept), body },
721
+ { location },
722
+ ),
689
723
  location,
690
724
  };
691
725
  }
@@ -707,7 +741,7 @@ export const createSource = (
707
741
  { location },
708
742
  );
709
743
  const end = definition.location.range?.end;
710
- const methods = end && readNewMethod(lines, { line: end.line - 1, column: end.column });
744
+ const methods = end && readNewMethod(lines, { line: end.line - 1, column: end.column }, file);
711
745
  return methods
712
746
  ? { kind: "Bpragma", name, body: operatorBody, methods, location }
713
747
  : { kind: "Operator", name, body: operatorBody, location };
@@ -798,7 +832,11 @@ export const createSource = (
798
832
  if (!proof) return { kind: "Omitted", omission: "Implicit", location: enclosing };
799
833
  switch (proof.kind) {
800
834
  case "Obvious":
801
- return { kind: "Obvious", ...withMethod(proof.keyword) };
835
+ return {
836
+ kind: "Obvious",
837
+ ...withMethod(proof.keyword),
838
+ isSuppressed: isSuppressed(proof.keyword),
839
+ };
802
840
  case "Omitted":
803
841
  return {
804
842
  kind: "Omitted",
@@ -813,6 +851,7 @@ export const createSource = (
813
851
  location: getRangeLocus(proof.keyword),
814
852
  step: { kind: "Unnamed", level, id: 0 },
815
853
  method: getMethod(proof.location.range),
854
+ isSuppressed: isSuppressed(proof.keyword),
816
855
  };
817
856
  case "Steps": {
818
857
  const tokens = proof.steps.map((step) => STEP_PATTERN.exec(step.token));
@@ -854,6 +893,7 @@ export const createSource = (
854
893
  ...converted,
855
894
  ...withMethod(step.head),
856
895
  step: number,
896
+ isSuppressed: isSuppressed(step.statement),
857
897
  });
858
898
  switch (body.kind) {
859
899
  case "Use":
@@ -871,6 +911,7 @@ export const createSource = (
871
911
  location,
872
912
  step: number,
873
913
  method: getMethod(body.location.range),
914
+ isSuppressed: isSuppressed(body.keyword),
874
915
  }
875
916
  : { kind: "Hide", usable, location, step: number };
876
917
  }
@@ -889,19 +930,14 @@ export const createSource = (
889
930
  expression: convertExpression(body.expression, false),
890
931
  });
891
932
  case "Take":
892
- return withStepMethod({
893
- kind: "Take",
894
- bounds:
895
- body.names.length > 0 ? getUnbounded(body.names) : convertBounds(body.bounds, false),
896
- });
933
+ return withStepMethod({ kind: "Take", bounds: convertStepBounds(body) });
897
934
  case "Witness":
898
935
  return withStepMethod({
899
936
  kind: "Witness",
900
937
  expressions: body.expressions.map((expression) => convertExpression(expression, false)),
901
938
  });
902
939
  case "Pick": {
903
- const bounds =
904
- body.names.length > 0 ? getUnbounded(body.names) : convertBounds(body.bounds, false);
940
+ const bounds = convertStepBounds(body);
905
941
  const expression = convertExpression(body.body, false);
906
942
  return withProof((proof) => ({ kind: "Pick", bounds, expression, proof }));
907
943
  }
@@ -938,7 +974,9 @@ export const createSource = (
938
974
  name: getCanonicalName(declaration.name),
939
975
  shape: declaration.arity,
940
976
  })),
941
- location: getLocus(unit.declarations[0].location),
977
+ location: getLocus(
978
+ unit.kind === "Constants" ? unit.declarations[0].location : unit.location,
979
+ ),
942
980
  };
943
981
  case "Variables":
944
982
  return {
@@ -1005,18 +1043,24 @@ export const createSource = (
1005
1043
  location,
1006
1044
  };
1007
1045
  }
1008
- case "Use":
1046
+ case "Use": {
1047
+ // A module unit's locus takes in the suppress pragma that tlapm reads as its first tokens.
1048
+ const pragma = getSuppressPragma(unit.use.keyword);
1009
1049
  return {
1010
1050
  kind: "Mutate",
1011
1051
  mode: unit.use.kind,
1012
1052
  usable: convertUsable(unit.use),
1013
- location: getUseLocus(unit.use),
1053
+ location: mergeLoci(
1054
+ pragma && getPointLocus({ line: pragma.line + 1, column: pragma.column + 1 }, 0),
1055
+ getUseLocus(unit.use),
1056
+ ),
1014
1057
  };
1058
+ }
1015
1059
  case "Module":
1016
1060
  return { kind: "Submod", module: { ...convertModule(unit.module), isImportant: true } };
1017
1061
  }
1018
1062
  }),
1019
1063
  });
1020
1064
 
1021
- return { convertModule };
1065
+ return convertModule;
1022
1066
  };
@@ -1,16 +1,16 @@
1
- // A port of tlapm's Expr.Deref.
2
-
3
1
  import { TlaProofError, TlapmBugError } from "../errors";
4
2
  import { consAll, consSubstitution, shift, substituteExpr } from "./substitution";
5
3
  import {
6
4
  at,
7
5
  getErrorNote,
6
+ getErrorSetting,
8
7
  getBoundFresh,
9
8
  getChildren,
10
9
  getFresh,
11
10
  getParamFresh,
12
11
  mapChildren,
13
12
  mapSelectorArgs,
13
+ warnError,
14
14
  type Bound,
15
15
  type Defn,
16
16
  type Expr,
@@ -19,6 +19,8 @@ import {
19
19
  type Param,
20
20
  type Selector,
21
21
  } from "./expression";
22
+ import { renderDoc } from "./format";
23
+ import { printExpression } from "./printer";
22
24
 
23
25
  interface Resolution {
24
26
  params: Param[];
@@ -147,6 +149,8 @@ const instantiate = (onWarning: Warn, expression: Expr, args: Expr[]): Expr => {
147
149
  const expected = expression.bounds.length;
148
150
  const message = `Arity mismatch in subexpression instance.\nExpected ${expected} argument${expected === 1 ? "" : "s"}, but found${args.length < expected ? " only" : ""} ${args.length}.`;
149
151
  onWarning(getErrorNote(expression.location, message));
152
+ // Errors.set takes the message from Printf, which keeps the @ of Format's @\n.
153
+ onWarning(getErrorSetting(expression.location, message.replace("\n", "@\n")));
150
154
  throw new TlaProofError(message, { failure: "Expr.Deref.deref_inst" });
151
155
  }
152
156
  const body = expression.kind === "SetOf" ? expression.element : expression.body;
@@ -193,12 +197,13 @@ const instantiate = (onWarning: Warn, expression: Expr, args: Expr[]): Expr => {
193
197
  if (args.length !== 1) {
194
198
  const message = `Arity mismatch in subexpression instance.\nExpected 1 argument, but found ${args.length}.`;
195
199
  onWarning(getErrorNote(expression.location, message));
200
+ onWarning(getErrorSetting(expression.location, message.replace("\n", "@\n")));
196
201
  throw new TlaProofError(message, { failure: "Expr.Deref.deref_inst" });
197
202
  }
198
203
  return substituteExpr(consAll(args, shift(0)), expression.body);
199
204
  default: {
200
205
  const message = "Cannot instantiate non-binding expression";
201
- onWarning(getErrorNote(expression.location, message));
206
+ warnError(onWarning, expression.location, message);
202
207
  throw new TlaProofError(message, { failure: "Expr.Deref.deref_inst" });
203
208
  }
204
209
  }
@@ -220,7 +225,7 @@ const abstract = (onWarning: Warn, definitionCount: number, expression: Expr): [
220
225
  return [{ name: expression.name, shape: 0 }];
221
226
  default: {
222
227
  const message = "Cannot abstract over bound variables in a non-binding expression";
223
- onWarning(getErrorNote(expression.location, message));
228
+ warnError(onWarning, expression.location, message);
224
229
  throw new TlaProofError(message, { failure: "Expr.Deref.deref_at" });
225
230
  }
226
231
  }
@@ -238,7 +243,7 @@ const getNumbered = (
238
243
  ): [Defn[], Expr] => {
239
244
  const checkAtMost = (count: number) => {
240
245
  if (position <= count) return;
241
- onWarning(getErrorNote(origin.location, message));
246
+ warnError(onWarning, origin.location, message);
242
247
  throw new TlaProofError(message, { failure: "Expr.Deref.deref_num" });
243
248
  };
244
249
  const pick = (items: Expr[]) => {
@@ -256,7 +261,7 @@ const getNumbered = (
256
261
  const hyp = sequent.context[position - 1];
257
262
  if (hyp && hyp.kind !== "Fact") {
258
263
  const hypMessage = "subexpression reference does not resolve to an expression";
259
- onWarning(getErrorNote(expression.location, hypMessage));
264
+ warnError(onWarning, expression.location, hypMessage);
260
265
  throw new TlaProofError(hypMessage, { failure: "Expr.Deref.deref_num" });
261
266
  }
262
267
  const shifted = substituteExpr(
@@ -270,10 +275,10 @@ const getNumbered = (
270
275
  `subexpression of ASSUME/PROVE uses identifiers declared therein\nTlapm does not handle yet such subexpression namings.`,
271
276
  ),
272
277
  );
273
- throw new TlaProofError(
274
- "Subexpression of ASSUME/PROVE uses identifiers declared therein\n\nTlapm does not handle yet such subexpression namings.",
275
- { failure: "Expr.Deref.deref_num" },
276
- );
278
+ const message =
279
+ "Subexpression of ASSUME/PROVE uses identifiers declared therein\n\nTlapm does not handle yet such subexpression namings.";
280
+ onWarning(getErrorSetting(expression.location, message));
281
+ throw new TlaProofError(message, { failure: "Expr.Deref.deref_num" });
277
282
  }
278
283
  return shifted;
279
284
  }
@@ -338,12 +343,12 @@ const getNumbered = (
338
343
  ]);
339
344
  }
340
345
  const emptyMessage = "Expression has no subexpressions";
341
- onWarning(getErrorNote(expression.location, emptyMessage));
346
+ warnError(onWarning, expression.location, emptyMessage);
342
347
  throw new TlaProofError(emptyMessage, { failure: "Expr.Deref.deref_num" });
343
348
  })();
344
349
  if (isUnresolved(result)) {
345
350
  const badMessage = `Cannot resolve subexpression reference !${position}`;
346
- onWarning(getErrorNote(expression.location, badMessage));
351
+ warnError(onWarning, expression.location, badMessage);
347
352
  throw new TlaProofError(badMessage, { failure: "Expr.Deref.deref_num" });
348
353
  }
349
354
  return [expression.kind === "Let" ? expression.definitions : [], result];
@@ -375,7 +380,7 @@ const resolveLabel = (
375
380
  if (indices.length !== labelArgs.length && labelArgs.length > 0) {
376
381
  const plural = indices.length === 1 ? "" : "s";
377
382
  const message = `Expected ${indices.length} argument${plural} for labelled reference !${label}, but found ${labelArgs.length}`;
378
- onWarning(getErrorNote(found.expression.location, message));
383
+ warnError(onWarning, found.expression.location, message);
379
384
  throw new TlaProofError(message, { failure: "Expr.Deref.deref_lsub" });
380
385
  }
381
386
  const params =
@@ -430,8 +435,9 @@ const resolveLetOperator = (
430
435
  args: Expr[],
431
436
  ): Resolution => {
432
437
  if (expression.kind !== "Let") {
433
- onWarning(getErrorNote(expression.location, `not a LET expression`));
434
- throw new TlaProofError("not a LET expression", { failure: "Expr.Deref.deref_letop" });
438
+ const message = "not a LET expression";
439
+ warnError(onWarning, expression.location, message);
440
+ throw new TlaProofError(message, { failure: "Expr.Deref.deref_letop" });
435
441
  }
436
442
  const index = expression.definitions.findIndex(
437
443
  (definition) => definition.kind === "Operator" && definition.name === label,
@@ -439,7 +445,7 @@ const resolveLetOperator = (
439
445
  const definition = expression.definitions[index];
440
446
  if (!definition || definition.kind !== "Operator") {
441
447
  const message = `no definition of operator ${label}`;
442
- onWarning(getErrorNote(expression.location, message));
448
+ warnError(onWarning, expression.location, message);
443
449
  throw new TlaProofError(message, { failure: "Expr.Deref.deref_letop" });
444
450
  }
445
451
  const body = definition.body;
@@ -481,6 +487,7 @@ const resolveLetOperator = (
481
487
 
482
488
  const resolveSelectors = (
483
489
  onWarning: Warn,
490
+ hyps: Hyp[],
484
491
  isLabel: boolean,
485
492
  state: Resolution,
486
493
  selectors: Selector[],
@@ -501,7 +508,7 @@ const resolveSelectors = (
501
508
  return { ...stripParensAndAtomic(abstracted), isAtomic: true };
502
509
  }
503
510
  if (state.expression.isAtomic) {
504
- onWarning(getErrorNote(state.expression.location, `Expression has no subexpressions`));
511
+ warnError(onWarning, state.expression.location, "Expression has no subexpressions");
505
512
  return UNRESOLVED;
506
513
  }
507
514
  const expression = isLabel ? state.expression : stripParens(state.expression);
@@ -525,6 +532,23 @@ const resolveSelectors = (
525
532
  return { ...result, rest: after, isLabel: true };
526
533
  }
527
534
  if (isLabel) return { params: [], definitions: [], expression, rest, isLabel: false };
535
+ onWarning(getErrorSetting(expression.location, "!: is forbidden for this expression.\n"));
536
+ const scope = [
537
+ ...hyps,
538
+ ...state.definitions.map((definition): Hyp => ({
539
+ kind: "Defn",
540
+ definition,
541
+ whereDefined: "User",
542
+ visibility: "Visible",
543
+ isLocal: true,
544
+ })),
545
+ ];
546
+ onWarning(
547
+ getErrorNote(
548
+ expression.location,
549
+ `!: is forbidden for this expression:\n${renderDoc(printExpression(scope, expression))}`,
550
+ ),
551
+ );
528
552
  throw new TlaProofError("!: is forbidden for this expression.\n", {
529
553
  failure: "Expr.Deref.deref: !:",
530
554
  });
@@ -558,6 +582,7 @@ const resolveSelectors = (
558
582
  })();
559
583
  return resolveSelectors(
560
584
  onWarning,
585
+ hyps,
561
586
  next.isLabel,
562
587
  {
563
588
  params: [...state.params, ...next.params],
@@ -581,19 +606,21 @@ const getInitialResolution = (onWarning: Warn, operator: Expr, args: Expr[]): Re
581
606
 
582
607
  export const resolveSubexpression = (
583
608
  onWarning: Warn,
609
+ hyps: Hyp[],
584
610
  operator: Expr,
585
611
  args: Expr[],
586
612
  selectors: Selector[],
587
613
  ) => {
588
614
  const result = resolveSelectors(
589
615
  onWarning,
616
+ hyps,
590
617
  true,
591
618
  getInitialResolution(onWarning, operator, args),
592
619
  selectors,
593
620
  );
594
621
  if (isUnresolved(result)) {
595
622
  const message = "Could not resolve subexpression reference";
596
- onWarning(getErrorNote(operator.location, message));
623
+ warnError(onWarning, operator.location, message);
597
624
  throw new TlaProofError(message, { failure: "Expr.Anon: 2" });
598
625
  }
599
626
  return result;
@@ -1,5 +1,3 @@
1
- // A port of tlapm's E_subst.
2
-
3
1
  import { TlaProofError } from "../errors";
4
2
  import {
5
3
  at,
@@ -94,7 +92,7 @@ export const substituteDefn = (substitution: Substitution, definition: Defn): De
94
92
  instance: {
95
93
  ...definition.instance,
96
94
  substitutions: definition.instance.substitutions.map((entry) => ({
97
- name: entry.name,
95
+ ...entry,
98
96
  expression: substituteExpr(inner, entry.expression),
99
97
  })),
100
98
  },
@@ -1,5 +1,3 @@
1
- // A port of tlapm's Expr.Tla_norm, Expr.Constness and Expr.Temporal_props.
2
-
3
1
  import {
4
2
  adjoin,
5
3
  adjoinAll,
@@ -8,6 +6,8 @@ import {
8
6
  getFresh,
9
7
  getLocalDefn,
10
8
  getScopeAt,
9
+ getTrue,
10
+ isBuiltinApply,
11
11
  mapChildren,
12
12
  type Builtin,
13
13
  type Expr,
@@ -30,7 +30,7 @@ export const rewriteUnchanged = (expression: Expr): Expr => {
30
30
  const flatten = (inner: Expr): Expr[] =>
31
31
  inner.kind === "Tuple" ? inner.elements.flatMap(flatten) : [inner];
32
32
  const items = flatten(expression);
33
- if (items.length === 0) return at({ kind: "Internal", builtin: "TRUE" }, expression);
33
+ if (items.length === 0) return getTrue(expression);
34
34
  if (items.length === 1) return getEquality(items[0]);
35
35
  return at({ kind: "List", bullet: "And", items: items.map(getEquality) }, expression);
36
36
  };
@@ -43,7 +43,7 @@ const rewrite =
43
43
  };
44
44
 
45
45
  export const expandLeadsto = rewrite((expression, recurse) =>
46
- expression.kind === "Apply" && isApplied(expression, ["Leadsto"])
46
+ isBuiltinApply(expression, "Leadsto")
47
47
  ? applyBuiltin(
48
48
  "BoxTrue",
49
49
  [
@@ -103,9 +103,7 @@ export const expandAction = rewrite((expression, recurse) => {
103
103
  });
104
104
 
105
105
  const expandUnchanged = rewrite((expression) =>
106
- expression.kind === "Apply" && isApplied(expression, ["UNCHANGED"])
107
- ? rewriteUnchanged(expression.args[0])
108
- : undefined,
106
+ isBuiltinApply(expression, "UNCHANGED") ? rewriteUnchanged(expression.args[0]) : undefined,
109
107
  );
110
108
 
111
109
  const TEMPORAL_BUILTINS: Builtin[] = [
@@ -1,5 +1,3 @@
1
- // A port of tlapm's E_tuply_declarations.
2
-
3
1
  import type { Bound, BoundDomain, Defn, Expr } from "./expression";
4
2
 
5
3
  export type TuplyBound =