tla-ts 0.0.9-dev.8298a52 → 0.0.10-dev.28c823e4b

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 (390) hide show
  1. package/README.md +7 -0
  2. package/dist/compile.cjs +3 -3
  3. package/dist/compile.js +3 -3
  4. package/dist/deciders.cjs +28 -28
  5. package/dist/deciders.js +52 -52
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +105 -10
  8. package/dist/index.d.ts +105 -10
  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 +116 -36
  15. package/dist/prove.js +116 -36
  16. package/dist/run.cjs +143 -31
  17. package/dist/run.js +143 -31
  18. package/dist/tlapm.cjs +1 -1
  19. package/dist/tlapm.js +2 -2
  20. package/dist/transfer.cjs +129 -104
  21. package/dist/transfer.js +129 -104
  22. package/dist/worker.cjs +7 -7
  23. package/dist/worker.js +7 -7
  24. package/package.json +1 -1
  25. package/src/ast.ts +4 -23
  26. package/src/bags.ts +99 -102
  27. package/src/builtins.ts +40 -78
  28. package/src/bundled-modules.ts +1 -8
  29. package/src/check.ts +564 -366
  30. package/src/cli/options.ts +10 -5
  31. package/src/cli/run.ts +0 -2
  32. package/src/cli/runtime-invariants.ts +136 -0
  33. package/src/cli/shared.ts +18 -11
  34. package/src/cli/tlapm.ts +0 -12
  35. package/src/cli/tlc-arguments.ts +640 -0
  36. package/src/cli/tlc-usage.ts +361 -0
  37. package/src/cli/tlc.ts +525 -216
  38. package/src/cli/typescript.ts +0 -3
  39. package/src/cli/xml-exporter.ts +4 -16
  40. package/src/cli.ts +0 -1
  41. package/src/codegen.ts +191 -64
  42. package/src/config.ts +140 -109
  43. package/src/coverage.ts +837 -0
  44. package/src/dependencies.ts +6 -40
  45. package/src/dfid.ts +618 -0
  46. package/src/environment.ts +237 -119
  47. package/src/errors.ts +56 -56
  48. package/src/evaluate.ts +543 -341
  49. package/src/exit-codes.ts +37 -3
  50. package/src/fingerprints.ts +10 -10
  51. package/src/index.ts +3 -0
  52. package/src/instances.ts +38 -31
  53. package/src/java-overrides.ts +4 -19
  54. package/src/json-reader.ts +455 -0
  55. package/src/json.ts +255 -139
  56. package/src/levels.ts +8 -17
  57. package/src/lexer.ts +80 -100
  58. package/src/liveness-checker.ts +77 -117
  59. package/src/liveness.ts +106 -62
  60. package/src/obligations/action.ts +4 -28
  61. package/src/obligations/anonymize.ts +84 -80
  62. package/src/obligations/equality.ts +1 -1
  63. package/src/obligations/expression.ts +2 -19
  64. package/src/obligations/format.ts +1 -9
  65. package/src/obligations/generate.ts +1 -11
  66. package/src/obligations/index.ts +0 -11
  67. package/src/obligations/levels.ts +4 -8
  68. package/src/obligations/module.ts +1 -15
  69. package/src/obligations/normalize.ts +5 -24
  70. package/src/obligations/operators.ts +1 -2
  71. package/src/obligations/pragma.ts +1 -10
  72. package/src/obligations/printer.ts +47 -46
  73. package/src/obligations/proof.ts +1 -5
  74. package/src/obligations/regroup.ts +1 -4
  75. package/src/obligations/simplify.ts +3 -14
  76. package/src/obligations/source.ts +1 -21
  77. package/src/obligations/subexpression.ts +5 -11
  78. package/src/obligations/substitution.ts +1 -3
  79. package/src/obligations/temporal.ts +8 -14
  80. package/src/obligations/tuples.ts +3 -9
  81. package/src/parallel-worker.ts +24 -33
  82. package/src/parallel.ts +48 -40
  83. package/src/parser.ts +565 -282
  84. package/src/pcal/ast.ts +53 -86
  85. package/src/pcal/parse.ts +144 -219
  86. package/src/pcal/tokenize.ts +91 -131
  87. package/src/pcal/translate.ts +83 -130
  88. package/src/pcal/validate.ts +48 -68
  89. package/src/pretty-print.ts +7 -8
  90. package/src/prover/decide-pool.ts +5 -10
  91. package/src/prover/deciders.ts +0 -4
  92. package/src/prover/first-order.ts +0 -11
  93. package/src/prover/isabelle/decide.ts +0 -6
  94. package/src/prover/isabelle/encode.ts +11 -23
  95. package/src/prover/isabelle/isar/inner-syntax.ts +108 -114
  96. package/src/prover/isabelle/isar/method.ts +25 -38
  97. package/src/prover/isabelle/isar/proof.ts +1 -10
  98. package/src/prover/isabelle/isar/statement.ts +1 -6
  99. package/src/prover/isabelle/isar/theory.ts +15 -26
  100. package/src/prover/isabelle/isar/type-check.ts +11 -25
  101. package/src/prover/isabelle/provers/blast/blast.ts +10 -41
  102. package/src/prover/isabelle/provers/blast/branch.ts +1 -32
  103. package/src/prover/isabelle/provers/blast/prove.ts +1 -35
  104. package/src/prover/isabelle/provers/blast/rules.ts +6 -44
  105. package/src/prover/isabelle/provers/blast/state.ts +2 -28
  106. package/src/prover/isabelle/provers/blast/term.ts +9 -36
  107. package/src/prover/isabelle/provers/clasimp.ts +1 -13
  108. package/src/prover/isabelle/provers/classical.ts +14 -42
  109. package/src/prover/isabelle/provers/hypsubst.ts +11 -25
  110. package/src/prover/isabelle/pure/bicompose.ts +16 -13
  111. package/src/prover/isabelle/pure/consts.ts +1 -7
  112. package/src/prover/isabelle/pure/conv.ts +1 -9
  113. package/src/prover/isabelle/pure/drule.ts +24 -40
  114. package/src/prover/isabelle/pure/envir.ts +3 -52
  115. package/src/prover/isabelle/pure/goal.ts +1 -7
  116. package/src/prover/isabelle/pure/interrupt.ts +0 -5
  117. package/src/prover/isabelle/pure/list.ts +0 -3
  118. package/src/prover/isabelle/pure/logic.ts +1 -14
  119. package/src/prover/isabelle/pure/name.ts +2 -9
  120. package/src/prover/isabelle/pure/net.ts +3 -59
  121. package/src/prover/isabelle/pure/object-logic.ts +3 -10
  122. package/src/prover/isabelle/pure/pattern.ts +2 -19
  123. package/src/prover/isabelle/pure/raw-simplifier.ts +13 -49
  124. package/src/prover/isabelle/pure/rewriter.ts +26 -58
  125. package/src/prover/isabelle/pure/search.ts +3 -10
  126. package/src/prover/isabelle/pure/seq.ts +1 -10
  127. package/src/prover/isabelle/pure/simplifier.ts +4 -12
  128. package/src/prover/isabelle/pure/table.ts +1 -31
  129. package/src/prover/isabelle/pure/tactic.ts +12 -22
  130. package/src/prover/isabelle/pure/tactical.ts +6 -12
  131. package/src/prover/isabelle/pure/term-ord.ts +2 -6
  132. package/src/prover/isabelle/pure/term.ts +2 -43
  133. package/src/prover/isabelle/pure/thm.ts +13 -36
  134. package/src/prover/isabelle/pure/type.ts +2 -15
  135. package/src/prover/isabelle/pure/unify.ts +20 -30
  136. package/src/prover/isabelle/pure/variable.ts +3 -7
  137. package/src/prover/isabelle/tla/classical-setup.ts +9 -19
  138. package/src/prover/isabelle/tla/context.ts +8 -16
  139. package/src/prover/isabelle/tla/logic.ts +4 -11
  140. package/src/prover/isabelle/tla/simpdata.ts +46 -34
  141. package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
  142. package/src/prover/ocaml.ts +0 -6
  143. package/src/prover/prep/action.ts +4 -36
  144. package/src/prover/prep/enabled-axioms.ts +12 -19
  145. package/src/prover/prep/fingerprint.ts +0 -16
  146. package/src/prover/prep/level-comparison.ts +8 -12
  147. package/src/prover/prep/md5.ts +0 -2
  148. package/src/prover/prep/methods.ts +9 -36
  149. package/src/prover/prep/normalize.ts +4 -28
  150. package/src/prover/prove-worker.ts +0 -2
  151. package/src/prover/prove.ts +0 -36
  152. package/src/prover/ptl/decide.ts +7 -12
  153. package/src/prover/ptl/encode.ts +14 -36
  154. package/src/prover/ptl/sat.ts +24 -32
  155. package/src/prover/ptl/tableau.ts +12 -26
  156. package/src/prover/smt/axioms.ts +0 -7
  157. package/src/prover/smt/context.ts +19 -26
  158. package/src/prover/smt/data.ts +51 -54
  159. package/src/prover/smt/encode.ts +14 -35
  160. package/src/prover/smt/extensionality.ts +0 -10
  161. package/src/prover/smt/flatten.ts +3 -22
  162. package/src/prover/smt/format.ts +5 -10
  163. package/src/prover/smt/instances.ts +0 -10
  164. package/src/prover/smt/rewrite.ts +66 -101
  165. package/src/prover/smt/solver/act-cache.ts +0 -15
  166. package/src/prover/smt/solver/arith-rewriter.ts +3 -48
  167. package/src/prover/smt/solver/array.ts +1 -3
  168. package/src/prover/smt/solver/asserted-formulas.ts +1 -43
  169. package/src/prover/smt/solver/ast-lt.ts +1 -11
  170. package/src/prover/smt/solver/ast-util.ts +1 -6
  171. package/src/prover/smt/solver/ast.ts +1 -143
  172. package/src/prover/smt/solver/auf-solver.ts +6 -39
  173. package/src/prover/smt/solver/case-split-queue.ts +1 -9
  174. package/src/prover/smt/solver/cg-table.ts +1 -18
  175. package/src/prover/smt/solver/clause.ts +1 -27
  176. package/src/prover/smt/solver/conflict-resolution.ts +0 -9
  177. package/src/prover/smt/solver/context.ts +4 -61
  178. package/src/prover/smt/solver/ctx-simplify.ts +14 -41
  179. package/src/prover/smt/solver/der.ts +2 -21
  180. package/src/prover/smt/solver/dyn-ack.ts +1 -11
  181. package/src/prover/smt/solver/e-matching.ts +3 -34
  182. package/src/prover/smt/solver/enode.ts +1 -21
  183. package/src/prover/smt/solver/expr-ref.ts +1 -5
  184. package/src/prover/smt/solver/expr-safe-replace.ts +0 -5
  185. package/src/prover/smt/solver/fingerprints.ts +1 -12
  186. package/src/prover/smt/solver/flat-literals.ts +1 -9
  187. package/src/prover/smt/solver/goal.ts +2 -14
  188. package/src/prover/smt/solver/hash.ts +0 -8
  189. package/src/prover/smt/solver/hashtable.ts +1 -12
  190. package/src/prover/smt/solver/internalizer.ts +6 -98
  191. package/src/prover/smt/solver/lbool.ts +1 -2
  192. package/src/prover/smt/solver/literal.ts +0 -3
  193. package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
  194. package/src/prover/smt/solver/lp/constraints.ts +2 -8
  195. package/src/prover/smt/solver/lp/containers.ts +12 -30
  196. package/src/prover/smt/solver/lp/core-solver.ts +10 -31
  197. package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
  198. package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
  199. package/src/prover/smt/solver/lp/dependency.ts +1 -4
  200. package/src/prover/smt/solver/lp/dioph-eq.ts +12 -98
  201. package/src/prover/smt/solver/lp/explanation.ts +1 -6
  202. package/src/prover/smt/solver/lp/gomory.ts +9 -22
  203. package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
  204. package/src/prover/smt/solver/lp/hnf.ts +11 -26
  205. package/src/prover/smt/solver/lp/int-cube.ts +15 -36
  206. package/src/prover/smt/solver/lp/int-solver.ts +4 -34
  207. package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
  208. package/src/prover/smt/solver/lp/lar-term.ts +1 -5
  209. package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
  210. package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
  211. package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
  212. package/src/prover/smt/solver/lp/nex.ts +1 -6
  213. package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
  214. package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
  215. package/src/prover/smt/solver/lp/nla-core.ts +35 -130
  216. package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
  217. package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
  218. package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
  219. package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
  220. package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
  221. package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
  222. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
  223. package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
  224. package/src/prover/smt/solver/lp/nla-order.ts +2 -13
  225. package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
  226. package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
  227. package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
  228. package/src/prover/smt/solver/lp/nla-types.ts +1 -11
  229. package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
  230. package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
  231. package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
  232. package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
  233. package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
  234. package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
  235. package/src/prover/smt/solver/lp/pdd.ts +7 -70
  236. package/src/prover/smt/solver/lp/random-updater.ts +1 -8
  237. package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
  238. package/src/prover/smt/solver/lp/union-find.ts +1 -6
  239. package/src/prover/smt/solver/mam-compiler.ts +14 -56
  240. package/src/prover/smt/solver/mam-interpreter.ts +1 -21
  241. package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
  242. package/src/prover/smt/solver/model-checker.ts +2 -36
  243. package/src/prover/smt/solver/model-evaluator.ts +3 -29
  244. package/src/prover/smt/solver/model-finder.ts +3 -15
  245. package/src/prover/smt/solver/model-generator.ts +1 -12
  246. package/src/prover/smt/solver/model-macro-solver.ts +12 -69
  247. package/src/prover/smt/solver/nlsat/algebraic.ts +55 -151
  248. package/src/prover/smt/solver/nlsat/atoms.ts +5 -19
  249. package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
  250. package/src/prover/smt/solver/nlsat/explain.ts +3 -47
  251. package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
  252. package/src/prover/smt/solver/nlsat/levelwise.ts +48 -129
  253. package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
  254. package/src/prover/smt/solver/nlsat/polynomial.ts +17 -156
  255. package/src/prover/smt/solver/nlsat/solver.ts +7 -67
  256. package/src/prover/smt/solver/nlsat/types.ts +1 -8
  257. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -44
  258. package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
  259. package/src/prover/smt/solver/nnf.ts +3 -38
  260. package/src/prover/smt/solver/pattern-inference.ts +2 -15
  261. package/src/prover/smt/solver/poly-rewriter.ts +3 -23
  262. package/src/prover/smt/solver/propagate-values.ts +1 -10
  263. package/src/prover/smt/solver/proto-model.ts +3 -48
  264. package/src/prover/smt/solver/pull-quant.ts +1 -12
  265. package/src/prover/smt/solver/qe-lite-der.ts +1 -29
  266. package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
  267. package/src/prover/smt/solver/qe-lite.ts +3 -33
  268. package/src/prover/smt/solver/qi-queue.ts +1 -16
  269. package/src/prover/smt/solver/quant-tactics.ts +5 -22
  270. package/src/prover/smt/solver/quantifier-analyzer.ts +17 -37
  271. package/src/prover/smt/solver/quantifier-manager.ts +1 -8
  272. package/src/prover/smt/solver/random-gen.ts +1 -2
  273. package/src/prover/smt/solver/rational.ts +1 -8
  274. package/src/prover/smt/solver/ref-vector.ts +1 -6
  275. package/src/prover/smt/solver/relevancy.ts +2 -15
  276. package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
  277. package/src/prover/smt/solver/rewriter.ts +3 -85
  278. package/src/prover/smt/solver/rlimit.ts +2 -20
  279. package/src/prover/smt/solver/smtlib-parser.ts +2 -37
  280. package/src/prover/smt/solver/solver.ts +1 -16
  281. package/src/prover/smt/solver/sort.ts +1 -5
  282. package/src/prover/smt/solver/sticky-generations.ts +0 -5
  283. package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
  284. package/src/prover/smt/solver/theory-lra-bounds.ts +0 -5
  285. package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
  286. package/src/prover/smt/solver/theory-lra-internalize.ts +1 -27
  287. package/src/prover/smt/solver/theory-lra-model.ts +4 -19
  288. package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
  289. package/src/prover/smt/solver/theory-lra-state.ts +3 -8
  290. package/src/prover/smt/solver/theory-lra.ts +1 -8
  291. package/src/prover/smt/solver/var-subst.ts +2 -26
  292. package/src/prover/smt/table.ts +0 -8
  293. package/src/prover/tlapm/cache.ts +20 -25
  294. package/src/prover/tlapm/ocaml-marshal.ts +19 -21
  295. package/src/prover/tlapm/tlapm.ts +12 -17
  296. package/src/prover/verdict.ts +0 -2
  297. package/src/prover/zenon/check/check.ts +0 -9
  298. package/src/prover/zenon/check/definitions.ts +5 -15
  299. package/src/prover/zenon/check/equality.ts +0 -8
  300. package/src/prover/zenon/check/functions.ts +0 -4
  301. package/src/prover/zenon/check/keys.ts +0 -7
  302. package/src/prover/zenon/check/propositional.ts +0 -3
  303. package/src/prover/zenon/check/records.ts +0 -5
  304. package/src/prover/zenon/check/relations.ts +0 -13
  305. package/src/prover/zenon/check/rewrites.ts +0 -6
  306. package/src/prover/zenon/check/sets.ts +0 -3
  307. package/src/prover/zenon/check/terms.ts +0 -17
  308. package/src/prover/zenon/check/tla.ts +0 -6
  309. package/src/prover/zenon/decide.ts +0 -12
  310. package/src/prover/zenon/encode.ts +1 -8
  311. package/src/prover/zenon/eqrel.ts +0 -13
  312. package/src/prover/zenon/equality-rules.ts +0 -4
  313. package/src/prover/zenon/expr.ts +1 -26
  314. package/src/prover/zenon/index-table.ts +17 -38
  315. package/src/prover/zenon/isar-case.ts +9 -19
  316. package/src/prover/zenon/isar.ts +1 -29
  317. package/src/prover/zenon/limits.ts +0 -4
  318. package/src/prover/zenon/llproof.ts +0 -9
  319. package/src/prover/zenon/mltoll.ts +54 -76
  320. package/src/prover/zenon/node.ts +1 -11
  321. package/src/prover/zenon/ocaml.ts +1 -17
  322. package/src/prover/zenon/parse.ts +2 -7
  323. package/src/prover/zenon/phrase.ts +1 -11
  324. package/src/prover/zenon/proof.ts +0 -9
  325. package/src/prover/zenon/propositional-rules.ts +0 -5
  326. package/src/prover/zenon/rules.ts +2 -6
  327. package/src/prover/zenon/search.ts +1 -17
  328. package/src/prover/zenon/tla/functions.ts +57 -29
  329. package/src/prover/zenon/tla/llproof.ts +63 -70
  330. package/src/prover/zenon/tla/records.ts +56 -27
  331. package/src/prover/zenon/tla/rewrites.ts +12 -19
  332. package/src/prover/zenon/tla/sets.ts +68 -39
  333. package/src/prover/zenon/tla/terms.ts +0 -6
  334. package/src/prover/zenon/tla/tla.ts +59 -58
  335. package/src/randomization.ts +81 -35
  336. package/src/resolve.ts +12 -112
  337. package/src/runtime.ts +22 -22
  338. package/src/sany/builtins.ts +2 -5
  339. package/src/sany/generator.ts +149 -252
  340. package/src/sany/levels.ts +6 -34
  341. package/src/sany/lexer.ts +41 -61
  342. package/src/sany/linter.ts +1 -9
  343. package/src/sany/modules.ts +1 -5
  344. package/src/sany/nodes.ts +0 -31
  345. package/src/sany/parse-error.ts +39 -117
  346. package/src/sany/report.ts +29 -63
  347. package/src/sany/selectors.ts +15 -39
  348. package/src/sany/source.ts +1 -17
  349. package/src/sany/xml.ts +13 -63
  350. package/src/search.ts +495 -155
  351. package/src/simulate.ts +685 -0
  352. package/src/spec-description.ts +176 -69
  353. package/src/standard-definitions.ts +0 -4
  354. package/src/standard-modules.ts +254 -69
  355. package/src/state-graph.ts +50 -24
  356. package/src/subexpressions.ts +69 -52
  357. package/src/substitution-levels.ts +2 -3
  358. package/src/successors.ts +260 -91
  359. package/src/symmetry.ts +33 -25
  360. package/src/tableau.ts +27 -24
  361. package/src/tlc/fingerprint.ts +183 -67
  362. package/src/tlc/jar-data.ts +112 -6
  363. package/src/tlc/messages.ts +110 -44
  364. package/src/tlc/order.ts +37 -60
  365. package/src/tlc/random.ts +33 -45
  366. package/src/tlc/replay.ts +549 -217
  367. package/src/tlc/summary.ts +36 -47
  368. package/src/tlc/tlc-operators.ts +76 -41
  369. package/src/tlc/tlcext-operators.ts +139 -122
  370. package/src/tlc/trace-spec.ts +269 -0
  371. package/src/tlc/value-stream.ts +139 -0
  372. package/src/tlc/version.ts +1 -4
  373. package/src/transfer.ts +22 -25
  374. package/src/typescript/actions.ts +8 -21
  375. package/src/typescript/collections.ts +0 -15
  376. package/src/typescript/compile.ts +0 -5
  377. package/src/typescript/context.ts +0 -12
  378. package/src/typescript/emit.ts +0 -1
  379. package/src/typescript/expressions.ts +0 -12
  380. package/src/typescript/formula.ts +4 -12
  381. package/src/typescript/functions.ts +6 -17
  382. package/src/typescript/model.ts +10 -11
  383. package/src/typescript/names.ts +0 -2
  384. package/src/typescript/program.ts +0 -3
  385. package/src/typescript/properties.ts +6 -8
  386. package/src/typescript/scope.ts +0 -5
  387. package/src/typescript/steps.ts +0 -10
  388. package/src/typescript/types.ts +1 -8
  389. package/src/values.ts +749 -330
  390. package/src/worker.ts +7 -8
