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
@@ -1,5 +1,3 @@
1
- // Ported from Zenon's prove.ml, as shipped in tlapm. Copyright 2002 INRIA, see LICENSE.
2
-
3
1
  import { TlaZenonError } from "../../errors";
4
2
  import { difference, isApp, isDisjoint, isMeta, isRelation, union, type Expr } from "./expr";
5
3
  import { getLimitFailure, type Limits } from "./limits";
@@ -1,5 +1,3 @@
1
- // Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
2
-
3
1
  import { isApp } from "../expr";
4
2
  import type { Priority } from "../node";
5
3
  import { makeRule } from "../proof";
@@ -1,5 +1,3 @@
1
- // Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
2
-
3
1
  import { TlaZenonError } from "../../../errors";
4
2
  import { difference, union, type Expr, type Expressions } from "../expr";
5
3
  import type { Lemma, LlProof, LlRule } from "../llproof";
@@ -1,5 +1,3 @@
1
- // Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
2
-
3
1
  import { compareExprs, getStringName, isApp, type Expr } from "../expr";
4
2
  import { stableSort } from "../ocaml";
5
3
  import { makeRule } from "../proof";
@@ -1,5 +1,3 @@
1
- // Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
2
-
3
1
  import { TlaZenonError } from "../../../errors";
4
2
  import {
5
3
  FALSE,
@@ -1,5 +1,3 @@
1
- // Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
2
-
3
1
  import { isApp, type Expr } from "../expr";
4
2
  import { makeRule } from "../proof";
5
3
  import {
@@ -316,7 +314,7 @@ export const getSubsetNodes = (literal: Literal): Item[] | undefined => {
316
314
  ]);
317
315
  }
