tla-ts 0.0.4-dev.702eb98 → 0.0.4-dev.7714e32

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 (382) hide show
  1. package/README.md +32 -6
  2. package/dist/cli.cjs +1 -1
  3. package/dist/cli.js +1 -1
  4. package/dist/deciders.cjs +27 -27
  5. package/dist/deciders.js +34 -34
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +12 -14
  8. package/dist/index.d.ts +12 -14
  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-worker.cjs +1 -1
  13. package/dist/prove-worker.js +1 -1
  14. package/dist/prove.cjs +516 -25
  15. package/dist/prove.js +518 -27
  16. package/dist/run.cjs +45 -0
  17. package/dist/run.js +45 -0
  18. package/dist/tlapm.cjs +2 -2
  19. package/dist/tlapm.js +2 -2
  20. package/dist/transfer.cjs +76 -86
  21. package/dist/transfer.js +73 -83
  22. package/dist/worker.cjs +6 -6
  23. package/dist/worker.js +6 -6
  24. package/package.json +1 -1
  25. package/src/ast.ts +2 -2
  26. package/src/bags.ts +22 -23
  27. package/src/builtins.ts +16 -8
  28. package/src/check.ts +131 -1154
  29. package/src/{cli-options.ts → cli/options.ts} +54 -9
  30. package/src/cli/run.ts +63 -0
  31. package/src/cli/shared.ts +106 -0
  32. package/src/cli/tlapm.ts +374 -0
  33. package/src/{run-cli.ts → cli/tlc.ts} +112 -761
  34. package/src/cli/xml-exporter.ts +221 -0
  35. package/src/cli.ts +1 -1
  36. package/src/codegen.ts +17 -15
  37. package/src/config.ts +5 -5
  38. package/src/dependencies.ts +4 -6
  39. package/src/environment.ts +55 -60
  40. package/src/errors.ts +12 -36
  41. package/src/evaluate.ts +81 -101
  42. package/src/exit-codes.ts +1 -1
  43. package/src/fingerprints.ts +3 -3
  44. package/src/index.ts +2 -2
  45. package/src/instances.ts +56 -46
  46. package/src/java-overrides.ts +79 -41
  47. package/src/json.ts +31 -36
  48. package/src/levels.ts +10 -13
  49. package/src/{live-check.ts → liveness-checker.ts} +169 -142
  50. package/src/liveness.ts +38 -34
  51. package/src/obligations/action.ts +58 -105
  52. package/src/obligations/{anon.ts → anonymize.ts} +44 -52
  53. package/src/obligations/equality.ts +260 -0
  54. package/src/obligations/expression.ts +42 -530
  55. package/src/obligations/format.ts +7 -8
  56. package/src/obligations/generate.ts +93 -783
  57. package/src/obligations/index.ts +23 -23
  58. package/src/obligations/levels.ts +38 -44
  59. package/src/obligations/module.ts +106 -729
  60. package/src/obligations/normalize.ts +554 -0
  61. package/src/obligations/operators.ts +176 -0
  62. package/src/obligations/pragma.ts +35 -29
  63. package/src/obligations/printer.ts +98 -209
  64. package/src/obligations/proof.ts +0 -1
  65. package/src/obligations/regroup.ts +100 -0
  66. package/src/obligations/simplify.ts +668 -0
  67. package/src/obligations/source.ts +92 -192
  68. package/src/obligations/{deref.ts → subexpression.ts} +82 -113
  69. package/src/obligations/substitution.ts +261 -0
  70. package/src/obligations/temporal.ts +32 -30
  71. package/src/obligations/tuples.ts +37 -53
  72. package/src/parallel-worker.ts +37 -33
  73. package/src/parallel.ts +30 -24
  74. package/src/parser.ts +67 -74
  75. package/src/{pcal-ast.ts → pcal/ast.ts} +2 -17
  76. package/src/{pcal-parse.ts → pcal/parse.ts} +28 -64
  77. package/src/{pcal-tokenize.ts → pcal/tokenize.ts} +10 -39
  78. package/src/{pcal-translate.ts → pcal/translate.ts} +30 -109
  79. package/src/{pcal-validate.ts → pcal/validate.ts} +10 -20
  80. package/src/{prove → prover}/decide-pool.ts +14 -19
  81. package/src/{prove → prover}/deciders.ts +7 -1
  82. package/src/{obligations/pickle.ts → prover/first-order.ts} +79 -4
  83. package/src/{prove → prover}/isabelle/decide.ts +3 -6
  84. package/src/{prove → prover}/isabelle/encode.ts +106 -138
  85. package/src/{prove → prover}/isabelle/isar/inner-syntax.ts +1 -1
  86. package/src/{prove → prover}/isabelle/isar/method.ts +3 -3
  87. package/src/{prove → prover}/isabelle/isar/type-check.ts +1 -1
  88. package/src/{prove → prover}/isabelle/provers/blast/blast.ts +1 -1
  89. package/src/{prove → prover}/isabelle/provers/blast/branch.ts +1 -1
  90. package/src/{prove → prover}/isabelle/provers/blast/term.ts +3 -4
  91. package/src/{prove → prover}/isabelle/provers/clasimp.ts +1 -1
  92. package/src/{prove → prover}/isabelle/provers/classical.ts +3 -3
  93. package/src/{prove → prover}/isabelle/provers/hypsubst.ts +1 -9
  94. package/src/{prove → prover}/isabelle/pure/conv.ts +1 -1
  95. package/src/{prove → prover}/isabelle/pure/drule.ts +2 -2
  96. package/src/{prove → prover}/isabelle/pure/envir.ts +3 -35
  97. package/src/{prove → prover}/isabelle/pure/logic.ts +4 -76
  98. package/src/{prove → prover}/isabelle/pure/name.ts +1 -13
  99. package/src/{prove → prover}/isabelle/pure/net.ts +2 -49
  100. package/src/{prove → prover}/isabelle/pure/pattern.ts +3 -22
  101. package/src/{prove → prover}/isabelle/pure/raw-simplifier.ts +3 -18
  102. package/src/{prove → prover}/isabelle/pure/seq.ts +0 -23
  103. package/src/{prove → prover}/isabelle/pure/simplifier.ts +2 -8
  104. package/src/{prove → prover}/isabelle/pure/table.ts +1 -8
  105. package/src/{prove → prover}/isabelle/pure/tactic.ts +5 -113
  106. package/src/{prove → prover}/isabelle/pure/tactical.ts +1 -84
  107. package/src/{prove → prover}/isabelle/pure/term-ord.ts +1 -55
  108. package/src/{prove → prover}/isabelle/pure/term.ts +8 -128
  109. package/src/{prove → prover}/isabelle/pure/thm.ts +4 -27
  110. package/src/{prove → prover}/isabelle/pure/type.ts +0 -12
  111. package/src/{prove → prover}/isabelle/pure/unify.ts +1 -1
  112. package/src/{prove → prover}/isabelle/tla/classical-setup.ts +1 -1
  113. package/src/{prove → prover}/ocaml.ts +1 -1
  114. package/src/{prove → prover}/prep/action.ts +54 -66
  115. package/src/{prove → prover}/prep/enabled-axioms.ts +2 -2
  116. package/src/{prove → prover}/prep/fingerprint.ts +3 -3
  117. package/src/{prove → prover}/prep/level-comparison.ts +15 -38
  118. package/src/{prove → prover}/prep/md5.ts +2 -9
  119. package/src/{prove/prep/pragma.ts → prover/prep/methods.ts} +4 -4
  120. package/src/prover/prep/normalize.ts +309 -0
  121. package/src/{prove → prover}/prove-worker.ts +4 -11
  122. package/src/prover/prove.ts +492 -0
  123. package/src/{prove → prover}/ptl/encode.ts +19 -31
  124. package/src/{prove → prover}/smt/axioms.ts +78 -79
  125. package/src/{prove → prover}/smt/data.ts +16 -45
  126. package/src/{prove → prover}/smt/encode.ts +134 -28
  127. package/src/{prove → prover}/smt/extensionality.ts +14 -12
  128. package/src/{prove → prover}/smt/flatten.ts +3 -18
  129. package/src/{prove → prover}/smt/format.ts +14 -3
  130. package/src/{prove → prover}/smt/instances.ts +4 -5
  131. package/src/{prove → prover}/smt/rewrite.ts +41 -59
  132. package/src/{prove → prover}/smt/solver/ast-util.ts +0 -56
  133. package/src/{prove → prover}/smt/solver/case-split-queue.ts +1 -1
  134. package/src/{prove → prover}/smt/solver/enode.ts +1 -1
  135. package/src/{prove → prover}/smt/solver/lp/dep-intervals.ts +0 -14
  136. package/src/{prove → prover}/smt/solver/model-macro-solver.ts +1 -1
  137. package/src/{prove → prover}/smt/solver/nlsat/algebraic.ts +3 -3
  138. package/src/{prove → prover}/smt/solver/nlsat/atoms.ts +1 -1
  139. package/src/{prove → prover}/smt/solver/nlsat/explain.ts +1 -1
  140. package/src/{prove → prover}/smt/solver/nlsat/interval-set.ts +1 -1
  141. package/src/{prove → prover}/smt/solver/nlsat/levelwise.ts +4 -7
  142. package/src/{prove → prover}/smt/solver/nlsat/polynomial.ts +4 -4
  143. package/src/{prove → prover}/smt/solver/nlsat/upolynomial.ts +2 -2
  144. package/src/{prove → prover}/smt/solver/pattern-inference.ts +1 -1
  145. package/src/{prove → prover}/smt/solver/relevancy.ts +2 -2
  146. package/src/{prove → prover}/smt/solver/rewriter.ts +1 -1
  147. package/src/{prove → prover}/smt/solver/solver.ts +2 -2
  148. package/src/prover/tlapm/cache.ts +236 -0
  149. package/src/prover/tlapm/ocaml-marshal.ts +166 -0
  150. package/src/{prove → prover}/tlapm/tlapm.ts +1 -2
  151. package/src/prover/verdict.ts +13 -0
  152. package/src/{prove → prover}/zenon/decide.ts +5 -11
  153. package/src/{prove → prover}/zenon/encode.ts +40 -106
  154. package/src/{prove → prover}/zenon/eqrel.ts +1 -1
  155. package/src/{prove → prover}/zenon/equality-rules.ts +1 -1
  156. package/src/{prove → prover}/zenon/expr.ts +2 -2
  157. package/src/{prove → prover}/zenon/index-table.ts +1 -1
  158. package/src/{prove → prover}/zenon/isar.ts +1 -1
  159. package/src/{prove → prover}/zenon/llproof.ts +1 -1
  160. package/src/{prove → prover}/zenon/mltoll.ts +1 -1
  161. package/src/{prove → prover}/zenon/node.ts +1 -1
  162. package/src/{prove → prover}/zenon/search.ts +1 -1
  163. package/src/{prove → prover}/zenon/tla/terms.ts +1 -20
  164. package/src/{prove → prover}/zenon/tla/tla.ts +1 -1
  165. package/src/randomization.ts +19 -24
  166. package/src/resolve.ts +15 -22
  167. package/src/runtime.ts +8 -8
  168. package/src/{sany-builtins.ts → sany/builtins.ts} +1 -1
  169. package/src/{sany-generator.ts → sany/generator.ts} +38 -55
  170. package/src/{sany-levels.ts → sany/levels.ts} +45 -48
  171. package/src/{sany-lexer.ts → sany/lexer.ts} +2 -3
  172. package/src/{sany-linter.ts → sany/linter.ts} +1 -1
  173. package/src/{sany-modules.ts → sany/modules.ts} +2 -2
  174. package/src/{sany-nodes.ts → sany/nodes.ts} +2 -2
  175. package/src/{sany-parse-error.ts → sany/parse-error.ts} +2 -2
  176. package/src/{sany-report.ts → sany/report.ts} +16 -17
  177. package/src/{sany-selectors.ts → sany/selectors.ts} +3 -5
  178. package/src/{sany-source.ts → sany/source.ts} +6 -7
  179. package/src/{sany-xml.ts → sany/xml.ts} +5 -6
  180. package/src/search.ts +969 -0
  181. package/src/spec-description.ts +26 -20
  182. package/src/{standard-levels.ts → standard-definitions.ts} +118 -2
  183. package/src/standard-modules.ts +16 -20
  184. package/src/state-graph.ts +9 -8
  185. package/src/substitution-levels.ts +2 -2
  186. package/src/successors.ts +16 -19
  187. package/src/symmetry.ts +1 -1
  188. package/src/tableau.ts +6 -7
  189. package/src/tlc/fingerprint.ts +214 -0
  190. package/src/{tlc-messages.ts → tlc/messages.ts} +119 -7
  191. package/src/{tlc-order.ts → tlc/order.ts} +7 -7
  192. package/src/{tlc-random.ts → tlc/random.ts} +3 -213
  193. package/src/{tlc-replay.ts → tlc/replay.ts} +40 -36
  194. package/src/{tlc-module.ts → tlc/tlc-operators.ts} +9 -9
  195. package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +30 -25
  196. package/src/transfer.ts +32 -32
  197. package/src/values.ts +72 -67
  198. package/src/worker.ts +1 -4
  199. package/dist/run-cli.cjs +0 -38
  200. package/dist/run-cli.js +0 -38
  201. package/src/canonical.ts +0 -40
  202. package/src/obligations/ctx.ts +0 -64
  203. package/src/prove/prep/defs.ts +0 -27
  204. package/src/prove/prep/elab.ts +0 -156
  205. package/src/prove/prep/enabled.ts +0 -43
  206. package/src/prove/prep/flatten.ts +0 -70
  207. package/src/prove/prep/trivial.ts +0 -22
  208. package/src/prove/prove.ts +0 -417
  209. package/src/prove/smt/axiomatize.ts +0 -69
  210. package/src/prove/smt/simplify.ts +0 -57
  211. package/src/prove/verdict.ts +0 -13
  212. package/src/standard-ranges.ts +0 -116
  213. package/src/value-sources.ts +0 -29
  214. /package/src/{prove → prover}/isabelle/LICENSE +0 -0
  215. /package/src/{prove → prover}/isabelle/LICENSE-tlapm +0 -0
  216. /package/src/{prove → prover}/isabelle/isar/proof.ts +0 -0
  217. /package/src/{prove → prover}/isabelle/isar/statement.ts +0 -0
  218. /package/src/{prove → prover}/isabelle/isar/theory.ts +0 -0
  219. /package/src/{prove → prover}/isabelle/provers/blast/prove.ts +0 -0
  220. /package/src/{prove → prover}/isabelle/provers/blast/rules.ts +0 -0
  221. /package/src/{prove → prover}/isabelle/provers/blast/state.ts +0 -0
  222. /package/src/{prove → prover}/isabelle/pure/bicompose.ts +0 -0
  223. /package/src/{prove → prover}/isabelle/pure/consts.ts +0 -0
  224. /package/src/{prove → prover}/isabelle/pure/goal.ts +0 -0
  225. /package/src/{prove → prover}/isabelle/pure/interrupt.ts +0 -0
  226. /package/src/{prove → prover}/isabelle/pure/list.ts +0 -0
  227. /package/src/{prove → prover}/isabelle/pure/object-logic.ts +0 -0
  228. /package/src/{prove → prover}/isabelle/pure/rewriter.ts +0 -0
  229. /package/src/{prove → prover}/isabelle/pure/search.ts +0 -0
  230. /package/src/{prove → prover}/isabelle/pure/variable.ts +0 -0
  231. /package/src/{prove → prover}/isabelle/tla/context.ts +0 -0
  232. /package/src/{prove → prover}/isabelle/tla/logic-data.ts +0 -0
  233. /package/src/{prove → prover}/isabelle/tla/logic.ts +0 -0
  234. /package/src/{prove → prover}/isabelle/tla/simpdata.ts +0 -0
  235. /package/src/{prove → prover}/isabelle/tools/intuitionistic.ts +0 -0
  236. /package/src/{prove → prover}/ptl/decide.ts +0 -0
  237. /package/src/{prove → prover}/ptl/sat.ts +0 -0
  238. /package/src/{prove → prover}/ptl/tableau.ts +0 -0
  239. /package/src/{prove → prover}/smt/context.ts +0 -0
  240. /package/src/{prove → prover}/smt/solver/act-cache.ts +0 -0
  241. /package/src/{prove → prover}/smt/solver/arith-rewriter.ts +0 -0
  242. /package/src/{prove → prover}/smt/solver/array.ts +0 -0
  243. /package/src/{prove → prover}/smt/solver/asserted-formulas.ts +0 -0
  244. /package/src/{prove → prover}/smt/solver/ast-lt.ts +0 -0
  245. /package/src/{prove → prover}/smt/solver/ast.ts +0 -0
  246. /package/src/{prove → prover}/smt/solver/auf-solver.ts +0 -0
  247. /package/src/{prove → prover}/smt/solver/cg-table.ts +0 -0
  248. /package/src/{prove → prover}/smt/solver/clause.ts +0 -0
  249. /package/src/{prove → prover}/smt/solver/conflict-resolution.ts +0 -0
  250. /package/src/{prove → prover}/smt/solver/context.ts +0 -0
  251. /package/src/{prove → prover}/smt/solver/ctx-simplify.ts +0 -0
  252. /package/src/{prove → prover}/smt/solver/der.ts +0 -0
  253. /package/src/{prove → prover}/smt/solver/dyn-ack.ts +0 -0
  254. /package/src/{prove → prover}/smt/solver/e-matching.ts +0 -0
  255. /package/src/{prove → prover}/smt/solver/expr-ref.ts +0 -0
  256. /package/src/{prove → prover}/smt/solver/expr-safe-replace.ts +0 -0
  257. /package/src/{prove → prover}/smt/solver/fingerprints.ts +0 -0
  258. /package/src/{prove → prover}/smt/solver/flat-literals.ts +0 -0
  259. /package/src/{prove → prover}/smt/solver/goal.ts +0 -0
  260. /package/src/{prove → prover}/smt/solver/hash.ts +0 -0
  261. /package/src/{prove → prover}/smt/solver/hashtable.ts +0 -0
  262. /package/src/{prove → prover}/smt/solver/internalizer.ts +0 -0
  263. /package/src/{prove → prover}/smt/solver/lbool.ts +0 -0
  264. /package/src/{prove → prover}/smt/solver/literal.ts +0 -0
  265. /package/src/{prove → prover}/smt/solver/lp/bound-propagator.ts +0 -0
  266. /package/src/{prove → prover}/smt/solver/lp/constraints.ts +0 -0
  267. /package/src/{prove → prover}/smt/solver/lp/containers.ts +0 -0
  268. /package/src/{prove → prover}/smt/solver/lp/core-solver.ts +0 -0
  269. /package/src/{prove → prover}/smt/solver/lp/cross-nested.ts +0 -0
  270. /package/src/{prove → prover}/smt/solver/lp/dependency.ts +0 -0
  271. /package/src/{prove → prover}/smt/solver/lp/dioph-eq.ts +0 -0
  272. /package/src/{prove → prover}/smt/solver/lp/explanation.ts +0 -0
  273. /package/src/{prove → prover}/smt/solver/lp/gomory.ts +0 -0
  274. /package/src/{prove → prover}/smt/solver/lp/hnf-cutter.ts +0 -0
  275. /package/src/{prove → prover}/smt/solver/lp/hnf.ts +0 -0
  276. /package/src/{prove → prover}/smt/solver/lp/int-cube.ts +0 -0
  277. /package/src/{prove → prover}/smt/solver/lp/int-solver.ts +0 -0
  278. /package/src/{prove → prover}/smt/solver/lp/lar-solver.ts +0 -0
  279. /package/src/{prove → prover}/smt/solver/lp/lar-term.ts +0 -0
  280. /package/src/{prove → prover}/smt/solver/lp/lp-settings.ts +0 -0
  281. /package/src/{prove → prover}/smt/solver/lp/maximize-term.ts +0 -0
  282. /package/src/{prove → prover}/smt/solver/lp/nex-creator.ts +0 -0
  283. /package/src/{prove → prover}/smt/solver/lp/nex.ts +0 -0
  284. /package/src/{prove → prover}/smt/solver/lp/nla-backoff.ts +0 -0
  285. /package/src/{prove → prover}/smt/solver/lp/nla-basics.ts +0 -0
  286. /package/src/{prove → prover}/smt/solver/lp/nla-core.ts +0 -0
  287. /package/src/{prove → prover}/smt/solver/lp/nla-divisions.ts +0 -0
  288. /package/src/{prove → prover}/smt/solver/lp/nla-emonics.ts +0 -0
  289. /package/src/{prove → prover}/smt/solver/lp/nla-factorization.ts +0 -0
  290. /package/src/{prove → prover}/smt/solver/lp/nla-grobner.ts +0 -0
  291. /package/src/{prove → prover}/smt/solver/lp/nla-horner.ts +0 -0
  292. /package/src/{prove → prover}/smt/solver/lp/nla-intervals.ts +0 -0
  293. /package/src/{prove → prover}/smt/solver/lp/nla-monomial-bounds.ts +0 -0
  294. /package/src/{prove → prover}/smt/solver/lp/nla-monotone.ts +0 -0
  295. /package/src/{prove → prover}/smt/solver/lp/nla-order.ts +0 -0
  296. /package/src/{prove → prover}/smt/solver/lp/nla-patcher.ts +0 -0
  297. /package/src/{prove → prover}/smt/solver/lp/nla-tangents.ts +0 -0
  298. /package/src/{prove → prover}/smt/solver/lp/nla-throttle.ts +0 -0
  299. /package/src/{prove → prover}/smt/solver/lp/nla-types.ts +0 -0
  300. /package/src/{prove → prover}/smt/solver/lp/nla-var-eqs.ts +0 -0
  301. /package/src/{prove → prover}/smt/solver/lp/nra-solver.ts +0 -0
  302. /package/src/{prove → prover}/smt/solver/lp/numeric-pair.ts +0 -0
  303. /package/src/{prove → prover}/smt/solver/lp/pdd-interval.ts +0 -0
  304. /package/src/{prove → prover}/smt/solver/lp/pdd-simplifier.ts +0 -0
  305. /package/src/{prove → prover}/smt/solver/lp/pdd-solver.ts +0 -0
  306. /package/src/{prove → prover}/smt/solver/lp/pdd.ts +0 -0
  307. /package/src/{prove → prover}/smt/solver/lp/random-updater.ts +0 -0
  308. /package/src/{prove → prover}/smt/solver/lp/static-matrix.ts +0 -0
  309. /package/src/{prove → prover}/smt/solver/lp/union-find.ts +0 -0
  310. /package/src/{prove → prover}/smt/solver/mam-compiler.ts +0 -0
  311. /package/src/{prove → prover}/smt/solver/mam-interpreter.ts +0 -0
  312. /package/src/{prove → prover}/smt/solver/maximize-ac-sharing.ts +0 -0
  313. /package/src/{prove → prover}/smt/solver/model-checker.ts +0 -0
  314. /package/src/{prove → prover}/smt/solver/model-evaluator.ts +0 -0
  315. /package/src/{prove → prover}/smt/solver/model-finder.ts +0 -0
  316. /package/src/{prove → prover}/smt/solver/model-generator.ts +0 -0
  317. /package/src/{prove → prover}/smt/solver/nlsat/evaluator.ts +0 -0
  318. /package/src/{prove → prover}/smt/solver/nlsat/mpbq.ts +0 -0
  319. /package/src/{prove → prover}/smt/solver/nlsat/solver.ts +0 -0
  320. /package/src/{prove → prover}/smt/solver/nlsat/types.ts +0 -0
  321. /package/src/{prove → prover}/smt/solver/nlsat/upolynomial-factorization.ts +0 -0
  322. /package/src/{prove → prover}/smt/solver/nnf.ts +0 -0
  323. /package/src/{prove → prover}/smt/solver/poly-rewriter.ts +0 -0
  324. /package/src/{prove → prover}/smt/solver/propagate-values.ts +0 -0
  325. /package/src/{prove → prover}/smt/solver/proto-model.ts +0 -0
  326. /package/src/{prove → prover}/smt/solver/pull-quant.ts +0 -0
  327. /package/src/{prove → prover}/smt/solver/qe-lite-der.ts +0 -0
  328. /package/src/{prove → prover}/smt/solver/qe-lite-fm.ts +0 -0
  329. /package/src/{prove → prover}/smt/solver/qe-lite.ts +0 -0
  330. /package/src/{prove → prover}/smt/solver/qi-queue.ts +0 -0
  331. /package/src/{prove → prover}/smt/solver/quant-tactics.ts +0 -0
  332. /package/src/{prove → prover}/smt/solver/quantifier-analyzer.ts +0 -0
  333. /package/src/{prove → prover}/smt/solver/quantifier-manager.ts +0 -0
  334. /package/src/{prove → prover}/smt/solver/random-gen.ts +0 -0
  335. /package/src/{prove → prover}/smt/solver/rational.ts +0 -0
  336. /package/src/{prove → prover}/smt/solver/ref-vector.ts +0 -0
  337. /package/src/{prove → prover}/smt/solver/rewriter-tpl.ts +0 -0
  338. /package/src/{prove → prover}/smt/solver/rlimit.ts +0 -0
  339. /package/src/{prove → prover}/smt/solver/smtlib-parser.ts +0 -0
  340. /package/src/{prove → prover}/smt/solver/sort.ts +0 -0
  341. /package/src/{prove → prover}/smt/solver/sticky-generations.ts +0 -0
  342. /package/src/{prove → prover}/smt/solver/theory-lra-axioms.ts +0 -0
  343. /package/src/{prove → prover}/smt/solver/theory-lra-bounds.ts +0 -0
  344. /package/src/{prove → prover}/smt/solver/theory-lra-final-check.ts +0 -0
  345. /package/src/{prove → prover}/smt/solver/theory-lra-internalize.ts +0 -0
  346. /package/src/{prove → prover}/smt/solver/theory-lra-model.ts +0 -0
  347. /package/src/{prove → prover}/smt/solver/theory-lra-propagate.ts +0 -0
  348. /package/src/{prove → prover}/smt/solver/theory-lra-state.ts +0 -0
  349. /package/src/{prove → prover}/smt/solver/theory-lra.ts +0 -0
  350. /package/src/{prove → prover}/smt/solver/var-subst.ts +0 -0
  351. /package/src/{prove → prover}/smt/solver/z3-license.txt +0 -0
  352. /package/src/{prove → prover}/smt/table.ts +0 -0
  353. /package/src/{prove → prover}/tlaps-module.ts +0 -0
  354. /package/src/{prove → prover}/zenon/LICENSE +0 -0
  355. /package/src/{prove → prover}/zenon/check/check.ts +0 -0
  356. /package/src/{prove → prover}/zenon/check/definitions.ts +0 -0
  357. /package/src/{prove → prover}/zenon/check/equality.ts +0 -0
  358. /package/src/{prove → prover}/zenon/check/functions.ts +0 -0
  359. /package/src/{prove → prover}/zenon/check/keys.ts +0 -0
  360. /package/src/{prove → prover}/zenon/check/propositional.ts +0 -0
  361. /package/src/{prove → prover}/zenon/check/records.ts +0 -0
  362. /package/src/{prove → prover}/zenon/check/relations.ts +0 -0
  363. /package/src/{prove → prover}/zenon/check/rewrites.ts +0 -0
  364. /package/src/{prove → prover}/zenon/check/sets.ts +0 -0
  365. /package/src/{prove → prover}/zenon/check/terms.ts +0 -0
  366. /package/src/{prove → prover}/zenon/check/tla.ts +0 -0
  367. /package/src/{prove → prover}/zenon/isar-case.ts +0 -0
  368. /package/src/{prove → prover}/zenon/limits.ts +0 -0
  369. /package/src/{prove → prover}/zenon/ocaml.ts +0 -0
  370. /package/src/{prove → prover}/zenon/parse.ts +0 -0
  371. /package/src/{prove → prover}/zenon/phrase.ts +0 -0
  372. /package/src/{prove → prover}/zenon/proof.ts +0 -0
  373. /package/src/{prove → prover}/zenon/propositional-rules.ts +0 -0
  374. /package/src/{prove → prover}/zenon/rules.ts +0 -0
  375. /package/src/{prove → prover}/zenon/tla/functions.ts +0 -0
  376. /package/src/{prove → prover}/zenon/tla/llproof.ts +0 -0
  377. /package/src/{prove → prover}/zenon/tla/records.ts +0 -0
  378. /package/src/{prove → prover}/zenon/tla/rewrites.ts +0 -0
  379. /package/src/{prove → prover}/zenon/tla/sets.ts +0 -0
  380. /package/src/{tlc-modules.ts → tlc/jar-data.ts} +0 -0
  381. /package/src/{tlc-summary.ts → tlc/summary.ts} +0 -0
  382. /package/src/{tlc-version.ts → tlc/version.ts} +0 -0