@@ -41,8 +41,6 @@ interface Selection {
41
41
  location: SourceLocation;
42
42
  }
43
43
 
44
- // A name that selects a subexpression, with the range of each part and of the arguments of each
45
- // part, where SANY reports an error in selecting that part.
46
44
  interface SelectingName {
47
45
  location: SourceLocation;
48
46
  selectorRanges?: SourceRange[];
@@ -151,9 +149,6 @@ const applyDefinition = (definition: Definition, selection: Selection) => {
151
149
  return createApplication({ ...selection, params: [...selection.params, ...params] }, reference);
152
150
  };
153
151
 
154
- // Generator.selectorToNode reports the first part of a name that selects nothing, after it analyzes
155
- // the arguments of the parts before, and goes on after the name. An operator or a label must be given
156
- // all its arguments, except in a name that an operator argument may select whole.
157
152
  const selectSubexpression = (
158
153
  selectors: Selector[],
159
154
  lookup: Lookup,
@@ -162,25 +157,27 @@ const selectSubexpression = (
162
157
  ): Expression => {
163
158
  const location = reference.location;
164
159
  const selection: Selection = { params: [], args: [], lets: [], location };
165
- const state = { index: 0, current: undefined as Expression | undefined, isFailed: false };
160
+ let selectorIndex = 0;
161
+ let current = undefined as Expression | undefined;
162
+ let isFailed = false;
166
163
 
167
164
  const report = (range: SourceRange | undefined, message: string) => {
168
165
  if (!range) throw createError(message, location);
169
166
  selectionErrors.set(reference, {
170
167
  args: selectors
171
- .slice(0, state.index)
168
+ .slice(0, selectorIndex)
172
169
  .flatMap((selector) => ("args" in selector ? selector.args : [])),
173
170
  error: { location: formatRange(range), message },
174
171
  });
175
- state.isFailed = true;
172
+ isFailed = true;
176
173
  return undefined;
177
174
  };
178
175
 
179
176
  const findDefinition = (local: Definition[] | undefined) => {
180
177
  const names: string[] = [];
181
178
  const args: Expression[] = [];
182
- while (state.index < selectors.length) {
183
- const selector = selectors[state.index];
179
+ while (selectorIndex < selectors.length) {
180
+ const selector = selectors[selectorIndex];
184
181
  if (selector.kind !== "Name") throw createError("Expected an operator name", location);
185
182
  names.push(selector.name);
186
183
  args.push(...selector.args);
@@ -190,7 +187,7 @@ const selectSubexpression = (
190
187
  : lookup(name);
191
188
  if (definition)
192
189
  return { definition, name, args, earlier: args.length - selector.args.length };
193
- state.index++;
190
+ selectorIndex++;
194
191
  }
195
192
  throw createError(`Unknown operator ${names.join("!")}`, location);
196
193
  };
@@ -199,10 +196,10 @@ const selectSubexpression = (
199
196
  const found = findDefinition(local);
200
197
  const definition = found.definition;
201
198
  const arity = getArity(definition);
202
- const isLast = state.index === selectors.length - 1;
199
+ const isLast = selectorIndex === selectors.length - 1;
203
200
  if (found.args.length !== arity && (!isOperator || found.args.length !== 0)) {
204
201
  return report(
205
- reference.argumentRanges?.[state.index] ?? location.range,
202
+ reference.argumentRanges?.[selectorIndex] ?? location.range,
206
203
  `The operator ${found.name} requires ${arity - found.earlier} arguments.`,
207
204
  );
208
205
  }
@@ -212,17 +209,17 @@ const selectSubexpression = (
212
209
  }
213
210
  selection.params.push(...definition.params);
214
211
  selection.args.push(...found.args);
215
- state.current = definition.body;
216
- state.index++;
212
+ current = definition.body;
213
+ selectorIndex++;
217
214
  return undefined;
218
215
  };
219
216
 
220
217
  const followLabels = () => {
221
- while (state.index < selectors.length && !state.isFailed) {
222
- const selector = selectors[state.index];
218
+ while (selectorIndex < selectors.length && !isFailed) {
219
+ const selector = selectors[selectorIndex];
223
220
  if (selector.kind !== "Name") return;
224
- const range = reference.selectorRanges?.[state.index];
225
- const found = state.current && findLabel(state.current, selector.name, []);
221
+ const range = reference.selectorRanges?.[selectorIndex];
222
+ const found = current && findLabel(current, selector.name, []);
226
223
  if (!found) return report(range, `Cannot find label \`${selector.name}'.`);
227
224
  const params = found.label.params;
228
225
  if (!isOperator && selector.args.length !== params.length) {
@@ -231,17 +228,16 @@ const selectSubexpression = (
231
228
  selection.lets.push(...found.lets);
232
229
  selection.params.push(...params.map((name) => ({ name, arity: 0 })));
233
230
  selection.args.push(...selector.args);
234
- state.current = found.label.body;
235
- state.index++;
231
+ current = found.label.body;
232
+ selectorIndex++;
236
233
  }
237
234
  };
238
235
 
239
236
  const selectOperand = (selector: Selector) => {
240
- const current = state.current;
241
237
  if (!current) throw createError("Subexpression selection failed", location);
242
238
  if (selector.kind === "Colon") return;
243
239
  if (current.kind === "Label") {
244
- state.current = current.body;
240
+ current = current.body;
245
241
  selectOperand(selector);
246
242
  return;
247
243
  }
@@ -250,14 +246,14 @@ const selectSubexpression = (
250
246
  throw createError("A LET/IN expression has only one operand", location);
251
247
  }
252
248
  selection.lets.push(current.definitions);
253
- state.current = current.body;
249
+ current = current.body;
254
250
  return;
255
251
  }
256
252
  const binder = getBinder(current);
257
253
  if (binder && (selector.kind === "Bound" || selector.kind === "At")) {
258
254
  selection.params.push(...binder.names.map((name) => ({ name, arity: 0 })));
259
255
  if (selector.kind === "Bound") selection.args.push(...selector.args);
260
- state.current = binder.body;
256
+ current = binder.body;
261
257
  return;
262
258
  }
263
259
  if (current.kind === "Case" && selector.kind === "Operand") {
@@ -266,15 +262,15 @@ const selectSubexpression = (
266
262
  ...(current.other ? [{ condition: undefined, body: current.other }] : []),
267
263
  ];
268
264
  const arm = arms[getOperandIndex(selector.operand, arms.length)];
269
- const next = selectors[state.index + 1];
265
+ const next = selectors[selectorIndex + 1];
270
266
  if (!arm || next?.kind !== "Operand") {
271
267
  throw createError("A subexpression of CASE must have the form !i!j", location);
272
268
  }
273
- state.index++;
269
+ selectorIndex++;
274
270
  const part = getOperandIndex(next.operand, 2);
275
271
  const chosen = part === 0 ? arm.condition : part === 1 ? arm.body : undefined;
276
272
  if (!chosen) throw createError("Nonexistent CASE operand", location);
277
- state.current = chosen;
273
+ current = chosen;
278
274
  return;
279
275
  }
280
276
  if (selector.kind !== "Operand")
@@ -282,23 +278,23 @@ const selectSubexpression = (
282
278
  const operands = binder ? binder.sets : getOperands(current);
283
279
  const operand = operands?.[getOperandIndex(selector.operand, operands.length)];
284
280
  if (!operand) throw createError("Nonexistent operand specified by the selector", location);
285
- state.current = operand;
281
+ current = operand;
286
282
  };
287
283
 
288
284
  const first = enterDefinition(undefined);
289
- if (state.isFailed) return reference;
285
+ if (isFailed) return reference;
290
286
  if (first) return applyDefinition(first.definition, { ...selection, args: first.args });
291
287
  followLabels();
292
- while (state.index < selectors.length && !state.isFailed) {
293
- const selector = selectors[state.index];
288
+ while (selectorIndex < selectors.length && !isFailed) {
289
+ const selector = selectors[selectorIndex];
294
290
  if (selector.kind === "Name") {
295
- while (state.current?.kind === "Label") state.current = state.current.body;
296
- if (state.current?.kind !== "Let") {
291
+ while (current?.kind === "Label") current = current.body;
292
+ if (current?.kind !== "Let") {
297
293
  throw createError("A name selector here must be from a LET clause", location);
298
294
  }
299
- selection.lets.push(state.current.definitions);
300
- const last = enterDefinition(state.current.definitions);
301
- if (state.isFailed) return reference;
295
+ selection.lets.push(current.definitions);
296
+ const last = enterDefinition(current.definitions);
297
+ if (isFailed) return reference;
302
298
  if (last) {
303
299
  return applyDefinition(last.definition, {
304
300
  ...selection,
@@ -309,14 +305,13 @@ const selectSubexpression = (
309
305
  continue;
310
306
  }
311
307
  selectOperand(selector);
312
- state.index++;
308
+ selectorIndex++;
313
309
  }
314
- if (state.isFailed) return reference;
315
- if (!state.current) throw createError("Subexpression selection failed", location);
316
- return createApplication(selection, state.current);
310
+ if (isFailed) return reference;
311
+ if (!current) throw createError("Subexpression selection failed", location);
312
+ return createApplication(selection, current);
317
313
  };
318
314
 
319
- // A name such as Op(1)!lab(2) whose first parts name a definition selects part of it.
320
315
  const getQualifiedSelectors = (
321
316
  name: string,
322
317
  args: Expression[],
@@ -325,7 +320,7 @@ const getQualifiedSelectors = (
325
320
  ) => {
326
321
  if (!name.includes("!") || lookup(name)) return undefined;
327
322
  const parts = name.split("!");
328
- if (!parts.some((_, index) => lookup(parts.slice(0, index + 1).join("!")))) return undefined;
323
+ if (!parts.some((_part, index) => lookup(parts.slice(0, index + 1).join("!")))) return undefined;
329
324
  return getNameSelectors(name, args, counts);
330
325
  };
331
326
 
@@ -335,9 +330,6 @@ const containsReference = (expression: Expression): boolean =>
335
330
  (expression.kind === "Apply" && expression.operator.includes("!")) ||
336
331
  getChildren(expression).some(containsReference);
337
332
 
338
- // A reference that starts with a name isGoal holds for, such as a theorem whose statement is an
339
- // ASSUME/PROVE, stays for name resolution to check. isOperator holds where an operator may be given,
340
- // as the argument of an operator that may take one.
341
333
  const resolveSubexpressions = (
342
334
  expression: Expression,
343
335
  lookup: Lookup,
@@ -406,18 +398,44 @@ const createLookup = (definitions: Definition[]): Lookup => {
406
398
  export const resolveInstanceSubexpressions = (instance: Instance, module: Module): Instance =>
407
399
  resolveInstance(instance, createLookup(module.definitions), () => false);
408
400
 
409
- // Generator.selectorToNode resolves a name in a theorem, a proof, or a fact as it does in a definition.
410
401
  export const resolveModuleSubexpressions = (module: Module, available: Definition[]): Module => {
411
- const lookup = createLookup([...available, ...module.definitions]);
412
402
  const goals = new Set(
413
403
  module.theorems.flatMap((theorem) =>
414
404
  theorem.name !== undefined && theorem.statement.kind === "AssumeProve" ? [theorem.name] : [],
415
405
  ),
416
406
  );
407
+ const clauses = module.theorems.flatMap((theorem): Definition[] => {
408
+ const statement = theorem.statement;
409
+ if (theorem.name === undefined || statement.kind !== "AssumeProve") return [];
410
+ const assumptions = statement.assumptions.filter(
411
+ (assumption) => assumption.kind !== "NewSymbol" && assumption.kind !== "AssumeProve",
412
+ );
413
+ if (assumptions.length !== statement.assumptions.length) return [];
414
+ return [
415
+ {
416
+ kind: "Operator",
417
+ name: theorem.name,
418
+ params: [],
419
+ body: {
420
+ kind: "Tuple",
421
+ elements: [...assumptions, statement.conclusion],
422
+ location: statement.location,
423
+ },
424
+ isLocal: true,
425
+ isRecursive: false,
426
+ location: theorem.location,
427
+ },
428
+ ];
429
+ });
430
+ const lookup = createLookup([...available, ...module.definitions]);
417
431
  const isGoal = (name: string) => goals.has(name);
418
- const resolve = (expression: Expression) => resolveSubexpressions(expression, lookup, isGoal);
419
- // A name in a theorem, a proof, or a fact may also start with a step, a theorem, or a symbol that
420
- // no definition names.
432
+ const definitionLookup = createLookup([...available, ...module.definitions, ...clauses]);
433
+ const resolve = (expression: Expression) =>
434
+ resolveSubexpressions(
435
+ expression,
436
+ definitionLookup,
437
+ (name) => isGoal(name) && clauses.every((clause) => clause.name !== name),
438
+ );
421
439
  const isProofGoal = (name: string) => isGoal(name) || !lookup(name);
422
440
  const resolveInProof = (expression: Expression) =>
423
441
  resolveSubexpressions(expression, lookup, isProofGoal);
@@ -483,7 +501,6 @@ export const resolveModuleSubexpressions = (module: Module, available: Definitio
483
501
  : proof;
484
502
  const resolved = {
485
503
  ...module,
486
- // A named theorem's statement is resolved as its definition.
487
504
  theorems: module.theorems.map((theorem) => ({
488
505
  ...theorem,
489
506
  statement:
@@ -1,5 +1,5 @@
1
1
  import type { Declaration, Definition, Expression, SourceLocation, Theorem } from "./ast";
2
- import { createSanyError, formatRange } from "./errors";
2
+ import { createSanyError, formatRange, type SanyError } from "./errors";
3
3
  import {
4
4
  ACTION_LEVEL,
5
5
  analyzeAssumeProve,
@@ -122,8 +122,7 @@ export const createInstanceChecker = (getModule: (name: string) => ModuleContext
122
122
  };
123
123
 
124
124
  return (check: InstanceCheck) => {
125
- const errors = new Map<string, { location: string; message: string }>();
126
- // SANY reports each error at the whole instance.
125
+ const errors = new Map<string, SanyError>();
127
126
  const location = formatRange(
128
127
  check.location.range ?? {
129
128
  module: check.instancer,