318
316
  if (isApp(right, "TLA.cap", 2)) {
319
- // tlapm's Zenon builds both subsets from the second set, and Isabelle rejects its proofs.
317
+ // Deviation from Zenon: ext_tla.ml builds both subsets from the second set, which is unsound.
320
318
  const first = exprs.eapp("TLA.subseteq", [left, right.args[0]]);
321
319
  const second = exprs.eapp("TLA.subseteq", [left, right.args[1]]);
322
320
  return isNegated
@@ -1,5 +1,3 @@
1
- // Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
2
-
3
1
  import { TlaZenonError } from "../../../errors";
4
2
  import { isApp, isRelation, type Expr, type Expressions, type RelationExpr } from "../expr";
5
3
  import type { Index } from "../index-table";
@@ -1,5 +1,3 @@
1
- // Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
2
-
3
1
  import {
4
2
  FALSE,
5
3
  isApp,
package/src/resolve.ts CHANGED
@@ -21,6 +21,7 @@ import {
21
21
  type Theorem,
22
22
  } from "./ast";
23
23
  import { formatRange, TlaSyntaxError, type SanyError } from "./errors";
24
+ import { resolveSynonym } from "./tlc/jar-data";
24
25
 
25
26
  export type SymbolKind =
26
27
  | "Builtin"
@@ -99,8 +100,15 @@ type Reference = Expression & { kind: "Identifier" | "Apply" | "Subexpression" }
99
100
 
100
101
  export const LOCAL_RESOLUTION = { kind: "Local" } as const;
101
102
 
103
+ export interface NullSelection {
104
+ node: Expression;
105
+ error: SanyError;
106
+ }
107
+
102
108
  export const selections = new WeakSet<Expression>();
103
109
  export const selectionErrors = new WeakMap<Expression, SelectionError>();
110
+ export const nullSelections = new WeakMap<Expression, NullSelection[]>();
111
+ const unresolvedExpressions = new WeakSet<Expression>();
104
112
 
105
113
  const renamedArities = new WeakMap<Expression, number>();
106
114
 
@@ -111,9 +119,13 @@ const isKey = (name: string) => {
111
119
  return index > 0 && index < name.length - 1;
112
120
  };
113
121
 
114
- const CORE_SYMBOLS: Symbols = new Map(
115
- ["~>", "-+->", "\\cdot"].map((name) => [name, { key: name, arity: 2, kind: "Builtin" }]),
116
- );
122
+ const CORE_SYMBOLS: Symbols = new Map([
123
+ ...["~>", "-+->", "\\cdot", "\\X"].map((name): [string, ModuleSymbol] => [
124
+ name,
125
+ { key: name, arity: 2, kind: "Builtin" },
126
+ ]),
127
+ ["'", { key: "'", arity: 1, kind: "Builtin" }],
128
+ ]);
117
129
 
118
130
  export const isBefore = (left: SourceLocation, right: SourceLocation) =>
119
131
  left.line < right.line || (left.line === right.line && left.column < right.column);
@@ -157,7 +169,7 @@ const isBindable = (name: string, current: Binding | undefined, added: Binding,
157
169
  if (current.kind === "Builtin") {
158
170
  unit.errors.push({
159
171
  location,
160
- message: `Symbol ${name} is a built-in operator, and cannot be redefined.`,
172
+ message: `Symbol ${resolveSynonym(name)} is a built-in operator, and cannot be redefined.`,
161
173
  });
162
174
  } else if (
163
175
  added.kind === "Parameter" ||
@@ -166,12 +178,12 @@ const isBindable = (name: string, current: Binding | undefined, added: Binding,
166
178
  ) {
167
179
  unit.errors.push({
168
180
  location,
169
- message: `Multiply-defined symbol '${name}': this definition or declaration conflicts \nwith the one at ${existing}.`,
181
+ message: `Multiply-defined symbol '${resolveSynonym(name)}': this definition or declaration conflicts \nwith the one at ${existing}.`,
170
182
  });
171
183
  } else {
172
184
  unit.warnings.push({
173
185
  location,
174
- message: `Multiple declarations or definitions for symbol ${name}. \nThis duplicates the one at ${existing}.`,
186
+ message: `Multiple declarations or definitions for symbol ${resolveSynonym(name)}. \nThis duplicates the one at ${existing}.`,
175
187
  });
176
188
  }
177
189
  return false;
@@ -234,22 +246,31 @@ const getVisibleDefinition = (name: string, unit: Unit) => {
234
246
  definition !== undefined &&
235
247
  (definition === unit.self
236
248
  ? definition.kind === "Function" || definition.isRecursive
237
- : definition.isRecursive || isBefore(definition.location, unit.location));
249
+ : definition.isRecursive
250
+ ? getModuleBinding(name, unit, undefined) !== undefined
251
+ : isBefore(definition.location, unit.location));
238
252
  return isVisible ? definition : undefined;
239
253
  };
240
254
 
241
255
  const findSymbol = (name: string, unit: Unit): ModuleSymbol | undefined => {
242
256
  const definition = getVisibleDefinition(name, unit);
243
- return definition
244
- ? {
245
- key: unit.getKey(definition),
246
- arity: getArity(definition),
247
- params: getParamArities(definition),
248
- kind: "Definition",
249
- }
250
- : unit.imported.get(name);
257
+ if (definition) {
258
+ return {
259
+ key: unit.getKey(definition),
260
+ arity: getArity(definition),
261
+ params: getParamArities(definition),
262
+ kind: "Definition",
263
+ };
264
+ }
265
+ return getModuleBinding(name, unit, undefined) ? unit.imported.get(name) : undefined;
251
266
  };
252
267
 
268
+ const isFact = (name: string, unit: Unit) =>
269
+ unit.facts.has(name) || unit.bindings.get(name)?.kind === "Theorem";
270
+
271
+ const getGoal = (name: string, unit: Unit) =>
272
+ unit.bindings.get(name)?.kind === "Theorem" ? unit.goals.get(name) : undefined;
273
+
253
274
  const findBinding = (name: string, scope: LocalName | undefined, unit: Unit): Binding | undefined =>
254
275
  lookupLocal(scope, name) ?? findSymbol(name, unit);
255
276
 
@@ -271,12 +292,22 @@ const getSpelledNameRange = (
271
292
  };
272
293
 
273
294
  const getFixity = (expression: Expression) => {
274
- if (expression.kind !== "Apply") return undefined;
295
+ if (expression.kind !== "Apply" || expression.argumentsRange) return undefined;
275
296
  if (expression.args.length === 2) return "infix";
276
297
  if (expression.args.length !== 1) return undefined;
277
298
  return isBefore(expression.location, expression.args[0].location) ? "prefix" : "postfix";
278
299
  };
279
300
 
301
+ const BUILTIN_LOCATION = "In module --TLA+ BUILTINS--";
302
+
303
+ const SELECTABLE_KINDS = new Set<SymbolKind>(["Definition", "Instance", "Theorem"]);
304
+
305
+ const reportUnselectable = (name: string, range: SourceRange, unit: Unit) =>
306
+ unit.errors.push({
307
+ location: formatRange(range),
308
+ message: `Cannot take subexpression of \`${resolveSynonym(name)}'.`,
309
+ });
310
+
280
311
  const isOperatorSymbol = (name: string) => !/^[\p{L}\d_]/u.test(name);
281
312
 
282
313
  const isStepName = (name: string) =>
@@ -659,7 +690,7 @@ const checkReference = (
659
690
  const first = selectors[0];
660
691
  const goal =
661
692
  selectors.length > 1 && first.kind === "Name"
662
- ? (lookupLocal(scope, first.name)?.goal ?? unit.goals.get(first.name))
693
+ ? (lookupLocal(scope, first.name)?.goal ?? getGoal(first.name, unit))
663
694
  : undefined;
664
695
  if (goal) checkSelection(expression, selectors, goal, scope, unit, isFact);
665
696
  return goal !== undefined;
@@ -697,29 +728,39 @@ const getSymbolArity = (
697
728
  return symbol.arity;
698
729
  }
699
730
  const prefix = name.includes("!") ? name.slice(0, name.indexOf("!")) : "";
700
- const isSelected =
701
- prefix !== "" &&
702
- (lookupLocal(scope, prefix) !== undefined ||
703
- findSymbol(prefix, unit) !== undefined ||
704
- unit.facts.has(prefix));
705
- if (isSelected) {
731
+ const selected =
732
+ prefix === "" ? undefined : (lookupLocal(scope, prefix) ?? findSymbol(prefix, unit));
733
+ if (selected && !SELECTABLE_KINDS.has(selected.kind)) {
734
+ reportUnselectable(
735
+ prefix,
736
+ (expression.kind !== "OperatorReference" && expression.selectorRanges?.[0]) ||
737
+ getSpelledNameRange(expression, name),
738
+ unit,
739
+ );
740
+ return undefined;
741
+ }
742
+ if (selected || (prefix !== "" && isFact(prefix, unit))) {
706
743
  return expression.kind === "Apply" ? expression.args.length : 0;
707
744
  }
708
- const spelling = (expression.kind === "Identifier" ? undefined : expression.spelling) ?? name;
709
- const range = formatRange(
710
- expression.kind === "Apply" && spelling === "-."
711
- ? getNameRange(location, "-")
712
- : getSpelledNameRange(expression, name),
713
- );
714
- if (!isOperatorSymbol(name) || isStepName(name)) {
715
- unit.errors.push({ location: range, message: `Unknown operator: \`${name}'.` });
745
+ const fixity = getFixity(expression);
746
+ const isOperatorApplication = expression.kind === "OperatorReference" || fixity !== undefined;
747
+ if (!isOperatorSymbol(name) || isStepName(name) || !isOperatorApplication) {
748
+ unit.errors.push({
749
+ location: formatRange(getSpelledNameRange(expression, name)),
750
+ message: `Unknown operator: \`${resolveSynonym(name)}'.`,
751
+ });
716
752
  return undefined;
717
753
  }
754
+ const spelling = expression.spelling ?? name;
718
755
  unit.errors.push({
719
- location: range,
756
+ location: formatRange(
757
+ fixity === "prefix" && spelling === "-."
758
+ ? getNameRange(location, "-")
759
+ : getSpelledNameRange(expression, name),
760
+ ),
720
761
  message: `Could not find declaration or definition of symbol '${spelling}'.`,
721
762
  });
722
- const fixity = getFixity(expression);
763
+ if (fixity) unresolvedExpressions.add(expression);
723
764
  if (fixity && location.range) {
724
765
  unit.errors.push({
725
766
  location: formatRange(location.range),
@@ -774,13 +815,13 @@ const resolveDefinition = (
774
815
  const isDeclared = current?.isPending === true && recursive.has(current);
775
816
  if (current?.isPending && !isDeclared) {
776
817
  report(
777
- `Recursive ${definition.kind === "Function" ? "function" : "operator"} ${name} defined at wrong LET/IN level.`,
818
+ `Recursive ${definition.kind === "Function" ? "function" : "operator"} ${resolveSynonym(name)} defined at wrong LET/IN level.`,
778
819
  );
779
820
  } else if (current && !isDeclared) {
780
821
  report(
781
822
  definition.kind === "Function"
782
823
  ? `Function name \`${name}' already defined or declared.`
783
- : `Operator ${name} already defined or declared.`,
824
+ : `Operator ${resolveSynonym(name)} already defined or declared.`,
784
825
  );
785
826
  }
786
827
  if (definition.kind === "Function") {
@@ -850,7 +891,7 @@ const resolveDefinitions = (
850
891
  range: definition.location.range,
851
892
  parent: current,
852
893
  };
853
- if (isInstantiated(definition)) return local;
894
+ if (isInstantiated(definition)) return { ...local, params: getParamArities(definition) };
854
895
  const isInstanced = instances.some((instance) => instance.location === definition.location);
855
896
  const isGenerated = unit.isGenerated || definition.isLocal || isKey(definition.name);
856
897
  const inner = isInstanced
@@ -899,7 +940,6 @@ const isInstanceArityReported = (
899
940
  return true;
900
941
  };
901
942
 
902
- // Deviation from SANY: an operator whose parameters tla-ts does not know takes any argument.
903
943
  const resolveApply = (
904
944
  expression: Expression & { kind: "Apply" },
905
945
  scope: LocalName | undefined,
@@ -913,7 +953,7 @@ const resolveApply = (
913
953
  if (arity !== expression.args.length) {
914
954
  unit.errors.push({
915
955
  location: formatRange(expression.argumentsRange ?? getSpelledNameRange(expression, operator)),
916
- message: `The operator ${operator} requires ${arity - (findInstance(operator, scope, unit)?.arity ?? 0)} arguments.`,
956
+ message: `The operator ${resolveSynonym(operator)} requires ${arity - (findInstance(operator, scope, unit)?.arity ?? 0)} arguments.`,
917
957
  });
918
958
  return;
919
959
  }
@@ -930,15 +970,18 @@ const resolveApply = (
930
970
  const expected = params[index] ?? 0;
931
971
  const range = arg.location.range;
932
972
  if (expected === 0) {
933
- // Deviation from SANY: SANY fails here with an internal error; tla-ts words it as for a name.
973
+ // Deviation from SANY: SANY names its internal node kind here, where tla-ts words it as for a name.
934
974
  if (arg.kind === "Lambda" && arg.operator !== undefined) {
935
- report(range, `The operator ${arg.operator} requires 1 arguments.`);
975
+ report(range, `The operator ${resolveSynonym(arg.operator)} requires 1 arguments.`);
936
976
  } else if (arg.kind === "Lambda" && range) {
937
977
  report(range, "LAMBDA expression used where an expression is required.");
938
978
  } else if (arg.kind === "OperatorReference") {
939
979
  const argArity = getSymbolArity(arg, arg.operator, scope, unit);
940
980
  if (argArity !== undefined) {
941
- report(range, `The operator ${arg.operator} requires ${argArity} arguments.`);
981
+ report(
982
+ range,
983
+ `The operator ${resolveSynonym(arg.operator)} requires ${argArity} arguments.`,
984
+ );
942
985
  }
943
986
  } else resolveExpression(arg, scope, unit);
944
987
  return true;
@@ -1018,7 +1061,11 @@ const resolveExpression = (
1018
1061
  unit: Unit,
1019
1062
  ): void => {
1020
1063
  if (selections.has(expression) && !unit.isGenerated) {
1021
- resolveExpression(expression, scope, { ...unit, isGenerated: true });
1064
+ const failed = nullSelections
1065
+ .get(expression)
1066
+ ?.find((selection) => unresolvedExpressions.has(selection.node));
1067
+ if (failed) unit.errors.push(failed.error);
1068
+ else resolveExpression(expression, scope, { ...unit, isGenerated: true });
1022
1069
  return;
1023
1070
  }
1024
1071
  const resolveAll = (expressions: Expression[]) =>
@@ -1031,7 +1078,14 @@ const resolveExpression = (
1031
1078
  case "Number":
1032
1079
  case "Decimal":
1033
1080
  case "String":
1081
+ return;
1034
1082
  case "ExceptAt":
1083
+ if (!unit.isInExcept && expression.location.range) {
1084
+ unit.errors.push({
1085
+ location: formatRange(expression.location.range),
1086
+ message: "@ used where its meaning is not defined.",
1087
+ });
1088
+ }
1035
1089
  return;
1036
1090
  case "Identifier": {
1037
1091
  if (isInstanceArityReported(expression, scope, unit)) return;
@@ -1040,7 +1094,7 @@ const resolveExpression = (
1040
1094
  if (arity !== undefined && arity > 0) {
1041
1095
  unit.errors.push({
1042
1096
  location: formatRange(getSpelledNameRange(expression, name)),
1043
- message: `The operator ${name} requires ${arity} arguments.`,
1097
+ message: `The operator ${resolveSynonym(name)} requires ${arity} arguments.`,
1044
1098
  });
1045
1099
  }
1046
1100
  return;
@@ -1174,7 +1228,51 @@ const resolveExpression = (
1174
1228
  expression.selectors
1175
1229
  .flatMap((selector) => ("args" in selector ? selector.args : []))
1176
1230
  .forEach((arg) => resolveArgument(arg, scope, unit));
1177
- checkReference(expression, scope, unit, false);
1231
+ if (checkReference(expression, scope, unit, false)) return;
1232
+ const head = expression.selectors[0];
1233
+ const range = expression.selectorRanges?.[0];
1234
+ const nameCount = expression.selectors.findIndex((selector) => selector.kind !== "Name");
1235
+ const names = expression.selectors
1236
+ .slice(0, nameCount)
1237
+ .flatMap((selector) => (selector.kind === "Name" ? [selector.name] : []));
1238
+ const symbolIndex = names.findIndex(
1239
+ (_name, index) => index > 0 && findSymbol(names.slice(0, index + 1).join("!"), unit),
1240
+ );
1241
+ const isInstance =
1242
+ names.length > 1 &&
1243
+ (lookupLocal(scope, names[0]) ?? getModuleBinding(names[0], unit, undefined))?.kind ===
1244
+ "Instance";
1245
+ const lastRange = expression.selectorRanges?.[nameCount - 1];
1246
+ if (isInstance && symbolIndex === -1 && range && lastRange) {
1247
+ unit.errors.push({
1248
+ location: formatRange({ module: range.module, start: range.start, end: lastRange.end }),
1249
+ message: `Unknown operator: \`${resolveSynonym(names.join("!"))}'.`,
1250
+ });
1251
+ return;
1252
+ }
1253
+ const name = names.slice(0, symbolIndex + 1).join("!");
1254
+ const symbol = symbolIndex > 0 ? findSymbol(name, unit) : undefined;
1255
+ const argumentCount = expression.selectors
1256
+ .slice(0, symbolIndex + 1)
1257
+ .flatMap((selector) => ("args" in selector ? selector.args : [])).length;
1258
+ const argumentRange = expression.argumentRanges?.[symbolIndex] ?? expression.location.range;
1259
+ if (symbol && symbol.arity !== argumentCount && argumentRange) {
1260
+ unit.errors.push({
1261
+ location: formatRange(argumentRange),
1262
+ message: `The operator ${resolveSynonym(name)} requires ${symbol.arity} arguments.`,
1263
+ });
1264
+ return;
1265
+ }
1266
+ if (head.kind !== "Name" || expression.selectors[1].kind === "Name" || !range) return;
1267
+ const binding = lookupLocal(scope, head.name) ?? findSymbol(head.name, unit);
1268
+ if ((binding === undefined && !isFact(head.name, unit)) || binding?.kind === "Instance") {
1269
+ unit.errors.push({
1270
+ location: formatRange(range),
1271
+ message: `Unknown operator: \`${resolveSynonym(head.name)}'.`,
1272
+ });
1273
+ } else if (binding && !SELECTABLE_KINDS.has(binding.kind)) {
1274
+ reportUnselectable(head.name, range, unit);
1275
+ }
1178
1276
  }
1179
1277
  }
1180
1278
  };
@@ -1195,7 +1293,7 @@ const checkFacts = (facts: Fact[], scope: LocalName | undefined, unit: Unit) =>
1195
1293
  location: formatRange(getSpelledNameRange(fact, name)),
1196
1294
  message: "Step number of non-fact used as a fact",
1197
1295
  });
1198
- } else if (!unit.facts.has(name)) resolveExpression(fact, scope, unit);
1296
+ } else if (!isFact(name, unit)) resolveExpression(fact, scope, unit);
1199
1297
  });
1200
1298
 
1201
1299
  const resolveNewSymbol = (symbol: NewSymbol, scope: LocalName | undefined, unit: Unit) => {
@@ -1417,18 +1515,72 @@ const checkSubstitutions = (
1417
1515
  (parent, param) => ({ name: param.name, arity: param.arity, kind: "Parameter", parent }),
1418
1516
  outer,
1419
1517
  );
1518
+ const reportArity = (declaration: Declaration, location: string) =>
1519
+ unit.errors.push({
1520
+ location,
1521
+ message: `An operator must be substituted for symbol '${resolveSynonym(declaration.name)}', and it must have arity ${declaration.arity}.`,
1522
+ });
1420
1523
  const resolveSubstitute = (declaration: Declaration, expression: Expression) => {
1421
- if (declaration.arity === 0 || expression.kind !== "Identifier") {
1524
+ const range = expression.location.range;
1525
+ if (declaration.arity === 0) {
1422
1526
  resolveExpression(expression, scope, unit);
1423
1527
  return;
1424
1528
  }
1529
+ if (expression.kind === "Lambda") {
1530
+ resolveExpression(expression, scope, unit);
1531
+ if (expression.params.length !== declaration.arity && range) {
1532
+ reportArity(declaration, formatRange(range));
1533
+ }
1534
+ return;
1535
+ }
1536
+ if (expression.kind === "OperatorReference") {
1537
+ const arity = getSymbolArity(expression, expression.operator, scope, unit);
1538
+ if (arity === undefined) reportArity(declaration, BUILTIN_LOCATION);
1539
+ else if (arity !== declaration.arity && range) reportArity(declaration, formatRange(range));
1540
+ return;
1541
+ }
1542
+ if (expression.kind !== "Identifier") {
1543
+ if (range) {
1544
+ unit.errors.push({
1545
+ location: formatRange(range),
1546
+ message: `Arity ${declaration.arity} operator (not an expression) is expected \nto substitute for CONSTANT '${resolveSynonym(declaration.name)}'.`,
1547
+ });
1548
+ }
1549
+ reportArity(declaration, BUILTIN_LOCATION);
1550
+ return;
1551
+ }
1425
1552
  const arity = getSymbolArity(expression, expression.name, scope, unit);
1426
1553
  if (arity !== undefined && arity !== declaration.arity) {
1427
- throw new TlaSyntaxError(
1428
- `An operator must be substituted for symbol '${declaration.name}', and it must have arity ${declaration.arity} in the instance of ${instance.module} at line ${instance.location.line}, column ${instance.location.column}`,
1429
- );
1554
+ unit.errors.push({
1555
+ location: formatRange(getSpelledNameRange(expression, expression.name)),
1556
+ message: `Expected arity ${declaration.arity} but found operator of arity ${arity}.`,
1557
+ });
1430
1558
  }
1559
+ if (arity !== declaration.arity) reportArity(declaration, BUILTIN_LOCATION);
1431
1560
  };
1561
+ const instanceRange = instance.location.range;
1562
+ const isFound = (declaration: Declaration) =>
1563
+ lookupLocal(scope, declaration.name) !== undefined ||
1564
+ findSymbol(declaration.name, unit) !== undefined;
1565
+ const implicit = declarations.filter(isFound).map((declaration) => {
1566
+ const expression: Expression & { kind: "Identifier" } = {
1567
+ kind: "Identifier",
1568
+ name: declaration.name,
1569
+ location: instance.location,
1570
+ };
1571
+ return { declaration, expression };
1572
+ });
1573
+ implicit
1574
+ .filter((item) => item.declaration.arity === 0)
1575
+ .forEach((item) => {
1576
+ const arity = getSymbolArity(item.expression, item.declaration.name, scope, unit);
1577
+ if (arity && instanceRange) {
1578
+ unit.errors.push({
1579
+ location: formatRange(instanceRange),
1580
+ message: `Wrong number of arguments (0) given to operator '${resolveSynonym(item.declaration.name)}', \nwhich requires ${arity} arguments.`,
1581
+ });
1582
+ }
1583
+ });
1432
1584
  const substitutions = new Map<string, Expression>();
1433
1585
  instance.substitutions.forEach((substitution) => {
1434
1586
  const name = substitution.name;
@@ -1451,30 +1603,29 @@ const checkSubstitutions = (
1451
1603
  });
1452
1604
  }
1453
1605
  });
1454
- const implicit = declarations.filter((declaration) => !substitutions.has(declaration.name));
1455
- const isMissing = (declaration: Declaration) =>
1456
- !lookupLocal(scope, declaration.name) && !findSymbol(declaration.name, unit);
1457
1606
  implicit
1458
- .filter((declaration) => !isMissing(declaration))
1607
+ .filter((item) => !substitutions.has(item.declaration.name))
1608
+ .forEach((item) => {
1609
+ const arity =
1610
+ item.declaration.arity === 0
1611
+ ? 0
1612
+ : getSymbolArity(item.expression, item.declaration.name, scope, unit);
1613
+ if (arity !== item.declaration.arity && instanceRange) {
1614
+ reportArity(item.declaration, formatRange(instanceRange));
1615
+ }
1616
+ substitutions.set(item.declaration.name, item.expression);
1617
+ });
1618
+ declarations
1619
+ .filter((declaration) => !substitutions.has(declaration.name))
1459
1620
  .forEach((declaration) => {
1460
- const expression: Expression = {
1461
- kind: "Identifier",
1462
- name: declaration.name,
1463
- location: instance.location,
1464
- };
1465
- resolveSubstitute(declaration, expression);
1466
- substitutions.set(declaration.name, expression);
1621
+ const declared = declaration.location.range;
1622
+ if (instanceRange && declared) {
1623
+ unit.errors.push({
1624
+ location: formatRange(instanceRange),
1625
+ message: `Substitution missing for symbol ${resolveSynonym(declaration.name)} declared at ${formatRange(declared)} \nand instantiated in module ${instancer}.`,
1626
+ });
1627
+ }
1467
1628
  });
1468
- implicit.filter(isMissing).forEach((declaration) => {
1469
- const range = instance.location.range;
1470
- const declared = declaration.location.range;
1471
- if (range && declared) {
1472
- unit.errors.push({
1473
- location: formatRange(range),
1474
- message: `Substitution missing for symbol ${declaration.name} declared at ${formatRange(declared)} \nand instantiated in module ${instancer}.`,
1475
- });
1476
- }
1477
- });
1478
1629
  return substitutions;
1479
1630
  };
1480
1631
 
@@ -1494,6 +1645,12 @@ export const resolveSubstitutions = (
1494
1645
  unit: ModuleUnit,
1495
1646
  ) => {
1496
1647
  const imported = createSymbols(module, unit.imported);
1648
+ const positions = new Map(
1649
+ [...module.constants, ...module.variables].map((declaration) => [
1650
+ declaration.name,
1651
+ declaration.location,
1652
+ ]),
1653
+ );
1497
1654
  const report: ModuleReport = { location: instance.location, errors: [], warnings: [] };
1498
1655
  unit.reports.push(report);
1499
1656
  return checkSubstitutions(instance, declarations, module.name, undefined, {
@@ -1506,7 +1663,10 @@ export const resolveSubstitutions = (
1506
1663
  facts: new Set(),
1507
1664
  goals: new Map(),
1508
1665
  bindings: new Map(
1509
- [...imported].map(([name, symbol]) => [name, { ...symbol, position: MODULE_START }]),
1666
+ [...imported].map(([name, symbol]) => [
1667
+ name,
1668
+ { ...symbol, position: positions.get(name) ?? MODULE_START },
1669
+ ]),
1510
1670
  ),
1511
1671
  errors: report.errors,
1512
1672
  warnings: report.warnings,
@@ -1562,10 +1722,6 @@ export const collectSemanticErrors = (units: SemanticUnit[], warnings: SanyError
1562
1722
 
1563
1723
  export const resolveModule = (module: Module, unit: ModuleUnit) => {
1564
1724
  const symbols = createSymbols(module, unit.imported);
1565
- const facts = new Set([
1566
- ...unit.facts,
1567
- ...[...module.theorems, ...module.assumptions].flatMap((fact) => fact.name ?? []),
1568
- ]);
1569
1725
  const goals = new Map(
1570
1726
  module.theorems.flatMap((theorem): [string, Goal][] =>
1571
1727
  theorem.name !== undefined && theorem.statement.kind === "AssumeProve"
@@ -1596,7 +1752,7 @@ export const resolveModule = (module: Module, unit: ModuleUnit) => {
1596
1752
  getKey: unit.getKey,
1597
1753
  location,
1598
1754
  self,
1599
- facts,
1755
+ facts: unit.facts,
1600
1756
  goals,
1601
1757
  bindings,
1602
1758
  errors,
@@ -1621,6 +1777,37 @@ export const resolveModule = (module: Module, unit: ModuleUnit) => {
1621
1777
  );
1622
1778
  return collectSemanticErrors(
1623
1779
  [
1780
+ ...module.units.flatMap((item): SemanticUnit[] => {
1781
+ const section =
1782
+ item.kind === "Variables"
1783
+ ? { type: "A VARIABLE declaration", location: item.location }
1784
+ : item.kind === "Constants"
1785
+ ? { type: "A declaration", location: item.location }
1786
+ : item.kind === "Module"
1787
+ ? { type: "A MODULE ", location: item.module.location }
1788
+ : item.kind === "Theorem"
1789
+ ? { type: "A THEOREM", location: item.theorem.location }
1790
+ : item.kind === "Assumption"
1791
+ ? { type: "An ASSUME", location: item.assumption.location }
1792
+ : item.kind === "Use"
1793
+ ? { type: "A USE or HIDE", location: item.use.location }
1794
+ : undefined;
1795
+ const range = section?.location.range;
1796
+ if (!section || !range) return [];
1797
+ return [
1798
+ {
1799
+ location: section.location,
1800
+ check: (errors) => {
1801
+ if (declarations.some((declared) => declared.binding?.isPending)) {
1802
+ errors.push({
1803
+ location: formatRange(range),
1804
+ message: `${section.type} may not appear within a recursive definition section.`,
1805
+ });
1806
+ }
1807
+ },
1808
+ },
1809
+ ];
1810
+ }),
1624
1811
  ...unit.reports.map((report) => ({
1625
1812
  location: report.location,
1626
1813
  check: (errors: SanyError[], warnings: SanyError[]) => {
@@ -1713,7 +1900,7 @@ export const resolveModule = (module: Module, unit: ModuleUnit) => {
1713
1900
  if (range && (!item.binding || item.binding.isPending)) {
1714
1901
  errors.push({
1715
1902
  location: formatRange(range),
1716
- message: `Symbol ${item.declaration.name} declared in RECURSIVE statement but not defined.`,
1903
+ message: `Symbol ${resolveSynonym(item.declaration.name)} declared in RECURSIVE statement but not defined.`,
1717
1904
  });
1718
1905
  }
1719
1906
  }),
package/src/runtime.ts CHANGED
@@ -19,13 +19,16 @@ export interface CheckerRuntime {
19
19
  | undefined;
20
20
  evaluateAtStartup: <Result>(evaluate: () => Result) => Result;
21
21
  pause: (() => void) | undefined;
22
+ readLine: (() => string | undefined) | undefined;
22
23
  warn: (code: number, text: string) => void;
23
24
  isWarningEnabled: boolean;
24
25
  isTool: boolean;
25
26
  version: TlcVersion;
26
27
  seed: bigint;
27
28
  isSeen: (state: Value[]) => boolean;
29
+ markExplored: ((state: Value[]) => void) | undefined;
28
30
  getSuccessorAction: (state: Value[], next: Value[]) => SpecAction | undefined;
31
+ toRecord: (state: Value[]) => Record<string, Value>;
29
32
  generatedStates: number;
30
33
  distinctStates: number;
31
34
  initialStates: number;
@@ -53,7 +56,9 @@ export const createRuntime = (checkDeadlock: boolean, seed = 0n): CheckerRuntime
53
56
  counterExample: undefined,
54
57
  deferred: undefined,
55
58
  isSeen: () => false,
59
+ markExplored: undefined,
56
60
  getSuccessorAction: () => undefined,
61
+ toRecord: () => ({}),
57
62
  setLivenessSource: () => {},
58
63
  getCurrentState: () => undefined,
59
64
  getFingerprint: getTlcFingerprint,
@@ -77,6 +82,7 @@ export const createRuntime = (checkDeadlock: boolean, seed = 0n): CheckerRuntime
77
82
  }
78
83
  },
79
84
  pause: undefined,
85
+ readLine: undefined,
80
86
  warn: () => {},
81
87
  isWarningEnabled: true,
82
88
  isTool: false,