@@ -2,17 +2,10 @@
2
2
  // each visible fact and a $goal, naming identifiers as Isabelle does.
3
3
 
4
4
  import { TlapmBugError, TlaProverError, TlaUnsupportedError } from "../../errors";
5
- import { createContext, getBoundName, popNames, pushName } from "../../obligations/ctx";
6
- import {
7
- shiftExpr,
8
- type Bound,
9
- type Builtin,
10
- type Expr,
11
- type Hyp,
12
- type Sequent,
13
- } from "../../obligations/expression";
5
+ import { createContext, getBoundName, popNames, pushName } from "../../obligations/printer";
6
+ import type { Bound, Builtin, Expr, Hyp, Sequent } from "../../obligations/expression";
14
7
  import { format, formatDelimited, renderDoc, text, type Doc } from "../../obligations/format";
15
- import { pickle } from "../../obligations/pickle";
8
+ import { getUnprintableError, pickle, printFact, splitFirstBound } from "../first-order";
16
9
 
17
10
  const SPACE = format("@ ");
18
11
 
@@ -76,21 +69,6 @@ const OPERATORS: Partial<Record<Builtin, [string, number]>> = {
76
69
  ToString: ["TLA.ToString", 1],
77
70
  };
78
71
 
79
- // The temporal operators Zenon has no counterpart for, by the name tlapm reports.
80
- const TEMPORAL_OPERATORS: Partial<Record<Builtin, [string, number]>> = {
81
- Leadsto: ["Leadsto", 2],
82
- ENABLED: ["ENABLED", 1],
83
- Cdot: ["\\cdot", 2],
84
- Actplus: ["-+->", 2],
85
- BoxTrue: ["[]", 1],
86
- BoxFalse: ["[]", 1],
87
- Diamond: ["<>", 1],
88
- };
89
-
90
- const unsupported = (message: string): never => {
91
- throw new TlaUnsupportedError(message);
92
- };
93
-
94
72
  const getSuccessors = (integer: string) => {
95
73
  const count = Number.parseInt(integer, 10);
96
74
  return `${"(TLA.fapply TLA.Succ ".repeat(count)}0${")".repeat(count)}`;
@@ -108,9 +86,9 @@ export const encodeZenon = (id: number, sequent: Sequent) => {
108
86
  const nonatomic = (name: string, args: Expr[]) => format("(%s %a)", name, delimited(args));
109
87
 
110
88
  // A binder's name binds in the body, and what comes before prints outside it.
111
- const printBinder = (name: string, before: Doc, body: Expr, after: string) => {
89
+ const printBinder = (name: string, before: Doc, body: Expr) => {
112
90
  const bound = adjoin(name);
113
- const doc = format("%a((%s) %a)%s", before, bound, printExpr(body), after);
91
+ const doc = format("%a((%s) %a))", before, bound, printExpr(body));
114
92
  popNames(context, 1);
115
93
  return doc;
116
94
  };
@@ -120,7 +98,6 @@ export const encodeZenon = (id: number, sequent: Sequent) => {
120
98
  if (atom !== undefined && args.length === 0) return text(atom);
121
99
  const operator = OPERATORS[builtin];
122
100
  if (operator && operator[1] === args.length) return nonatomic(operator[0], args);
123
- const [first, second] = args;
124
101
  if (args.length === 2) {
125
102
  switch (builtin) {
126
103
  case "Neq":
@@ -129,28 +106,22 @@ export const encodeZenon = (id: number, sequent: Sequent) => {
129
106
  return format("(-. %a)", nonatomic("TLA.in", args));
130
107
  case "Minus":
131
108
  return nonatomic("arith.add", [
132
- first,
109
+ args[0],
133
110
  {
134
111
  kind: "Apply",
135
- operator: { kind: "Internal", builtin: "Uminus", location: second.location },
136
- args: [second],
137
- location: second.location,
112
+ operator: { kind: "Internal", builtin: "Uminus", location: args[1].location },
113
+ args: [args[1]],
114
+ location: args[1].location,
138
115
  },
139
116
  ]);
140
117
  case "Gteq":
141
- return nonatomic("arith.le", [second, first]);
118
+ return nonatomic("arith.le", args.toReversed());
142
119
  case "Gt":
143
- return nonatomic("arith.lt", [second, first]);
120
+ return nonatomic("arith.lt", args.toReversed());
144
121
  }
145
122
  }
146
- if (builtin === "Unprimable" && args.length === 1) return printExpr(first);
147
- const isFrontend = builtin === "Prime" || builtin === "StrongPrime" || builtin === "UNCHANGED";
148
- if (isFrontend && args.length === 1) throw new TlapmBugError();
149
- const temporal = TEMPORAL_OPERATORS[builtin];
150
- if (temporal && temporal[1] === args.length) {
151
- throw new TlaProverError(`Unsupported operator \`${temporal[0]}\`.\n`);
152
- }
153
- throw new TlaProverError("Backend.Zenon.fmt_apply");
123
+ if (builtin === "Unprimable" && args.length === 1) return printExpr(args[0]);
124
+ throw getUnprintableError(builtin, args.length, "Backend.Zenon.fmt_apply");
154
125
  };
155
126
 
156
127
  const printApply = (operator: Expr, args: Expr[]): Doc => {
@@ -177,63 +148,39 @@ export const encodeZenon = (id: number, sequent: Sequent) => {
177
148
  }
178
149
  };
179
150
 
180
- // The first bound binds around a quantifier over the others, which move under it.
181
151
  const printQuant = (quantifier: "Forall" | "Exists", bounds: Bound[], body: Expr): Doc => {
182
- const [bound, ...rest] = bounds;
183
- if (!bound) return printExpr(body);
184
- const undittoed =
185
- rest[0]?.domain.kind === "Ditto"
186
- ? [{ ...rest[0], domain: bound.domain }, ...rest.slice(1)]
187
- : rest;
188
- const inner: Expr =
189
- undittoed.length === 0
190
- ? body
191
- : {
192
- kind: "Quant",
193
- quantifier,
194
- bounds: undittoed.map((other) =>
195
- other.domain.kind === "Domain"
196
- ? {
197
- ...other,
198
- domain: { kind: "Domain", expression: shiftExpr(1, other.domain.expression) },
199
- }
200
- : other,
201
- ),
202
- body,
203
- location: body.location,
204
- };
152
+ if (bounds.length === 0) return printExpr(body);
153
+ const split = splitFirstBound(quantifier, bounds, body);
205
154
  const isForall = quantifier === "Forall";
206
- if (bound.domain.kind === "NoDomain") {
207
- return printBinder(bound.name, text(isForall ? "(A. " : "(E. "), inner, ")");
208
- }
209
- if (bound.domain.kind !== "Domain") throw new TlapmBugError();
210
- const domain = printExpr(bound.domain.expression);
155
+ if (split.first.domain.kind === "NoDomain")
156
+ return printBinder(split.first.name, text(isForall ? "(A. " : "(E. "), split.inner);
157
+ if (split.first.domain.kind !== "Domain") throw new TlapmBugError();
158
+ const domain = printExpr(split.first.domain.expression);
211
159
  return printBinder(
212
- bound.name,
160
+ split.first.name,
213
161
  format("(%s %a ", isForall ? "TLA.bAll" : "TLA.bEx", domain),
214
- inner,
215
- ")",
162
+ split.inner,
216
163
  );
217
164
  };
218
165
 
219
166
  // SetOf and Fcn take one bound, whose domain prints outside it.
220
167
  const printOneBound = (name: string, bounds: Bound[], body: Expr, what: string) => {
221
- if (bounds.length !== 1) return unsupported(`${what} (multiple declared constants)`);
168
+ if (bounds.length !== 1) throw new TlaUnsupportedError(`${what} (multiple declared constants)`);
222
169
  const bound = bounds[0];
223
170
  if (bound.domain.kind !== "Domain") throw new TlapmBugError();
224
171
  return printBinder(
225
172
  bound.name,
226
173
  format("(%s %a ", name, printExpr(bound.domain.expression)),
227
174
  body,
228
- ")",
229
175
  );
230
176
  };
231
177
 
232
178
  // A sequent inside an expression, as an implication under quantifiers.
233
179
  const printNestedSequent = (sequent: Sequent): Doc => {
234
- const [hyp, ...rest] = sequent.context;
235
- if (!hyp) return printExpr(sequent.active);
236
- const printRest = () => printNestedSequent({ context: rest, active: sequent.active });
180
+ if (sequent.context.length === 0) return printExpr(sequent.active);
181
+ const hyp = sequent.context[0];
182
+ const printRest = () =>
183
+ printNestedSequent({ context: sequent.context.slice(1), active: sequent.active });
237
184
  if (hyp.kind === "Fact") {
238
185
  const fact = hyp.visibility === "Visible" ? printExpr(hyp.expression) : undefined;
239
186
  bump();
@@ -281,9 +228,8 @@ export const encodeZenon = (id: number, sequent: Sequent) => {
281
228
  case "List":
282
229
  if (expression.bullet === "Refs" && expression.items.length === 0)
283
230
  throw new TlapmBugError();
284
- if (expression.bullet === "Refs" && expression.items.length === 1) {
231
+ if (expression.bullet === "Refs" && expression.items.length === 1)
285
232
  return printExpr(expression.items[0]);
286
- }
287
233
  return format(
288
234
  "(%s %a)",
289
235
  expression.bullet === "Or" ? "\\/" : "/\\",
@@ -292,22 +238,20 @@ export const encodeZenon = (id: number, sequent: Sequent) => {
292
238
  case "Quant":
293
239
  return printQuant(expression.quantifier, expression.bounds, expression.body);
294
240
  case "Tquant":
295
- return unsupported("\\AA or \\EE");
241
+ throw new TlaUnsupportedError("\\AA or \\EE");
296
242
  case "Choose":
297
243
  return expression.domain
298
244
  ? printBinder(
299
245
  expression.name,
300
246
  format("(TLA.bChoice %a ", printExpr(expression.domain)),
301
247
  expression.body,
302
- ")",
303
248
  )
304
- : printBinder(expression.name, text("(t. "), expression.body, ")");
249
+ : printBinder(expression.name, text("(t. "), expression.body);
305
250
  case "SetSt":
306
251
  return printBinder(
307
252
  expression.name,
308
253
  format("(TLA.subsetOf %a ", printExpr(expression.domain)),
309
254
  expression.body,
310
- ")",
311
255
  );
312
256
  case "SetOf":
313
257
  return printOneBound("TLA.setOfAll", expression.bounds, expression.element, "Setof");
@@ -321,10 +265,10 @@ export const encodeZenon = (id: number, sequent: Sequent) => {
321
265
  text(")"),
322
266
  ];
323
267
  case "FcnApp": {
324
- const fcn = printExpr(expression.function);
268
+ const printedFunction = printExpr(expression.function);
325
269
  return expression.args.length === 1
326
- ? format("(TLA.fapply %a %a)", fcn, printExpr(expression.args[0]))
327
- : format("(TLA.fapply %a (TLA.tuple %a))", fcn, delimited(expression.args));
270
+ ? format("(TLA.fapply %a %a)", printedFunction, printExpr(expression.args[0]))
271
+ : format("(TLA.fapply %a (TLA.tuple %a))", printedFunction, delimited(expression.args));
328
272
  }
329
273
  case "Arrow":
330
274
  return format(
@@ -342,7 +286,7 @@ export const encodeZenon = (id: number, sequent: Sequent) => {
342
286
  case "Except": {
343
287
  const spec = expression.specs[0];
344
288
  if (expression.specs.length !== 1 || spec.trail.length !== 1)
345
- return unsupported("complex EXCEPT");
289
+ throw new TlaUnsupportedError("complex EXCEPT");
346
290
  const point = spec.trail[0];
347
291
  const argument =
348
292
  point.kind === "Dot" ? text(`"${point.field}"`) : printExpr(point.expression);
@@ -368,7 +312,7 @@ export const encodeZenon = (id: number, sequent: Sequent) => {
368
312
  case "Sub":
369
313
  case "Tsub":
370
314
  case "Fair":
371
- return unsupported(expression.kind);
315
+ throw new TlaUnsupportedError(expression.kind);
372
316
  case "Case": {
373
317
  const arms = formatDelimited(
374
318
  expression.arms,
@@ -382,7 +326,7 @@ export const encodeZenon = (id: number, sequent: Sequent) => {
382
326
  case "String":
383
327
  return format('"%s"', expression.value);
384
328
  case "Num":
385
- if (expression.fraction !== "") return unsupported("Real number constants");
329
+ if (expression.fraction !== "") throw new TlaUnsupportedError("Real number constants");
386
330
  return text(getSuccessors(expression.integer));
387
331
  case "Bang":
388
332
  case "Let":
@@ -391,18 +335,6 @@ export const encodeZenon = (id: number, sequent: Sequent) => {
391
335
  }
392
336
  };
393
337
 
394
- // tlapm prints a fact to a formatter that drops its output first, to omit an unsupported one.
395
- const getFactDoc = (expression: Expr) => {
396
- const depth = context.stack.length;
397
- try {
398
- return printExpr(expression);
399
- } catch (error) {
400
- if (!(error instanceof TlaUnsupportedError)) throw error;
401
- popNames(context, context.stack.length - depth);
402
- return error;
403
- }
404
- };
405
-
406
338
  const printHyp = (hyp: Hyp): Doc => {
407
339
  switch (hyp.kind) {
408
340
  case "Fresh": {
@@ -422,11 +354,13 @@ export const encodeZenon = (id: number, sequent: Sequent) => {
422
354
  }
423
355
  case "Fact": {
424
356
  const count = String(context.stack.length);
425
- const fact = hyp.visibility === "Visible" ? getFactDoc(hyp.expression) : undefined;
357
+ const fact =
358
+ hyp.visibility === "Visible"
359
+ ? printFact(context, () => printExpr(hyp.expression))
360
+ : undefined;
426
361
  bump();
427
- if (fact instanceof TlaUnsupportedError) {
362
+ if (fact instanceof TlaUnsupportedError)
428
363
  return format("; omitted temporal assumption : %s @.", fact.message);
429
- }
430
364
  return fact ? format('$hyp "v\'%s" %a@\n', count, fact) : [];
431
365
  }
432
366
  }
@@ -16,7 +16,7 @@ export interface Origin {
16
16
  variables: number[];
17
17
  }
18
18
 
19
- export interface RelationInfo {
19
+ interface RelationInfo {
20
20
  reflexive: Origin | undefined;
21
21
  symmetric: Origin | undefined;
22
22
  transitive: Origin | undefined;
@@ -20,7 +20,7 @@ import { insertNode, type Priority, type Queue } from "./node";
20
20
  import { makeRelationRule, makeRule } from "./proof";
21
21
  import { insertAll, makeNode, unequal, type SearchContext, type SearchRule } from "./rules";
22
22
 
23
- export const makeInstance = (
23
+ const makeInstance = (
24
24
  exprs: Expressions,
25
25
  queue: Queue,
26
26
  quantified: Expr,
@@ -115,7 +115,7 @@ const isBinary = (expression: Expr): expression is BinaryExpr =>
115
115
  expression.kind === "imply" ||
116
116
  expression.kind === "equiv";
117
117
 
118
- export const isBinder = (expression: Expr): expression is BinderExpr =>
118
+ const isBinder = (expression: Expr): expression is BinderExpr =>
119
119
  expression.kind === "all" ||
120
120
  expression.kind === "ex" ||
121
121
  expression.kind === "tau" ||
@@ -253,7 +253,7 @@ export const compareExprs = (left: Expr, right: Expr): number => {
253
253
  return 0;
254
254
  };
255
255
 
256
- export type Substitution = [Expr, Expr][];
256
+ type Substitution = [Expr, Expr][];
257
257
 
258
258
  const lookup = (map: Substitution, variable: Expr) => map.find((pair) => pair[0] === variable)?.[1];
259
259
 
@@ -45,7 +45,7 @@ const getLatestFirst = <Key, Value>(table: Map<Key, Value[]>, key: Key) =>
45
45
  [...(table.get(key) ?? [])].reverse();
46
46
 
47
47
  // Zenon's head of a term, or undefined for No_head. Taus and metavariables are heads by identity.
48
- export type Head = string | Expr;
48
+ type Head = string | Expr;
49
49
 
50
50
  export const getHead = (expression: Expr): Head | undefined => {
51
51
  switch (expression.kind) {
@@ -105,7 +105,7 @@ const increment = (indent: number) => (indent >= 15 ? indent : indent + 1);
105
105
  // What the search knew when it found a proof: the .znn file's phrases, the proofs that it reused
106
106
  // and the properties of relations that the hypotheses stated. The printer stops at the search's
107
107
  // limits.
108
- export interface IsarContext {
108
+ interface IsarContext {
109
109
  exprs: Expressions;
110
110
  phrases: Phrase[];
111
111
  sharedProofs: ReadonlySet<MlProof>;
@@ -53,7 +53,7 @@ export const connect = (exprs: Expressions, connective: Connective, left: Expr,
53
53
  ? exprs.eimply(left, right)
54
54
  : exprs.eequiv(left, right);
55
55
 
56
- export const getLemma = (lemmas: Map<string, Lemma>, name: string) => {
56
+ const getLemma = (lemmas: Map<string, Lemma>, name: string) => {
57
57
  const lemma = lemmas.get(name);
58
58
  if (lemma === undefined) throw new TlaZenonError(`Zenon: no lemma ${name}`);
59
59
  return lemma;
@@ -30,7 +30,7 @@ export interface MlProof {
30
30
  // A translated proof, with the hypotheses it uses that aren't conclusions of the node.
31
31
  export type Translated = [LlProof, Expr[]];
32
32
 
33
- export interface TranslateContext {
33
+ interface TranslateContext {
34
34
  exprs: Expressions;
35
35
  // Zenon's Index.get_number, which also names the formulas in the Isar output.
36
36
  getNumber: (expression: Expr) => number;
@@ -17,7 +17,7 @@ export interface Node {
17
17
  branches: Expr[][];
18
18
  }
19
19
 
20
- export interface Cons<Item> {
20
+ interface Cons<Item> {
21
21
  head: Item;
22
22
  tail: Cons<Item> | undefined;
23
23
  }
@@ -135,7 +135,7 @@ interface Frame {
135
135
  current: number;
136
136
  }
137
137
 
138
- export interface SearchStatistics {
138
+ interface SearchStatistics {
139
139
  inferences: number;
140
140
  proofNodes: number;
141
141
  // The proofs that closed another branch from the lemma cache. Zenon counts the uses in mlrefc and
@@ -40,25 +40,6 @@ export const SET_CONSTRUCTORS = [
40
40
 
41
41
  export const FUNCTION_CONSTRUCTORS = ["TLA.Fcn", "TLA.except", "TLA.oneArg", "TLA.extend"];
42
42
 
43
- const OTHER_SYMBOLS = [
44
- "TLA.in",
45
- "TLA.isAFcn",
46
- "TLA.cond",
47
- "TLA.CASE",
48
- "TLA.tuple",
49
- "TLA.record",
50
- "TLA.fapply",
51
- "TLA.box",
52
- ];
53
-
54
- // The symbols that hypotheses can't define, as Zenon's predef with the tla extension.
55
- export const PREDEFINED_SYMBOLS = [
56
- "=",
57
- ...SET_CONSTRUCTORS,
58
- ...FUNCTION_CONSTRUCTORS,
59
- ...OTHER_SYMBOLS,
60
- ];
61
-
62
43
  export const isVariable = (expression: Expr, name: string) =>
63
44
  expression.kind === "var" && expression.symbol === name;
64
45
 
@@ -68,7 +49,7 @@ export const isConstructor = (constructors: string[], expression: Expr) =>
68
49
 
69
50
  export const isNotEquiv = (expression: Expr) => isApp(expression, "$notequiv");
70
51
 
71
- export const isString = (expression: Expr) => isApp(expression, "$string");
52
+ const isString = (expression: Expr) => isApp(expression, "$string");
72
53
 
73
54
  export const equal = (exprs: Expressions, left: Expr, right: Expr) =>
74
55
  exprs.eapp("=", [left, right]);
@@ -481,7 +481,7 @@ const getEqualityPropositionNodes = (
481
481
  ];
482
482
  };
483
483
 
484
- export interface ExtensionNodes {
484
+ interface ExtensionNodes {
485
485
  nodes: Node[];
486
486
  isStopped: boolean;
487
487
  }
@@ -1,12 +1,15 @@
1
- import { createJavaOverrideError, defineStateOperator, getValue } from "./builtins";
2
- import { TlaModuleError } from "./errors";
1
+ import {
2
+ createJavaOverrideError,
3
+ createModuleArgumentError,
4
+ defineStateOperator,
5
+ getValue,
6
+ } from "./builtins";
3
7
  import type { Builtin, BuiltinArgument } from "./evaluate";
4
8
  import type { CheckerRuntime } from "./runtime";
5
- import { getEnumeratedFactors, getRandomSubset, type JavaRandom } from "./tlc-random";
9
+ import { getEnumeratedFactors, getRandomSubset, type JavaRandom } from "./tlc/random";
6
10
  import {
7
11
  createSet,
8
12
  createTuple,
9
- formatValue,
10
13
  isEmptySet,
11
14
  isEnumerable,
12
15
  isSetValue,
@@ -20,25 +23,13 @@ const RANDOM_SUBSET_SIGNATURE =
20
23
  // TLCGlobals.setBound: TLC 1.7.4's ValueVec holds at most this many elements of a set.
21
24
  const SET_BOUND_174 = 1000000;
22
25
 
23
- const createArgumentError = (position: string, name: string, expected: string, value: string) =>
24
- new TlaModuleError(
25
- `The ${position} argument of ${name} should be a ${expected}, but instead it is:\n${value}`,
26
- );
27
-
28
26
  const getCount = (value: Value, position: string, name: string) => {
29
27
  if (typeof value !== "number" || value < 0) {
30
- throw createArgumentError(position, name, "nonnegative integer", formatValue(value));
28
+ throw createModuleArgumentError(position, name, "nonnegative integer", value);
31
29
  }
32
30
  return value;
33
31
  };
34
32
 
35
- const getFiniteElements = (value: Value, position: string, name: string, expected: string) => {
36
- if (!isSetValue(value) || !isEnumerable(value)) {
37
- throw createArgumentError(position, name, expected, formatValue(value));
38
- }
39
- return toFiniteSet(value).elements;
40
- };
41
-
42
33
  // SubsetValue.CoinTossingSubsetEnumerator: each pick keeps each element with the probability.
43
34
  const tossSubsets = (elements: Value[], picks: number, probability: number, random: JavaRandom) =>
44
35
  createSet(
@@ -51,21 +42,25 @@ const getRandomSetOfSubsets = (args: BuiltinArgument[], runtime: CheckerRuntime)
51
42
  const name = "RandomSetOfSubsets";
52
43
  const picks = getCount(getValue(args, 0, name), "first", name);
53
44
  const size = getCount(getValue(args, 1, name), "second", name);
54
- const elements = getFiniteElements(getValue(args, 2, name), "third", name, "finite set");
45
+ const set = getValue(args, 2, name);
46
+ if (!isSetValue(set) || !isEnumerable(set)) {
47
+ throw createModuleArgumentError("third", name, "finite set", set);
48
+ }
49
+ const elements = toFiniteSet(set).elements;
55
50
  if (elements.length < 31 && picks > 2 ** elements.length) {
56
- throw createArgumentError(
51
+ throw createModuleArgumentError(
57
52
  "first",
58
53
  name,
59
54
  `nonnegative integer that is smaller than the subset's size of 2^${elements.length}`,
60
- String(picks),
55
+ picks,
61
56
  );
62
57
  }
63
58
  if (elements.length < size) {
64
- throw createArgumentError(
59
+ throw createModuleArgumentError(
65
60
  "second",
66
61
  name,
67
62
  "nonnegative integer in range 0..Cardinality(S)",
68
- String(size),
63
+ size,
69
64
  );
70
65
  }
71
66
  return tossSubsets(
@@ -80,14 +75,14 @@ export const createRandomizationOperators = (runtime: CheckerRuntime): Builtin[]
80
75
  defineStateOperator("RandomSubset", 2, (args) => {
81
76
  const count = getValue(args, 0, "RandomSubset");
82
77
  if (typeof count !== "number") {
83
- throw createArgumentError("first", "RandomSubset", "nonnegative integer", formatValue(count));
78
+ throw createModuleArgumentError("first", "RandomSubset", "nonnegative integer", count);
84
79
  }
85
80
  if (count < 0) {
86
81
  throw createJavaOverrideError(RANDOM_SUBSET_SIGNATURE, String(count));
87
82
  }
88
83
  const set = getValue(args, 1, "RandomSubset");
89
84
  if (!isSetValue(set) || (!isEmptySet(set) && !isEnumerable(set))) {
90
- throw createArgumentError("second", "RandomSubset", "a finite set", formatValue(set));
85
+ throw createModuleArgumentError("second", "RandomSubset", "a finite set", set);
91
86
  }
92
87
  const factors = getEnumeratedFactors(set, runtime.version);
93
88
  if (factors) {
package/src/resolve.ts CHANGED
@@ -36,7 +36,7 @@ export type SymbolKind =
36
36
 
37
37
  // range is where SANY reports the symbol, and two symbols at one range are one node to SANY. params
38
38
  // holds the arity of each parameter of a defined operator.
39
- export interface Binding {
39
+ interface Binding {
40
40
  kind: SymbolKind;
41
41
  arity: number;
42
42
  params?: number[];
@@ -74,14 +74,7 @@ interface ModuleBinding extends Binding {
74
74
  isPending?: boolean;
75
75
  }
76
76
 
77
- // errors and warnings collect what SANY reports while it goes on analyzing the unit, and bindings
78
- // holds the names the module binds. A label may appear where hasLabelScope holds, in a definition, a
79
- // named theorem, or a numbered step, except where isLabelForbidden holds, in the scope of a NEW in a
80
- // nested ASSUME, or where isInExcept holds, in the new value of an EXCEPT. labelParams holds the
81
- // names bound since the innermost definition, label, or step, which a label must take as parameters,
82
- // and labels the labels there. isGenerated holds in a definition tla-ts generates for a LET INSTANCE,
83
- // and in a subexpression that a name selects, which SANY analyzes where it is defined.
84
- // getInstance gives what an INSTANCE in a LET or a proof instantiates.
77
+ // What SANY reports while it goes on analyzing a unit of a module, and the scope it analyzes it in.
85
78
  interface Unit {
86
79
  imported: Symbols;
87
80
  getInstance: (instance: Instance) => InstancedModule;
@@ -94,11 +87,15 @@ interface Unit {
94
87
  bindings: Map<string, ModuleBinding>;
95
88
  errors: SanyError[];
96
89
  warnings: SanyError[];
90
+ // In a definition, a named theorem, or a numbered step.
97
91
  hasLabelScope: boolean;
92
+ // In the scope of a NEW in a nested ASSUME.
98
93
  isLabelForbidden: boolean;
99
94
  isInExcept: boolean;
95
+ // The names bound since the innermost definition, label, or step, which a label must take.
100
96
  labelParams: string[];
101
97
  labels: Set<string>;
98
+ // In a definition generated for a LET INSTANCE, or a subexpression analyzed where it is defined.
102
99
  isGenerated: boolean;
103
100
  }
104
101
 
@@ -168,10 +165,8 @@ const getModuleBinding = (name: string, unit: Unit, range: SourceRange | undefin
168
165
  const isSameRange = (left: SourceRange | undefined, right: SourceRange | undefined) =>
169
166
  left !== undefined && right !== undefined && formatRange(left) === formatRange(right);
170
167
 
171
- // SymbolTable.addSymbol binds a name nothing binds yet. It rejects a built-in operator, a parameter
172
- // or bound name already in use, and a symbol of another kind or arity than the one bound, and warns
173
- // of any other duplicate. tla-ts binds a symbol SANY never sees, such as one it generates. Tells
174
- // whether to bind the added symbol.
168
+ // SymbolTable.addSymbol: rejects redefining a built-in, a bound name, or a symbol of another kind
169
+ // or arity, and warns of any other duplicate. A symbol SANY never sees, such as a generated one, binds.
175
170
  const isBindable = (name: string, current: Binding | undefined, added: Binding, unit: Unit) => {
176
171
  if (current === undefined) return true;
177
172
  if (isSameRange(current.range, added.range)) return false;
@@ -1447,7 +1442,7 @@ const resolveTheorem = (theorem: Theorem, unit: Unit) => {
1447
1442
 
1448
1443
  // The declarations of the module an INSTANCE instantiates, the names the INSTANCE adds, and the
1449
1444
  // module that instantiates it.
1450
- export interface InstancedModule {
1445
+ interface InstancedModule {
1451
1446
  declarations: Declaration[];
1452
1447
  symbols: Symbols;
1453
1448
  instancer: string;
@@ -1461,18 +1456,16 @@ export interface ModuleReport {
1461
1456
  warnings: SanyError[];
1462
1457
  }
1463
1458
 
1464
- // bound holds the names in scope where the module starts: the built-in operators, the names of the
1465
- // module that encloses it, and those of the modules it extends. instanced holds the names each
1466
- // INSTANCE adds, getInstance what an INSTANCE in a LET or a proof instantiates, facts the theorems
1467
- // and assumptions the modules it extends or instantiates export, and warnings the warnings SANY
1468
- // reports for the spec.
1469
1459
  export interface ModuleUnit {
1470
1460
  imported: Symbols;
1471
1461
  getInstance: (instance: Instance) => InstancedModule;
1462
+ // The built-in operators and the names of the enclosing and extended modules.
1472
1463
  bound: Symbols;
1473
1464
  definitions: Map<string, Definition>;
1474
1465
  getKey: (definition: Definition) => string;
1466
+ // The names each INSTANCE adds.
1475
1467
  instanced: Map<Instance, Symbols>;
1468
+ // The theorems and assumptions the extended and instantiated modules export.
1476
1469
  facts: Set<string>;
1477
1470
  reports: ModuleReport[];
1478
1471
  warnings: SanyError[];
@@ -1631,7 +1624,7 @@ export const collectSemanticErrors = (
1631
1624
  warnings: SanyError[],
1632
1625
  ) => {
1633
1626
  const errors: SanyError[] = [];
1634
- const add = (list: SanyError[], item: SanyError) => {
1627
+ const addUnique = (list: SanyError[], item: SanyError) => {
1635
1628
  if (
1636
1629
  list.every(
1637
1630
  (existing) => existing.location !== item.location || existing.message !== item.message,
@@ -1659,8 +1652,8 @@ export const collectSemanticErrors = (
1659
1652
  }
1660
1653
  reported.push(...(error.sany?.errors ?? []));
1661
1654
  }
1662
- reported.forEach((item) => add(errors, item));
1663
- warned.forEach((item) => add(warnings, item));
1655
+ reported.forEach((item) => addUnique(errors, item));
1656
+ warned.forEach((item) => addUnique(warnings, item));
1664
1657
  });
1665
1658
  return errors;
1666
1659
  };