tla-ts 0.0.10-dev.f16792fed → 0.0.10-dev.fdc173479

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 (587) hide show
  1. package/README.md +2 -1
  2. package/dist/compile.cjs +6 -6
  3. package/dist/compile.js +10 -10
  4. package/dist/deciders.cjs +41 -37
  5. package/dist/deciders.js +41 -37
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +21 -4
  8. package/dist/index.d.ts +21 -4
  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 +2681 -425
  15. package/dist/prove.js +2681 -425
  16. package/dist/run.cjs +41 -42
  17. package/dist/run.js +41 -42
  18. package/dist/tlapm.cjs +2 -2
  19. package/dist/tlapm.js +2 -2
  20. package/dist/transfer.cjs +97 -89
  21. package/dist/transfer.js +97 -89
  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 +72 -39
  26. package/src/bags.ts +50 -29
  27. package/src/builtins.ts +8 -16
  28. package/src/check-failure.ts +118 -0
  29. package/src/check-trace.ts +321 -0
  30. package/src/check.ts +828 -770
  31. package/src/cli/options.ts +6 -31
  32. package/src/cli/runtime-invariants.ts +20 -56
  33. package/src/cli/shared.ts +1 -1
  34. package/src/cli/tlapm.ts +433 -70
  35. package/src/cli/tlc-arguments.ts +224 -212
  36. package/src/cli/tlc-output.ts +701 -0
  37. package/src/cli/tlc-usage.ts +1 -2
  38. package/src/cli/tlc.ts +65 -712
  39. package/src/cli/xml-exporter.ts +23 -33
  40. package/src/codegen.ts +28 -20
  41. package/src/coverage.ts +255 -20
  42. package/src/dependencies.ts +96 -27
  43. package/src/dfid.ts +115 -50
  44. package/src/environment-config.ts +315 -0
  45. package/src/environment.ts +175 -373
  46. package/src/errors.ts +40 -5
  47. package/src/evaluate.ts +429 -139
  48. package/src/exit-codes.ts +28 -12
  49. package/src/fingerprints.ts +65 -1
  50. package/src/instances.ts +178 -17
  51. package/src/java-hash.ts +14 -0
  52. package/src/java-overrides.ts +2 -2
  53. package/src/json.ts +4 -7
  54. package/src/levels.ts +708 -272
  55. package/src/lexer.ts +17 -5
  56. package/src/liveness-checker.ts +707 -249
  57. package/src/liveness.ts +148 -95
  58. package/src/obligations/action.ts +14 -17
  59. package/src/obligations/anonymize.ts +37 -16
  60. package/src/obligations/enabled-axioms.ts +218 -0
  61. package/src/obligations/equality.ts +1 -3
  62. package/src/obligations/expression.ts +36 -8
  63. package/src/obligations/format.ts +0 -2
  64. package/src/obligations/generate.ts +66 -54
  65. package/src/obligations/index.ts +39 -9
  66. package/src/obligations/levels.ts +24 -11
  67. package/src/obligations/module.ts +28 -41
  68. package/src/obligations/normalize.ts +27 -18
  69. package/src/obligations/operators.ts +0 -2
  70. package/src/obligations/pragma.ts +53 -16
  71. package/src/obligations/printer.ts +48 -18
  72. package/src/obligations/proof.ts +3 -2
  73. package/src/obligations/regroup.ts +0 -2
  74. package/src/obligations/simplify.ts +55 -50
  75. package/src/obligations/source.ts +120 -74
  76. package/src/obligations/subexpression.ts +45 -18
  77. package/src/obligations/substitution.ts +1 -3
  78. package/src/obligations/temporal.ts +5 -7
  79. package/src/obligations/tuples.ts +0 -2
  80. package/src/parallel-worker.ts +17 -31
  81. package/src/parallel.ts +29 -47
  82. package/src/parser.ts +757 -326
  83. package/src/pretty-print.ts +1 -1
  84. package/src/prover/decide-pool.ts +3 -3
  85. package/src/prover/deciders.ts +12 -9
  86. package/src/prover/isabelle/decide.ts +3 -25
  87. package/src/prover/isabelle/encode.ts +72 -42
  88. package/src/prover/isabelle/isar/attrib.ts +250 -0
  89. package/src/prover/isabelle/isar/context.ts +335 -0
  90. package/src/prover/isabelle/isar/induct.ts +382 -0
  91. package/src/prover/isabelle/isar/inner-syntax.ts +158 -7
  92. package/src/prover/isabelle/isar/method.ts +509 -212
  93. package/src/prover/isabelle/isar/proof.ts +570 -14
  94. package/src/prover/isabelle/isar/rule-cases.ts +226 -0
  95. package/src/prover/isabelle/isar/theory.ts +487 -76
  96. package/src/prover/isabelle/isar/toplevel.ts +331 -0
  97. package/src/prover/isabelle/isar/type-check.ts +89 -14
  98. package/src/prover/isabelle/provers/blast/blast.ts +7 -65
  99. package/src/prover/isabelle/provers/blast/branch.ts +0 -2
  100. package/src/prover/isabelle/provers/blast/prove.ts +0 -2
  101. package/src/prover/isabelle/provers/blast/rules.ts +0 -2
  102. package/src/prover/isabelle/provers/blast/state.ts +0 -2
  103. package/src/prover/isabelle/provers/blast/term.ts +0 -2
  104. package/src/prover/isabelle/provers/clasimp.ts +1 -3
  105. package/src/prover/isabelle/provers/classical.ts +45 -20
  106. package/src/prover/isabelle/provers/hypsubst.ts +19 -30
  107. package/src/prover/isabelle/pure/bicompose.ts +9 -27
  108. package/src/prover/isabelle/pure/consts.ts +0 -2
  109. package/src/prover/isabelle/pure/conv.ts +2 -10
  110. package/src/prover/isabelle/pure/drule.ts +72 -6
  111. package/src/prover/isabelle/pure/envir.ts +0 -2
  112. package/src/prover/isabelle/pure/goal.ts +1 -3
  113. package/src/prover/isabelle/pure/logic.ts +1 -3
  114. package/src/prover/isabelle/pure/name.ts +0 -2
  115. package/src/prover/isabelle/pure/net.ts +0 -2
  116. package/src/prover/isabelle/pure/object-logic.ts +13 -7
  117. package/src/prover/isabelle/pure/pattern.ts +0 -2
  118. package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
  119. package/src/prover/isabelle/pure/rewriter.ts +9 -20
  120. package/src/prover/isabelle/pure/search.ts +0 -2
  121. package/src/prover/isabelle/pure/seq.ts +0 -2
  122. package/src/prover/isabelle/pure/simplifier.ts +26 -7
  123. package/src/prover/isabelle/pure/table.ts +2 -3
  124. package/src/prover/isabelle/pure/tactic.ts +0 -2
  125. package/src/prover/isabelle/pure/tactical.ts +42 -37
  126. package/src/prover/isabelle/pure/term-ord.ts +0 -2
  127. package/src/prover/isabelle/pure/term.ts +3 -5
  128. package/src/prover/isabelle/pure/thm.ts +14 -13
  129. package/src/prover/isabelle/pure/type.ts +0 -2
  130. package/src/prover/isabelle/pure/unify.ts +0 -2
  131. package/src/prover/isabelle/pure/variable.ts +0 -2
  132. package/src/prover/isabelle/tla/classical-setup.ts +18 -16
  133. package/src/prover/isabelle/tla/context.ts +58 -11
  134. package/src/prover/isabelle/tla/logic-data.ts +1 -1
  135. package/src/prover/isabelle/tla/logic.ts +49 -21
  136. package/src/prover/isabelle/tla/simpdata.ts +1 -12
  137. package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
  138. package/src/prover/ocaml.ts +4 -1
  139. package/src/prover/prep/action.ts +30 -31
  140. package/src/prover/prep/enabled-axioms.ts +11 -2
  141. package/src/prover/prep/fingerprint.ts +2 -5
  142. package/src/prover/prep/md5.ts +26 -29
  143. package/src/prover/prep/methods.ts +181 -51
  144. package/src/prover/prep/normalize.ts +38 -9
  145. package/src/prover/prove.ts +395 -94
  146. package/src/prover/ptl/decide.ts +95 -50
  147. package/src/prover/ptl/encode.ts +2 -3
  148. package/src/prover/ptl/tableau.ts +28 -2
  149. package/src/prover/smt/arithmetic.ts +310 -0
  150. package/src/prover/smt/axioms.ts +12 -8
  151. package/src/prover/smt/context.ts +43 -8
  152. package/src/prover/smt/data.ts +498 -379
  153. package/src/prover/smt/encode.ts +148 -57
  154. package/src/prover/smt/extensionality.ts +5 -3
  155. package/src/prover/smt/flatten.ts +4 -6
  156. package/src/prover/smt/format.ts +28 -4
  157. package/src/prover/smt/instances.ts +7 -1
  158. package/src/prover/smt/layout.ts +91 -0
  159. package/src/prover/smt/rewrite.ts +1016 -618
  160. package/src/prover/smt/simplify.ts +441 -0
  161. package/src/prover/smt/solver/ackermannize-bv-tactic.ts +62 -0
  162. package/src/prover/smt/solver/ackr-helper.ts +179 -0
  163. package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
  164. package/src/prover/smt/solver/act-cache.ts +0 -1
  165. package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
  166. package/src/prover/smt/solver/aig-tactic.ts +52 -0
  167. package/src/prover/smt/solver/aig.ts +889 -0
  168. package/src/prover/smt/solver/arith-rewriter.ts +624 -9
  169. package/src/prover/smt/solver/arith-terms.ts +121 -0
  170. package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
  171. package/src/prover/smt/solver/array-rewriter.ts +319 -0
  172. package/src/prover/smt/solver/asserted-formulas.ts +240 -56
  173. package/src/prover/smt/solver/ast-lt.ts +165 -11
  174. package/src/prover/smt/solver/ast-util.ts +160 -2
  175. package/src/prover/smt/solver/ast.ts +1483 -45
  176. package/src/prover/smt/solver/auf-solver.ts +25 -18
  177. package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
  178. package/src/prover/smt/solver/bit-blaster.ts +871 -0
  179. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  180. package/src/prover/smt/solver/bound-manager.ts +196 -0
  181. package/src/prover/smt/solver/bound-simplifier.ts +598 -0
  182. package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
  183. package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
  184. package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
  185. package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
  186. package/src/prover/smt/solver/bv1-blast.ts +214 -0
  187. package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
  188. package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
  189. package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
  190. package/src/prover/smt/solver/card2bv.ts +127 -0
  191. package/src/prover/smt/solver/case-split-queue.ts +0 -2
  192. package/src/prover/smt/solver/cg-table.ts +39 -25
  193. package/src/prover/smt/solver/check-logic.ts +330 -0
  194. package/src/prover/smt/solver/clause.ts +0 -1
  195. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
  196. package/src/prover/smt/solver/conflict-resolution.ts +78 -2
  197. package/src/prover/smt/solver/context.ts +598 -128
  198. package/src/prover/smt/solver/ctx-simplify.ts +29 -14
  199. package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
  200. package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
  201. package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
  202. package/src/prover/smt/solver/demodulator.ts +786 -0
  203. package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
  204. package/src/prover/smt/solver/der.ts +38 -10
  205. package/src/prover/smt/solver/diff-neq.ts +207 -0
  206. package/src/prover/smt/solver/distribute-forall.ts +57 -0
  207. package/src/prover/smt/solver/dom-simplify.ts +511 -0
  208. package/src/prover/smt/solver/dt2bv-tactic.ts +298 -0
  209. package/src/prover/smt/solver/dyn-ack.ts +0 -1
  210. package/src/prover/smt/solver/e-matching.ts +7 -8
  211. package/src/prover/smt/solver/elim-bounds.ts +89 -0
  212. package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
  213. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  214. package/src/prover/smt/solver/elim-uncnstr.ts +548 -0
  215. package/src/prover/smt/solver/enode.ts +100 -3
  216. package/src/prover/smt/solver/eq2bv-tactic.ts +227 -0
  217. package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
  218. package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
  219. package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
  220. package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
  221. package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
  222. package/src/prover/smt/solver/euf/array-solver.ts +306 -0
  223. package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
  224. package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
  225. package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
  226. package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
  227. package/src/prover/smt/solver/euf/egraph.ts +901 -0
  228. package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
  229. package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
  230. package/src/prover/smt/solver/euf/mam.ts +1046 -0
  231. package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
  232. package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
  233. package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
  234. package/src/prover/smt/solver/euf/q-solver.ts +361 -0
  235. package/src/prover/smt/solver/euf/th-solver.ts +328 -0
  236. package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
  237. package/src/prover/smt/solver/expr-ref.ts +0 -1
  238. package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
  239. package/src/prover/smt/solver/expr2polynomial.ts +271 -0
  240. package/src/prover/smt/solver/factor.ts +163 -0
  241. package/src/prover/smt/solver/fd-solver.ts +734 -0
  242. package/src/prover/smt/solver/fingerprints.ts +15 -15
  243. package/src/prover/smt/solver/fix-dl-var.ts +147 -0
  244. package/src/prover/smt/solver/flat-literals.ts +0 -1
  245. package/src/prover/smt/solver/fm-tactic.ts +886 -0
  246. package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
  247. package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
  248. package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
  249. package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
  250. package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
  251. package/src/prover/smt/solver/goal.ts +178 -15
  252. package/src/prover/smt/solver/goal2nlsat.ts +216 -0
  253. package/src/prover/smt/solver/guard-set.ts +219 -0
  254. package/src/prover/smt/solver/hash.ts +0 -1
  255. package/src/prover/smt/solver/hashtable.ts +34 -16
  256. package/src/prover/smt/solver/inf-eps.ts +63 -0
  257. package/src/prover/smt/solver/inj-axiom.ts +101 -0
  258. package/src/prover/smt/solver/internalizer.ts +111 -39
  259. package/src/prover/smt/solver/lackr.ts +381 -0
  260. package/src/prover/smt/solver/lbool.ts +0 -1
  261. package/src/prover/smt/solver/lia2card.ts +268 -0
  262. package/src/prover/smt/solver/lia2pb.ts +154 -0
  263. package/src/prover/smt/solver/literal.ts +0 -1
  264. package/src/prover/smt/solver/logic-tactics.ts +355 -0
  265. package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
  266. package/src/prover/smt/solver/lp/constraints.ts +0 -1
  267. package/src/prover/smt/solver/lp/containers.ts +7 -2
  268. package/src/prover/smt/solver/lp/core-solver.ts +30 -11
  269. package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
  270. package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
  271. package/src/prover/smt/solver/lp/dependency.ts +0 -2
  272. package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
  273. package/src/prover/smt/solver/lp/explanation.ts +0 -1
  274. package/src/prover/smt/solver/lp/gomory.ts +0 -1
  275. package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
  276. package/src/prover/smt/solver/lp/hnf.ts +0 -3
  277. package/src/prover/smt/solver/lp/int-cube.ts +3 -4
  278. package/src/prover/smt/solver/lp/int-solver.ts +0 -2
  279. package/src/prover/smt/solver/lp/lar-solver.ts +41 -5
  280. package/src/prover/smt/solver/lp/lar-term.ts +0 -1
  281. package/src/prover/smt/solver/lp/lp-settings.ts +6 -3
  282. package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
  283. package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
  284. package/src/prover/smt/solver/lp/nex.ts +2 -2
  285. package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
  286. package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
  287. package/src/prover/smt/solver/lp/nla-core.ts +68 -17
  288. package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
  289. package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
  290. package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
  291. package/src/prover/smt/solver/lp/nla-grobner.ts +167 -85
  292. package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
  293. package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
  294. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
  295. package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
  296. package/src/prover/smt/solver/lp/nla-order.ts +0 -2
  297. package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
  298. package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
  299. package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
  300. package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
  301. package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
  302. package/src/prover/smt/solver/lp/nla-types.ts +0 -2
  303. package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
  304. package/src/prover/smt/solver/lp/nra-solver.ts +163 -99
  305. package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
  306. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
  307. package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
  308. package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
  309. package/src/prover/smt/solver/lp/pdd.ts +725 -290
  310. package/src/prover/smt/solver/lp/random-updater.ts +0 -2
  311. package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
  312. package/src/prover/smt/solver/lp/union-find.ts +7 -2
  313. package/src/prover/smt/solver/macro-finder.ts +530 -0
  314. package/src/prover/smt/solver/mam-compiler.ts +122 -90
  315. package/src/prover/smt/solver/mam-interpreter.ts +0 -1
  316. package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
  317. package/src/prover/smt/solver/max-cliques.ts +105 -0
  318. package/src/prover/smt/solver/maxcore.ts +310 -0
  319. package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
  320. package/src/prover/smt/solver/maxlex.ts +115 -0
  321. package/src/prover/smt/solver/maxsmt-base.ts +106 -0
  322. package/src/prover/smt/solver/maxsmt.ts +92 -0
  323. package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
  324. package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
  325. package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
  326. package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
  327. package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
  328. package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
  329. package/src/prover/smt/solver/model-based-opt.ts +844 -0
  330. package/src/prover/smt/solver/model-checker.ts +19 -28
  331. package/src/prover/smt/solver/model-evaluator.ts +190 -12
  332. package/src/prover/smt/solver/model-finder.ts +12 -18
  333. package/src/prover/smt/solver/model-generator.ts +104 -35
  334. package/src/prover/smt/solver/model-macro-solver.ts +49 -46
  335. package/src/prover/smt/solver/model-printer.ts +214 -0
  336. package/src/prover/smt/solver/mpf.ts +709 -0
  337. package/src/prover/smt/solver/mus.ts +50 -0
  338. package/src/prover/smt/solver/muz/dl-context.ts +382 -0
  339. package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
  340. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
  341. package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
  342. package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
  343. package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
  344. package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
  345. package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
  346. package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
  347. package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
  348. package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
  349. package/src/prover/smt/solver/muz/hnf.ts +201 -0
  350. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
  351. package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
  352. package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
  353. package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
  354. package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
  355. package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
  356. package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
  357. package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
  358. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
  359. package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
  360. package/src/prover/smt/solver/muz/substitution.ts +203 -0
  361. package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
  362. package/src/prover/smt/solver/nlqsat.ts +485 -0
  363. package/src/prover/smt/solver/nlsat/algebraic.ts +315 -98
  364. package/src/prover/smt/solver/nlsat/atoms.ts +71 -38
  365. package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
  366. package/src/prover/smt/solver/nlsat/explain.ts +427 -229
  367. package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
  368. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -246
  369. package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
  370. package/src/prover/smt/solver/nlsat/polynomial.ts +2376 -684
  371. package/src/prover/smt/solver/nlsat/solver.ts +293 -92
  372. package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
  373. package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
  374. package/src/prover/smt/solver/nlsat/types.ts +0 -2
  375. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -8
  376. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
  377. package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
  378. package/src/prover/smt/solver/nnf.ts +110 -24
  379. package/src/prover/smt/solver/normalize-bounds.ts +53 -0
  380. package/src/prover/smt/solver/occf.ts +97 -0
  381. package/src/prover/smt/solver/opt-context.ts +801 -0
  382. package/src/prover/smt/solver/opt-nlsat.ts +386 -0
  383. package/src/prover/smt/solver/opt-pareto.ts +301 -0
  384. package/src/prover/smt/solver/opt-preprocess.ts +101 -0
  385. package/src/prover/smt/solver/opt-solver.ts +312 -0
  386. package/src/prover/smt/solver/opt-value.ts +55 -0
  387. package/src/prover/smt/solver/optsmt.ts +692 -0
  388. package/src/prover/smt/solver/parallel-tactic.ts +299 -0
  389. package/src/prover/smt/solver/pattern-inference.ts +19 -11
  390. package/src/prover/smt/solver/pb-rewriter.ts +281 -0
  391. package/src/prover/smt/solver/pb2bv-tactic.ts +546 -0
  392. package/src/prover/smt/solver/poly-rewriter.ts +259 -57
  393. package/src/prover/smt/solver/probes.ts +577 -0
  394. package/src/prover/smt/solver/propagate-values.ts +37 -21
  395. package/src/prover/smt/solver/proto-model.ts +648 -19
  396. package/src/prover/smt/solver/pull-quant.ts +28 -12
  397. package/src/prover/smt/solver/purify-arith.ts +634 -0
  398. package/src/prover/smt/solver/push-app-ite.ts +37 -0
  399. package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
  400. package/src/prover/smt/solver/qe-lite-der.ts +2 -3
  401. package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
  402. package/src/prover/smt/solver/qe-lite.ts +39 -19
  403. package/src/prover/smt/solver/qe-mbp.ts +270 -0
  404. package/src/prover/smt/solver/qe.ts +1499 -0
  405. package/src/prover/smt/solver/qel.ts +25 -0
  406. package/src/prover/smt/solver/qi-queue.ts +0 -1
  407. package/src/prover/smt/solver/qsat.ts +829 -0
  408. package/src/prover/smt/solver/quant-hoist.ts +196 -0
  409. package/src/prover/smt/solver/quant-tactics.ts +16 -56
  410. package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
  411. package/src/prover/smt/solver/quantifier-manager.ts +22 -25
  412. package/src/prover/smt/solver/quasi-macros.ts +243 -0
  413. package/src/prover/smt/solver/random-gen.ts +0 -1
  414. package/src/prover/smt/solver/rational.ts +45 -1
  415. package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
  416. package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
  417. package/src/prover/smt/solver/reduce-args.ts +225 -0
  418. package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
  419. package/src/prover/smt/solver/ref-vector.ts +0 -1
  420. package/src/prover/smt/solver/relevancy.ts +1 -2
  421. package/src/prover/smt/solver/rewriter-tpl.ts +82 -14
  422. package/src/prover/smt/solver/rewriter.ts +505 -60
  423. package/src/prover/smt/solver/rlimit.ts +45 -5
  424. package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
  425. package/src/prover/smt/solver/sat/big.ts +177 -0
  426. package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
  427. package/src/prover/smt/solver/sat/clause.ts +203 -0
  428. package/src/prover/smt/solver/sat/cleaner.ts +94 -0
  429. package/src/prover/smt/solver/sat/config.ts +122 -0
  430. package/src/prover/smt/solver/sat/consequences.ts +203 -0
  431. package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
  432. package/src/prover/smt/solver/sat/goal2sat.ts +589 -0
  433. package/src/prover/smt/solver/sat/inc-sat-solver.ts +480 -0
  434. package/src/prover/smt/solver/sat/model-converter.ts +136 -0
  435. package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
  436. package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
  437. package/src/prover/smt/solver/sat/probing.ts +170 -0
  438. package/src/prover/smt/solver/sat/sat-tactic.ts +72 -0
  439. package/src/prover/smt/solver/sat/sat2goal.ts +190 -0
  440. package/src/prover/smt/solver/sat/scc.ts +142 -0
  441. package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
  442. package/src/prover/smt/solver/sat/solver.ts +2107 -0
  443. package/src/prover/smt/solver/sat/var-queue.ts +117 -0
  444. package/src/prover/smt/solver/sat/watch-list.ts +140 -0
  445. package/src/prover/smt/solver/search-tree.ts +284 -0
  446. package/src/prover/smt/solver/seq-axioms.ts +995 -0
  447. package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
  448. package/src/prover/smt/solver/seq-derive.ts +1298 -0
  449. package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
  450. package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
  451. package/src/prover/smt/solver/seq-factory.ts +89 -0
  452. package/src/prover/smt/solver/seq-monadic.ts +730 -0
  453. package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
  454. package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
  455. package/src/prover/smt/solver/seq-re-util.ts +758 -0
  456. package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
  457. package/src/prover/smt/solver/seq-regex-live.ts +200 -0
  458. package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
  459. package/src/prover/smt/solver/seq-skolem.ts +294 -0
  460. package/src/prover/smt/solver/seq-subset.ts +165 -0
  461. package/src/prover/smt/solver/seq-view-witness.ts +353 -0
  462. package/src/prover/smt/solver/smt-consequences.ts +297 -0
  463. package/src/prover/smt/solver/smt-kernel.ts +124 -0
  464. package/src/prover/smt/solver/smt-logics.ts +66 -0
  465. package/src/prover/smt/solver/smt-setup.ts +589 -0
  466. package/src/prover/smt/solver/smt2-printer.ts +765 -0
  467. package/src/prover/smt/solver/smtlib-parser.ts +3535 -360
  468. package/src/prover/smt/solver/smtlib-script.ts +2136 -0
  469. package/src/prover/smt/solver/solve-eqs.ts +928 -0
  470. package/src/prover/smt/solver/solver.ts +128 -23
  471. package/src/prover/smt/solver/static-features.ts +314 -0
  472. package/src/prover/smt/solver/sticky-generations.ts +0 -1
  473. package/src/prover/smt/solver/tactic.ts +2176 -0
  474. package/src/prover/smt/solver/term-enumeration.ts +205 -0
  475. package/src/prover/smt/solver/theory-array.ts +1240 -0
  476. package/src/prover/smt/solver/theory-bv.ts +1210 -0
  477. package/src/prover/smt/solver/theory-char.ts +355 -0
  478. package/src/prover/smt/solver/theory-datatype.ts +598 -0
  479. package/src/prover/smt/solver/theory-finite-set.ts +30 -0
  480. package/src/prover/smt/solver/theory-fpa.ts +389 -0
  481. package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
  482. package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
  483. package/src/prover/smt/solver/theory-lra-final-check.ts +57 -70
  484. package/src/prover/smt/solver/theory-lra-internalize.ts +96 -27
  485. package/src/prover/smt/solver/theory-lra-model.ts +20 -35
  486. package/src/prover/smt/solver/theory-lra-propagate.ts +35 -28
  487. package/src/prover/smt/solver/theory-lra-state.ts +7 -23
  488. package/src/prover/smt/solver/theory-lra.ts +189 -2
  489. package/src/prover/smt/solver/theory-pb.ts +951 -0
  490. package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
  491. package/src/prover/smt/solver/theory-recfun.ts +307 -0
  492. package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
  493. package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
  494. package/src/prover/smt/solver/theory-seq-state.ts +852 -0
  495. package/src/prover/smt/solver/theory-seq.ts +961 -0
  496. package/src/prover/smt/solver/theory-without-terms.ts +24 -0
  497. package/src/prover/smt/solver/theory.ts +189 -0
  498. package/src/prover/smt/solver/tseitin-cnf.ts +495 -0
  499. package/src/prover/smt/solver/var-subst.ts +36 -14
  500. package/src/prover/smt/table.ts +3 -2
  501. package/src/prover/smt/types.ts +146 -0
  502. package/src/prover/tlapm/cache.ts +57 -26
  503. package/src/prover/tlapm/tlapm.ts +15 -9
  504. package/src/prover/tlapm-library.ts +3208 -0
  505. package/src/prover/verdict.ts +9 -0
  506. package/src/prover/zenon/check/check.ts +1 -2
  507. package/src/prover/zenon/check/records.ts +1 -1
  508. package/src/prover/zenon/check/relations.ts +2 -1
  509. package/src/prover/zenon/check/rewrites.ts +2 -15
  510. package/src/prover/zenon/check/sets.ts +40 -58
  511. package/src/prover/zenon/check/terms.ts +1 -2
  512. package/src/prover/zenon/decide.ts +10 -7
  513. package/src/prover/zenon/encode.ts +0 -2
  514. package/src/prover/zenon/eqrel.ts +2 -2
  515. package/src/prover/zenon/equality-rules.ts +24 -2
  516. package/src/prover/zenon/expr.ts +28 -2
  517. package/src/prover/zenon/index-table.ts +16 -23
  518. package/src/prover/zenon/isar-case.ts +1 -3
  519. package/src/prover/zenon/isar.ts +37 -39
  520. package/src/prover/zenon/llproof.ts +2 -13
  521. package/src/prover/zenon/mltoll.ts +12 -30
  522. package/src/prover/zenon/node.ts +20 -5
  523. package/src/prover/zenon/parse.ts +9 -8
  524. package/src/prover/zenon/phrase.ts +1 -3
  525. package/src/prover/zenon/proof.ts +0 -2
  526. package/src/prover/zenon/propositional-rules.ts +0 -2
  527. package/src/prover/zenon/rules.ts +2 -3
  528. package/src/prover/zenon/search.ts +11 -19
  529. package/src/prover/zenon/tla/functions.ts +2 -4
  530. package/src/prover/zenon/tla/llproof.ts +9 -13
  531. package/src/prover/zenon/tla/records.ts +1 -8
  532. package/src/prover/zenon/tla/rewrites.ts +0 -2
  533. package/src/prover/zenon/tla/sets.ts +22 -22
  534. package/src/prover/zenon/tla/terms.ts +0 -2
  535. package/src/prover/zenon/tla/tla.ts +7 -8
  536. package/src/resolve.ts +1327 -328
  537. package/src/runtime.ts +25 -2
  538. package/src/sany/builtins.ts +10 -10
  539. package/src/sany/generation.ts +384 -0
  540. package/src/sany/generator-def-entries.ts +297 -0
  541. package/src/sany/generator-definitions.ts +688 -0
  542. package/src/sany/generator-expressions.ts +1123 -0
  543. package/src/sany/generator-proofs.ts +668 -0
  544. package/src/sany/generator.ts +161 -2625
  545. package/src/sany/levels.ts +0 -2
  546. package/src/sany/lexer.ts +32 -23
  547. package/src/sany/linter.ts +0 -2
  548. package/src/sany/modules.ts +4 -2
  549. package/src/sany/nodes.ts +3 -4
  550. package/src/sany/report.ts +3 -6
  551. package/src/sany/selectors.ts +46 -44
  552. package/src/sany/xml.ts +25 -58
  553. package/src/search.ts +513 -165
  554. package/src/simulate.ts +340 -251
  555. package/src/spec-description.ts +48 -55
  556. package/src/standard-definitions.ts +5 -0
  557. package/src/standard-modules.ts +72 -54
  558. package/src/state-graph.ts +0 -2
  559. package/src/subexpressions.ts +564 -138
  560. package/src/substitution-levels.ts +5 -4
  561. package/src/successors.ts +56 -28
  562. package/src/symmetry.ts +4 -3
  563. package/src/tableau.ts +2 -2
  564. package/src/tlc/fingerprint.ts +81 -9
  565. package/src/tlc/jar-data.ts +10 -0
  566. package/src/tlc/messages.ts +23 -18
  567. package/src/tlc/order.ts +14 -3
  568. package/src/tlc/random.ts +6 -5
  569. package/src/tlc/replay.ts +152 -58
  570. package/src/tlc/summary.ts +29 -14
  571. package/src/tlc/tlc-operators.ts +12 -11
  572. package/src/tlc/tlcext-operators.ts +87 -26
  573. package/src/tlc/trace-spec.ts +27 -60
  574. package/src/trace-liveness.ts +529 -0
  575. package/src/typed-tier.ts +6556 -0
  576. package/src/typescript/actions.ts +2 -4
  577. package/src/typescript/collections.ts +34 -20
  578. package/src/typescript/compile.ts +1 -3
  579. package/src/typescript/formula.ts +5 -3
  580. package/src/typescript/model.ts +4 -5
  581. package/src/typescript/steps.ts +20 -18
  582. package/src/typescript/types.ts +2 -2
  583. package/src/values.ts +208 -227
  584. package/src/prover/isabelle/isar/statement.ts +0 -52
  585. package/src/prover/smt/solver/z3-license.txt +0 -10
  586. package/src/prover/tlaps-module.ts +0 -510
  587. package/src/prover/zenon/LICENSE +0 -32
@@ -2,6 +2,7 @@ import {
2
2
  getChildren,
3
3
  type AssumeProve,
4
4
  type Bound,
5
+ type Declaration,
5
6
  type Definition,
6
7
  type Expression,
7
8
  type Fact,
@@ -14,17 +15,31 @@ import {
14
15
  type SourceRange,
15
16
  type StepBody,
16
17
  } from "./ast";
17
- import { formatRange, TlaSyntaxError } from "./errors";
18
+ import { formatRange, TlaSyntaxError, type SanyError } from "./errors";
18
19
  import { getSourceName, mapChildren, mapDefinition } from "./instances";
20
+ import { parenthesizedRanges } from "./parser";
21
+ import { STANDARD_LEVELS } from "./standard-definitions";
22
+ import { resolveSynonym } from "./tlc/jar-data";
19
23
  import {
24
+ compareLocations,
20
25
  getArity,
21
26
  getBinder,
22
27
  getNameSelectors,
23
28
  getOperandIndex,
24
29
  getOperands,
30
+ getParamArities,
31
+ isBefore,
25
32
  LOCAL_RESOLUTION,
33
+ nullSelections,
34
+ operatorSelectionErrors,
26
35
  selectionErrors,
36
+ selectionArguments,
27
37
  selections,
38
+ SELECTION_NAME,
39
+ factReferences,
40
+ generatedArgumentCounts,
41
+ type NullSelection,
42
+ type SelectionArguments,
28
43
  } from "./resolve";
29
44
 
30
45
  type Lookup = (name: string) => Definition | undefined;
@@ -32,6 +47,7 @@ type Lookup = (name: string) => Definition | undefined;
32
47
  interface FoundLabel {
33
48
  label: Expression & { kind: "Label" };
34
49
  lets: Definition[][];
50
+ applications: Expression[];
35
51
  }
36
52
 
37
53
  interface Selection {
@@ -47,7 +63,48 @@ interface SelectingName {
47
63
  argumentRanges?: (SourceRange | undefined)[];
48
64
  }
49
65
 
50
- const SELECTION_NAME = "$subexpression";
66
+ const declaredArities = new WeakMap<Definition, number>();
67
+
68
+ const resolveDefinition = (
69
+ definition: Definition,
70
+ resolve: (expression: Expression) => Expression,
71
+ ) => {
72
+ const resolved = mapDefinition(definition, resolve);
73
+ const arity = declaredArities.get(definition);
74
+ if (arity !== undefined) declaredArities.set(resolved, arity);
75
+ return resolved;
76
+ };
77
+
78
+ const setDeclaredArities = (declarations: Declaration[], definitions: Definition[]) =>
79
+ declarations.forEach((declaration) => {
80
+ const definition = definitions.find(
81
+ (candidate) => candidate.isRecursive && candidate.name === declaration.name,
82
+ );
83
+ if (definition) declaredArities.set(definition, declaration.arity);
84
+ });
85
+
86
+ const getSelectorName = (selector: Selector) => {
87
+ switch (selector.kind) {
88
+ case "Name":
89
+ return selector.name;
90
+ case "Operand":
91
+ return typeof selector.operand === "number"
92
+ ? `argument selector ${selector.operand}`
93
+ : selector.operand;
94
+ case "Bound":
95
+ return "!(...)";
96
+ case "At":
97
+ return "@";
98
+ case "Colon":
99
+ return ":";
100
+ }
101
+ };
102
+
103
+ const getExpressionArguments = (
104
+ operator: string,
105
+ range: SourceRange | undefined,
106
+ args: Expression[],
107
+ ): SelectionArguments => ({ operator, range, args, params: args.map(() => 0) });
51
108
 
52
109
  const createError = (message: string, location: SourceLocation) =>
53
110
  new TlaSyntaxError(`${message} at line ${location.line}, column ${location.column}`);
@@ -56,30 +113,47 @@ const findLabel = (
56
113
  expression: Expression,
57
114
  name: string,
58
115
  lets: Definition[][],
116
+ applications: Expression[],
59
117
  ): FoundLabel | undefined => {
60
118
  if (expression.kind === "Label") {
61
- return expression.name === name ? { label: expression, lets } : undefined;
119
+ return expression.name === name ? { label: expression, lets, applications } : undefined;
62
120
  }
63
121
  if (expression.kind === "Let")
64
- return findLabel(expression.body, name, [...lets, expression.definitions]);
65
- if (expression.kind === "Lambda") return undefined;
66
- for (const child of getChildren(expression)) {
67
- const found = findLabel(child, name, lets);
122
+ return findLabel(expression.body, name, [...lets, expression.definitions], applications);
123
+ if (expression.kind === "Lambda" || expression.kind === "Selection") return undefined;
124
+ const generated = generatedArgumentCounts.get(expression);
125
+ const enclosing =
126
+ (expression.kind === "Apply" && generated === undefined) ||
127
+ expression.kind === "FunctionApplication"
128
+ ? [...applications, expression]
129
+ : applications;
130
+ for (const child of getChildren(expression).slice(0, generated)) {
131
+ const isFunction = expression.kind === "FunctionApplication" && child === expression.function;
132
+ const found = findLabel(child, name, lets, isFunction ? applications : enclosing);
68
133
  if (found) return found;
69
134
  }
70
135
  return undefined;
71
136
  };
72
137
 
138
+ const getHiddenLocation = (location: SourceLocation) => ({
139
+ line: location.line,
140
+ column: location.column,
141
+ });
142
+
73
143
  const wrapLets = (body: Expression, lets: Definition[][], location: SourceLocation) =>
74
144
  lets.reduceRight<Expression>(
75
- (inner, definitions) => ({ kind: "Let", definitions, body: inner, location }),
145
+ (inner, definitions) => ({
146
+ kind: "Let",
147
+ definitions,
148
+ body: inner,
149
+ location: getHiddenLocation(location),
150
+ }),
76
151
  body,
77
152
  );
78
153
 
79
154
  const createApplication = (selection: Selection, body: Expression): Expression => {
80
155
  const location = selection.location;
81
- const wrapped = wrapLets(body, selection.lets, location);
82
- if (selection.params.length === 0) return wrapped;
156
+ if (selection.params.length === 0) return body;
83
157
  if (selection.args.length === 0) {
84
158
  if (selection.params.some((param) => param.arity > 0)) {
85
159
  throw createError("Selected an operator with operator parameters as an argument", location);
@@ -87,7 +161,7 @@ const createApplication = (selection: Selection, body: Expression): Expression =
87
161
  return {
88
162
  kind: "Lambda",
89
163
  params: selection.params.map((param) => param.name),
90
- body: wrapped,
164
+ body,
91
165
  location,
92
166
  };
93
167
  }
@@ -104,7 +178,7 @@ const createApplication = (selection: Selection, body: Expression): Expression =
104
178
  kind: "Operator",
105
179
  name: SELECTION_NAME,
106
180
  params: selection.params,
107
- body: wrapped,
181
+ body,
108
182
  isLocal: true,
109
183
  isRecursive: false,
110
184
  location,
@@ -117,7 +191,7 @@ const createApplication = (selection: Selection, body: Expression): Expression =
117
191
  location,
118
192
  resolution: LOCAL_RESOLUTION,
119
193
  },
120
- location,
194
+ location: getHiddenLocation(location),
121
195
  };
122
196
  };
123
197
 
@@ -146,7 +220,10 @@ const applyDefinition = (definition: Definition, selection: Selection) => {
146
220
  location,
147
221
  resolution: LOCAL_RESOLUTION,
148
222
  };
149
- return createApplication({ ...selection, params: [...selection.params, ...params] }, reference);
223
+ return createApplication(
224
+ { ...selection, params: [...selection.params, ...params] },
225
+ wrapLets(reference, selection.lets, location),
226
+ );
150
227
  };
151
228
 
152
229
  const selectSubexpression = (
@@ -158,58 +235,124 @@ const selectSubexpression = (
158
235
  const location = reference.location;
159
236
  const selection: Selection = { params: [], args: [], lets: [], location };
160
237
  let selectorIndex = 0;
161
- let current = undefined as Expression | undefined;
238
+ let operatorIndex = -1;
239
+ let current: Expression | undefined;
240
+ let unwrappedSelection: Expression | undefined;
162
241
  let isFailed = false;
242
+ let generatedArguments = 0;
243
+ const nulls: NullSelection[] = [];
244
+ const applications: SelectionArguments[] = [];
245
+ let expressionError: SanyError | undefined;
246
+ const deferToExpression = (range: SourceRange | undefined, message: string) => {
247
+ if (!expressionError && range) expressionError = { location: formatRange(range), message };
248
+ };
249
+ const checkNull = (node: Expression | undefined, message: string, isEmpty = false) => {
250
+ const range = reference.selectorRanges?.[selectorIndex];
251
+ if (node && range) {
252
+ nulls.push({
253
+ node,
254
+ error: { location: formatRange(range), message },
255
+ isEmpty,
256
+ applications: [...applications],
257
+ });
258
+ }
259
+ };
163
260
 
164
261
  const report = (range: SourceRange | undefined, message: string) => {
165
262
  if (!range) throw createError(message, location);
166
263
  selectionErrors.set(reference, {
167
- args: selectors
168
- .slice(0, selectorIndex)
169
- .flatMap((selector) => ("args" in selector ? selector.args : [])),
264
+ applications,
265
+ nulls,
170
266
  error: { location: formatRange(range), message },
171
267
  });
268
+ generatedArgumentCounts.set(reference, generatedArguments);
172
269
  isFailed = true;
173
270
  return undefined;
174
271
  };
175
272
 
176
273
  const findDefinition = (local: Definition[] | undefined) => {
274
+ const start = reference.selectorRanges?.[selectorIndex];
177
275
  const names: string[] = [];
178
276
  const args: Expression[] = [];
179
277
  while (selectorIndex < selectors.length) {
180
278
  const selector = selectors[selectorIndex];
181
- if (selector.kind !== "Name") throw createError("Expected an operator name", location);
182
- names.push(selector.name);
183
- args.push(...selector.args);
184
- const name = names.join("!");
185
- const definition = local
186
- ? local.find((candidate) => getSourceName(candidate) === name)
187
- : lookup(name);
188
- if (definition)
189
- return { definition, name, args, earlier: args.length - selector.args.length };
279
+ if (selector.kind !== "Name" && !local) return undefined;
280
+ if (selector.kind === "Name") {
281
+ names.push(selector.name);
282
+ args.push(...selector.args);
283
+ const name = names.join("!");
284
+ const definition = local
285
+ ? local.find((candidate) => getSourceName(candidate) === name)
286
+ : lookup(name);
287
+ if (definition)
288
+ return { definition, name, args, earlier: args.length - selector.args.length };
289
+ }
190
290
  selectorIndex++;
191
291
  }
192
- throw createError(`Unknown operator ${names.join("!")}`, location);
292
+ const end =
293
+ reference.selectorRanges?.[selectors.findLastIndex((selector) => selector.kind === "Name")];
294
+ return report(
295
+ start && end && { ...start, end: end.end },
296
+ `Unknown operator: \`${names.join("!")}'.`,
297
+ );
193
298
  };
194
299
 
195
300
  const enterDefinition = (local: Definition[] | undefined) => {
196
301
  const found = findDefinition(local);
302
+ if (!found) {
303
+ isFailed = true;
304
+ return undefined;
305
+ }
197
306
  const definition = found.definition;
198
- const arity = getArity(definition);
307
+ const arity = declaredArities.get(definition) ?? getArity(definition);
199
308
  const isLast = selectorIndex === selectors.length - 1;
200
- if (found.args.length !== arity && (!isOperator || found.args.length !== 0)) {
309
+ if (found.args.length !== arity) {
310
+ const range = reference.argumentRanges?.[selectorIndex] ?? location.range;
311
+ const message = `The operator ${resolveSynonym(found.name)} requires ${arity - found.earlier} arguments.`;
312
+ if (!isOperator || found.args.length !== 0) {
313
+ generatedArguments += found.earlier;
314
+ return report(range, message);
315
+ }
316
+ deferToExpression(range, message);
317
+ }
318
+ generatedArguments += found.args.length;
319
+ found.args.forEach((arg, index) =>
320
+ selectionArguments.set(arg, {
321
+ operator: found.name,
322
+ index,
323
+ range: reference.selectorRanges?.[selectorIndex],
324
+ }),
325
+ );
326
+ if (isLast) return { definition, args: found.args };
327
+ const range = definition.location.range;
328
+ const isUndefined =
329
+ declaredArities.has(definition) &&
330
+ range?.module === location.range?.module &&
331
+ isBefore(location, definition.location);
332
+ applications.push({
333
+ operator: found.name,
334
+ range: reference.selectorRanges?.[selectorIndex],
335
+ args: found.args,
336
+ params: isUndefined ? Array(arity).fill(0) : getParamArities(definition),
337
+ });
338
+ if (
339
+ definition.isRecursive &&
340
+ range &&
341
+ range.module === location.range?.module &&
342
+ isBefore(location, range.end)
343
+ ) {
201
344
  return report(
202
- reference.argumentRanges?.[selectorIndex] ?? location.range,
203
- `The operator ${found.name} requires ${arity - found.earlier} arguments.`,
345
+ reference.selectorRanges?.[selectorIndex],
346
+ `Subexpression of \`${found.name}' used inside the operator's definition.`,
204
347
  );
205
348
  }
206
- if (isLast) return { definition, args: found.args };
207
349
  if (definition.kind !== "Operator") {
208
350
  throw createError(`Cannot select a subexpression of ${definition.name}`, location);
209
351
  }
210
352
  selection.params.push(...definition.params);
211
353
  selection.args.push(...found.args);
212
354
  current = definition.body;
355
+ operatorIndex = selectorIndex;
213
356
  selectorIndex++;
214
357
  return undefined;
215
358
  };
@@ -219,15 +362,21 @@ const selectSubexpression = (
219
362
  const selector = selectors[selectorIndex];
220
363
  if (selector.kind !== "Name") return;
221
364
  const range = reference.selectorRanges?.[selectorIndex];
222
- const found = current && findLabel(current, selector.name, []);
223
- if (!found) return report(range, `Cannot find label \`${selector.name}'.`);
365
+ const found = current && findLabel(current, selector.name, [], []);
366
+ const missing = `Cannot find label \`${selector.name}'.`;
367
+ if (!found) return report(range, missing);
368
+ found.applications.forEach((application) => checkNull(application, missing, true));
224
369
  const params = found.label.params;
225
- if (!isOperator && selector.args.length !== params.length) {
226
- return report(range, `Label \`${selector.name}' used with wrong number of arguments.`);
370
+ if (selector.args.length !== params.length) {
371
+ const message = `Label \`${selector.name}' used with wrong number of arguments.`;
372
+ if (!isOperator) return report(range, message);
373
+ deferToExpression(range, message);
227
374
  }
375
+ generatedArguments += selector.args.length;
228
376
  selection.lets.push(...found.lets);
229
377
  selection.params.push(...params.map((name) => ({ name, arity: 0 })));
230
378
  selection.args.push(...selector.args);
379
+ applications.push(getExpressionArguments(selector.name, range, selector.args));
231
380
  current = found.label.body;
232
381
  selectorIndex++;
233
382
  }
@@ -236,14 +385,35 @@ const selectSubexpression = (
236
385
  const selectOperand = (selector: Selector) => {
237
386
  if (!current) throw createError("Subexpression selection failed", location);
238
387
  if (selector.kind === "Colon") return;
388
+ const range = reference.selectorRanges?.[selectorIndex];
389
+ const noOperands = `Choosing operand \`${getSelectorName(selector)}' of subexpression with no operands.`;
390
+ if (selectionErrors.has(current)) {
391
+ report(range, noOperands);
392
+ return;
393
+ }
394
+ if (selections.has(current) && current.kind !== "Lambda" && current !== unwrappedSelection) {
395
+ checkNull(current, noOperands, true);
396
+ unwrappedSelection = current;
397
+ current =
398
+ current.kind === "Let" &&
399
+ current.body.kind === "Apply" &&
400
+ current.body.operator === SELECTION_NAME
401
+ ? current.body
402
+ : current.kind === "Selection"
403
+ ? current
404
+ : // SANY wraps a selection without parameters in $Nop, whose only operand is the selection.
405
+ { kind: "Tuple", elements: [current], location: current.location };
406
+ }
239
407
  if (current.kind === "Label") {
240
408
  current = current.body;
241
409
  selectOperand(selector);
242
410
  return;
243
411
  }
412
+ const nonexistent = `Nonexistent operand specified by \`${getSelectorName(selector)}'.`;
244
413
  if (current.kind === "Let") {
245
414
  if (selector.kind !== "Operand" || getOperandIndex(selector.operand, 1) !== 0) {
246
- throw createError("A LET/IN expression has only one operand", location);
415
+ report(range, "A LET/IN expression has only one operand.");
416
+ return;
247
417
  }
248
418
  selection.lets.push(current.definitions);
249
419
  current = current.body;
@@ -251,33 +421,83 @@ const selectSubexpression = (
251
421
  }
252
422
  const binder = getBinder(current);
253
423
  if (binder && (selector.kind === "Bound" || selector.kind === "At")) {
424
+ if (selector.kind === "Bound" && selector.args.length !== binder.names.length) {
425
+ report(
426
+ range,
427
+ `Selector with ${selector.args.length} argument(s) used for quantifier with ${binder.names.length} bound identifier(s).`,
428
+ );
429
+ return;
430
+ }
254
431
  selection.params.push(...binder.names.map((name) => ({ name, arity: 0 })));
255
- if (selector.kind === "Bound") selection.args.push(...selector.args);
256
- current = binder.body;
432
+ if (selector.kind === "Bound") {
433
+ generatedArguments += selector.args.length;
434
+ selection.args.push(...selector.args);
435
+ applications.push(getExpressionArguments("", range, selector.args));
436
+ }
437
+ current =
438
+ selections.has(current) && binder.body.kind === "Selection"
439
+ ? binder.body.expression
440
+ : binder.body;
257
441
  return;
258
442
  }
259
- if (current.kind === "Case" && selector.kind === "Operand") {
443
+ if (current.kind === "Case") {
260
444
  const arms = [
261
445
  ...current.arms,
262
446
  ...(current.other ? [{ condition: undefined, body: current.other }] : []),
263
447
  ];
264
- const arm = arms[getOperandIndex(selector.operand, arms.length)];
265
- const next = selectors[selectorIndex + 1];
266
- if (!arm || next?.kind !== "Operand") {
267
- throw createError("A subexpression of CASE must have the form !i!j", location);
448
+ if (selectorIndex === selectors.length - 1) {
449
+ report(range, "Subexpression of CASE must have form !i!j.");
450
+ return;
451
+ }
452
+ const arm =
453
+ selector.kind === "Operand"
454
+ ? arms[getOperandIndex(selector.operand, arms.length)]
455
+ : undefined;
456
+ if (!arm) {
457
+ report(range, nonexistent);
458
+ return;
268
459
  }
269
460
  selectorIndex++;
270
- const part = getOperandIndex(next.operand, 2);
271
- const chosen = part === 0 ? arm.condition : part === 1 ? arm.body : undefined;
272
- if (!chosen) throw createError("Nonexistent CASE operand", location);
461
+ const next = selectors[selectorIndex];
462
+ const part = next.kind === "Operand" ? getOperandIndex(next.operand, 2) : -1;
463
+ const nextRange = reference.selectorRanges?.[selectorIndex];
464
+ if (part === -1) {
465
+ report(
466
+ nextRange,
467
+ "Second selector for CASE subexpression must specify one of two operands.",
468
+ );
469
+ return;
470
+ }
471
+ const chosen = part === 0 ? arm.condition : arm.body;
472
+ if (!chosen) {
473
+ report(nextRange, "Selecting OTHER in a CASE statement.");
474
+ return;
475
+ }
273
476
  current = chosen;
274
477
  return;
275
478
  }
276
- if (selector.kind !== "Operand")
277
- throw createError("Unexpected subexpression selector", location);
479
+ if (
480
+ current.kind === "Except" &&
481
+ selector.kind === "Operand" &&
482
+ getOperandIndex(selector.operand, current.updates.length + 1) > 0
483
+ ) {
484
+ report(range, "Selecting subexpression of an EXCEPT not yet implemented.");
485
+ return;
486
+ }
278
487
  const operands = binder ? binder.sets : getOperands(current);
488
+ if (!operands && current.kind !== "Identifier") {
489
+ report(range, "Selecting subexpression of expression that has none.");
490
+ return;
491
+ }
492
+ if (selector.kind !== "Operand") {
493
+ report(range, nonexistent);
494
+ return;
495
+ }
279
496
  const operand = operands?.[getOperandIndex(selector.operand, operands.length)];
280
- if (!operand) throw createError("Nonexistent operand specified by the selector", location);
497
+ if (!operand) {
498
+ report(range, nonexistent);
499
+ return;
500
+ }
281
501
  current = operand;
282
502
  };
283
503
 
@@ -290,7 +510,11 @@ const selectSubexpression = (
290
510
  if (selector.kind === "Name") {
291
511
  while (current?.kind === "Label") current = current.body;
292
512
  if (current?.kind !== "Let") {
293
- throw createError("A name selector here must be from a LET clause", location);
513
+ report(
514
+ reference.selectorRanges?.[selectorIndex - 1],
515
+ "A name selector here must be from a LET clause.",
516
+ );
517
+ return reference;
294
518
  }
295
519
  selection.lets.push(current.definitions);
296
520
  const last = enterDefinition(current.definitions);
@@ -304,12 +528,74 @@ const selectSubexpression = (
304
528
  followLabels();
305
529
  continue;
306
530
  }
531
+ if (selector.kind === "Colon" && selectors[selectorIndex - 1].kind !== "Name") {
532
+ report(
533
+ reference.selectorRanges?.[selectorIndex - 1],
534
+ "!: should not follow an operand selector.",
535
+ );
536
+ return reference;
537
+ }
538
+ if (
539
+ selector.kind === "Colon" &&
540
+ selectors[selectorIndex + 1]?.kind !== "Name" &&
541
+ (operatorIndex !== selectorIndex - 1 || selectorIndex !== selectors.length - 1)
542
+ ) {
543
+ report(
544
+ reference.selectorRanges?.[selectorIndex],
545
+ "`!:' can be used only after a name and either at the end after an\noperator name or before an operator name.",
546
+ );
547
+ return reference;
548
+ }
549
+ if (selector.kind !== "Colon") {
550
+ checkNull(
551
+ current,
552
+ "Subexpression selection failed, probably due to an error in the selected expression.",
553
+ );
554
+ checkNull(
555
+ current,
556
+ `Choosing operand \`${getSelectorName(selector)}' of subexpression with no operands.`,
557
+ true,
558
+ );
559
+ }
307
560
  selectOperand(selector);
561
+ checkNull(
562
+ current,
563
+ `An unexpected null node specified by '${getSelectorName(selectors[selectorIndex])}'.\nThis is probably due to a previous error.`,
564
+ );
308
565
  selectorIndex++;
309
566
  }
310
567
  if (isFailed) return reference;
311
568
  if (!current) throw createError("Subexpression selection failed", location);
312
- return createApplication(selection, current);
569
+ const params = selection.params.length;
570
+ const args = selection.args.length;
571
+ if (params !== args) {
572
+ const message = `Expected ${params} arguments but found ${args}.`;
573
+ if (!isOperator || args > 0) {
574
+ report(location.range, message);
575
+ return reference;
576
+ }
577
+ deferToExpression(location.range, message);
578
+ }
579
+ const body = wrapLets(current, selection.lets, location);
580
+ const share = (expression: Expression): Expression => ({
581
+ kind: "Selection",
582
+ expression,
583
+ // SANY's $Nop, which TLC's call stack shows at the reference, wraps only a selection without parameters.
584
+ location:
585
+ selection.params.length === 0 && body.kind !== "Lambda"
586
+ ? location
587
+ : getHiddenLocation(location),
588
+ });
589
+ // SANY selects a LAMBDA itself rather than wrapping it in $Nop, so the selection keeps its arity.
590
+ const selected = createApplication(
591
+ selection,
592
+ body.kind !== "Lambda"
593
+ ? share(body)
594
+ : { ...body, body: selections.has(body) ? body.body : share(body.body), location },
595
+ );
596
+ nullSelections.set(selected, nulls);
597
+ if (expressionError) operatorSelectionErrors.set(selected, expressionError);
598
+ return selected;
313
599
  };
314
600
 
315
601
  const getQualifiedSelectors = (
@@ -338,18 +624,43 @@ const resolveSubexpressions = (
338
624
  ): Expression => {
339
625
  if (!containsReference(expression)) return expression;
340
626
  if (expression.kind === "Let") {
627
+ if (expression.recursive) setDeclaredArities(expression.recursive, expression.definitions);
628
+ const resolved: Definition[] = [];
341
629
  const local: Lookup = (name) =>
342
- expression.definitions.find((definition) => definition.name === name) ?? lookup(name);
343
- const mapped = mapChildren(expression, (child) => resolveSubexpressions(child, local, isGoal));
344
- return mapped.kind === "Let" && mapped.instances
630
+ resolved.find((definition) => definition.name === name) ??
631
+ expression.definitions.find((definition) => definition.name === name) ??
632
+ lookup(name);
633
+ const isLocalGoal = (name: string) =>
634
+ !expression.definitions.some((definition) => definition.name === name) && isGoal(name);
635
+ expression.definitions.forEach((definition) =>
636
+ resolved.push(
637
+ resolveDefinition(definition, (child) => resolveSubexpressions(child, local, isLocalGoal)),
638
+ ),
639
+ );
640
+ const mapped = {
641
+ ...expression,
642
+ definitions: resolved,
643
+ body: resolveSubexpressions(expression.body, local, isLocalGoal),
644
+ };
645
+ return mapped.instances
345
646
  ? {
346
647
  ...mapped,
347
- instances: mapped.instances.map((instance) => resolveInstance(instance, local, isGoal)),
648
+ instances: mapped.instances.map((instance) =>
649
+ resolveInstance(instance, local, isLocalGoal),
650
+ ),
348
651
  }
349
652
  : mapped;
350
653
  }
351
654
  const callee = expression.kind === "Apply" ? lookup(expression.operator) : undefined;
352
- const mapped =
655
+ // SANY expects an operator argument only of a user-defined operator, which a standard module's built-in operators stand for.
656
+ const calleeParams =
657
+ callee?.kind === "Operator"
658
+ ? callee.params
659
+ : expression.kind === "Apply"
660
+ ? STANDARD_LEVELS.get(expression.operator.slice(expression.operator.lastIndexOf("!") + 1))
661
+ ?.formals
662
+ : undefined;
663
+ const rebuilt =
353
664
  expression.kind === "Apply"
354
665
  ? {
355
666
  ...expression,
@@ -358,11 +669,15 @@ const resolveSubexpressions = (
358
669
  arg,
359
670
  lookup,
360
671
  isGoal,
361
- callee?.kind !== "Operator" || callee.params[index]?.arity !== 0,
672
+ calleeParams !== undefined && calleeParams[index]?.arity !== 0,
362
673
  ),
363
674
  ),
364
675
  }
365
676
  : mapChildren(expression, (child) => resolveSubexpressions(child, lookup, isGoal));
677
+ const children = getChildren(expression);
678
+ const mapped = getChildren(rebuilt).every((child, index) => child === children[index])
679
+ ? expression
680
+ : rebuilt;
366
681
  const selectors =
367
682
  mapped.kind === "Subexpression"
368
683
  ? mapped.selectors
@@ -372,9 +687,39 @@ const resolveSubexpressions = (
372
687
  ? getQualifiedSelectors(mapped.operator, mapped.args, mapped.argumentCounts, lookup)
373
688
  : undefined;
374
689
  const first = selectors?.[0];
375
- if (!selectors || (first?.kind === "Name" && isGoal(first.name))) return mapped;
690
+ const setGeneratedArguments = (count: number) => {
691
+ generatedArgumentCounts.set(expression, count);
692
+ generatedArgumentCounts.set(mapped, count);
693
+ };
694
+ if (!selectors) {
695
+ if (mapped.kind === "Apply" && mapped.operator.includes("!") && !lookup(mapped.operator)) {
696
+ setGeneratedArguments(0);
697
+ }
698
+ return mapped;
699
+ }
700
+ const nameCount = selectors.findIndex((selector) => selector.kind !== "Name");
701
+ const names = selectors.slice(0, nameCount === -1 ? selectors.length : nameCount);
702
+ const isQualified = names.some(
703
+ (_name, index) =>
704
+ index > 0 &&
705
+ lookup(
706
+ names
707
+ .slice(0, index + 1)
708
+ .map(getSelectorName)
709
+ .join("!"),
710
+ ),
711
+ );
712
+ if (first?.kind === "Name" && isGoal(first.name) && !isQualified) return mapped;
713
+ if (first?.kind === "Name" && selectors[1].kind !== "Name" && !lookup(first.name)) {
714
+ setGeneratedArguments(0);
715
+ return mapped;
716
+ }
376
717
  const selected = selectSubexpression(selectors, lookup, mapped, isOperator);
377
- if (selected !== mapped) selections.add(selected);
718
+ const generated = generatedArgumentCounts.get(mapped);
719
+ if (generated !== undefined) setGeneratedArguments(generated);
720
+ const parenthesized = parenthesizedRanges.get(expression);
721
+ if (parenthesized && selected !== mapped) parenthesizedRanges.set(selected, parenthesized);
722
+ if (selected !== mapped) selections.set(selected, mapped);
378
723
  return selected;
379
724
  };
380
725
 
@@ -427,100 +772,181 @@ export const resolveModuleSubexpressions = (module: Module, available: Definitio
427
772
  },
428
773
  ];
429
774
  });
430
- const lookup = createLookup([...available, ...module.definitions]);
775
+ const own = new Set([...module.definitions, ...clauses]);
776
+ setDeclaredArities(
777
+ module.units.flatMap((unit) => (unit.kind === "Recursive" ? unit.declarations : [])),
778
+ module.definitions,
779
+ );
780
+ const recursive = new Map(
781
+ module.units.flatMap((unit): [string, SourceLocation][] =>
782
+ unit.kind === "Recursive"
783
+ ? unit.declarations.map((declaration) => [declaration.name, declaration.location])
784
+ : [],
785
+ ),
786
+ );
787
+ const isDeclaredBefore = (definition: Definition, location: SourceLocation) => {
788
+ const declared = recursive.get(definition.name);
789
+ return (
790
+ isBefore(definition.location, location) ||
791
+ (definition.isRecursive && declared !== undefined && isBefore(declared, location))
792
+ );
793
+ };
794
+ const resolvedDefinitions = new Map<Definition, Definition>();
795
+ const getVisibleLookup =
796
+ (lookup: Lookup, location: SourceLocation): Lookup =>
797
+ (name) => {
798
+ const definition = lookup(name);
799
+ if (!definition || (own.has(definition) && !isDeclaredBefore(definition, location))) {
800
+ return undefined;
801
+ }
802
+ return resolvedDefinitions.get(definition) ?? definition;
803
+ };
804
+ const proofLookup = createLookup([...available, ...module.definitions]);
431
805
  const isGoal = (name: string) => goals.has(name);
432
806
  const definitionLookup = createLookup([...available, ...module.definitions, ...clauses]);
433
- const resolve = (expression: Expression) =>
807
+ const resolve = (expression: Expression, location: SourceLocation) =>
434
808
  resolveSubexpressions(
435
809
  expression,
436
- definitionLookup,
810
+ getVisibleLookup(definitionLookup, location),
437
811
  (name) => isGoal(name) && clauses.every((clause) => clause.name !== name),
438
812
  );
439
- const isProofGoal = (name: string) => isGoal(name) || !lookup(name);
440
- const resolveInProof = (expression: Expression) =>
441
- resolveSubexpressions(expression, lookup, isProofGoal);
442
- const resolveFacts = (facts: Fact[]) =>
443
- facts.map((fact) => (fact.kind === "ModuleFact" ? fact : resolveInProof(fact)));
444
- const resolveBounds = (bounds: Bound[]) =>
445
- bounds.map((bound) => ({ ...bound, set: resolveInProof(bound.set) }));
446
- const resolveStatement = (statement: Expression | AssumeProve): Expression | AssumeProve =>
447
- statement.kind === "AssumeProve"
448
- ? {
449
- ...statement,
450
- assumptions: statement.assumptions.map((assumption) =>
451
- assumption.kind === "NewSymbol"
452
- ? { ...assumption, set: assumption.set && resolveInProof(assumption.set) }
453
- : resolveStatement(assumption),
454
- ),
455
- conclusion: resolveInProof(statement.conclusion),
456
- }
457
- : resolveInProof(statement);
458
- const resolveStep = (body: StepBody): StepBody => {
459
- switch (body.kind) {
460
- case "Use":
461
- case "Hide":
462
- return { ...body, facts: resolveFacts(body.facts) };
463
- case "Instance":
464
- return resolveInstance(body, lookup, isProofGoal);
465
- case "Define":
466
- return {
467
- ...body,
468
- definitions: body.definitions.map((definition) =>
469
- definition.kind === "Instance"
470
- ? resolveInstance(definition, lookup, isProofGoal)
471
- : mapDefinition(definition, resolveInProof),
472
- ),
473
- };
474
- case "Have":
475
- case "Case":
476
- return { ...body, expression: resolveInProof(body.expression) };
477
- case "Witness":
478
- return { ...body, expressions: body.expressions.map(resolveInProof) };
479
- case "Take":
480
- return { ...body, bounds: resolveBounds(body.bounds) };
481
- case "Pick":
482
- return { ...body, bounds: resolveBounds(body.bounds), body: resolveInProof(body.body) };
483
- case "Assert":
484
- return { ...body, statement: resolveStatement(body.statement) };
485
- default:
486
- return body;
487
- }
488
- };
489
- const resolveProof = (proof: Proof | undefined): Proof | undefined =>
490
- proof?.kind === "By"
491
- ? { ...proof, facts: resolveFacts(proof.facts) }
492
- : proof?.kind === "Steps"
813
+ const createProofResolver = (lookup: Lookup) => {
814
+ const isProofGoal = (name: string) => isGoal(name) || !lookup(name);
815
+ const resolveInProof = (expression: Expression) =>
816
+ resolveSubexpressions(expression, lookup, isProofGoal);
817
+ const resolveFacts = (facts: Fact[]) => {
818
+ const resolved = facts.map((fact) =>
819
+ fact.kind === "ModuleFact" ? fact : resolveInProof(fact),
820
+ );
821
+ factReferences.set(resolved, facts);
822
+ return resolved;
823
+ };
824
+ const resolveDefs = (defs: Fact[]) =>
825
+ defs.map((def) =>
826
+ def.kind === "ModuleFact" ? def : resolveSubexpressions(def, lookup, isProofGoal, true),
827
+ );
828
+ const resolveBounds = (bounds: Bound[]) =>
829
+ bounds.map((bound) => ({ ...bound, set: resolveInProof(bound.set) }));
830
+ const resolveStatement = (statement: Expression | AssumeProve): Expression | AssumeProve =>
831
+ statement.kind === "AssumeProve"
493
832
  ? {
494
- ...proof,
495
- steps: proof.steps.map((step) => ({
496
- ...step,
497
- body: resolveStep(step.body),
498
- proof: resolveProof(step.proof),
499
- })),
833
+ ...statement,
834
+ assumptions: statement.assumptions.map((assumption) =>
835
+ assumption.kind === "NewSymbol"
836
+ ? { ...assumption, set: assumption.set && resolveInProof(assumption.set) }
837
+ : resolveStatement(assumption),
838
+ ),
839
+ conclusion: resolveInProof(statement.conclusion),
500
840
  }
501
- : proof;
502
- const resolved = {
503
- ...module,
504
- theorems: module.theorems.map((theorem) => ({
505
- ...theorem,
506
- statement:
507
- theorem.name !== undefined && theorem.statement.kind !== "AssumeProve"
508
- ? theorem.statement
509
- : resolveStatement(theorem.statement),
510
- proof: resolveProof(theorem.proof),
511
- })),
512
- uses: module.uses.map((use) => ({ ...use, facts: resolveFacts(use.facts) })),
841
+ : resolveInProof(statement);
842
+ const resolveStep = (body: StepBody): StepBody => {
843
+ switch (body.kind) {
844
+ case "Use":
845
+ case "Hide":
846
+ return { ...body, facts: resolveFacts(body.facts), defs: resolveDefs(body.defs) };
847
+ case "Instance":
848
+ return resolveInstance(body, lookup, isProofGoal);
849
+ case "Define":
850
+ return {
851
+ ...body,
852
+ definitions: body.definitions.map((definition) =>
853
+ definition.kind === "Instance"
854
+ ? resolveInstance(definition, lookup, isProofGoal)
855
+ : resolveDefinition(definition, resolveInProof),
856
+ ),
857
+ };
858
+ case "Have":
859
+ case "Case":
860
+ return { ...body, expression: resolveInProof(body.expression) };
861
+ case "Witness":
862
+ return { ...body, expressions: body.expressions.map(resolveInProof) };
863
+ case "Take":
864
+ return { ...body, bounds: resolveBounds(body.bounds) };
865
+ case "Pick":
866
+ return { ...body, bounds: resolveBounds(body.bounds), body: resolveInProof(body.body) };
867
+ case "Assert":
868
+ return { ...body, statement: resolveStatement(body.statement) };
869
+ default:
870
+ return body;
871
+ }
872
+ };
873
+ const resolveProof = (proof: Proof | undefined): Proof | undefined => {
874
+ if (proof?.kind === "By") {
875
+ return { ...proof, facts: resolveFacts(proof.facts), defs: resolveDefs(proof.defs) };
876
+ }
877
+ if (proof?.kind !== "Steps") return proof;
878
+ let resolver = { lookup, resolveStep, resolveProof };
879
+ return {
880
+ ...proof,
881
+ steps: proof.steps.map((step) => {
882
+ const resolved = {
883
+ ...step,
884
+ body: resolver.resolveStep(step.body),
885
+ proof: resolver.resolveProof(step.proof),
886
+ };
887
+ if (resolved.body.kind === "Define") {
888
+ const definitions = resolved.body.definitions.flatMap((definition) =>
889
+ definition.kind === "Instance" ? [] : [definition],
890
+ );
891
+ const outer = resolver.lookup;
892
+ resolver = createProofResolver(
893
+ (name) => definitions.find((definition) => definition.name === name) ?? outer(name),
894
+ );
895
+ }
896
+ return resolved;
897
+ }),
898
+ };
899
+ };
900
+ return { lookup, resolveFacts, resolveDefs, resolveStatement, resolveStep, resolveProof };
513
901
  };
514
902
  const hasReferences =
515
903
  module.definitions.some((definition) => containsReference(definition.body)) ||
516
904
  module.assumptions.some((assumption) => containsReference(assumption.expression));
905
+ if (hasReferences) {
906
+ [...module.definitions, ...clauses]
907
+ .toSorted((left, right) => compareLocations(left.location, right.location))
908
+ .forEach((definition) =>
909
+ resolvedDefinitions.set(
910
+ definition,
911
+ resolveDefinition(definition, (expression) => resolve(expression, definition.location)),
912
+ ),
913
+ );
914
+ }
915
+ const resolved = {
916
+ ...module,
917
+ theorems: module.theorems.map((theorem) => {
918
+ const resolver = createProofResolver(getVisibleLookup(proofLookup, theorem.location));
919
+ return {
920
+ ...theorem,
921
+ statement:
922
+ theorem.name !== undefined && theorem.statement.kind !== "AssumeProve"
923
+ ? theorem.statement
924
+ : resolver.resolveStatement(theorem.statement),
925
+ proof:
926
+ theorem.proof &&
927
+ createProofResolver(getVisibleLookup(proofLookup, theorem.proof.location)).resolveProof(
928
+ theorem.proof,
929
+ ),
930
+ };
931
+ }),
932
+ uses: module.uses.map((use) => {
933
+ const resolver = createProofResolver(getVisibleLookup(proofLookup, use.location));
934
+ return {
935
+ ...use,
936
+ facts: resolver.resolveFacts(use.facts),
937
+ defs: resolver.resolveDefs(use.defs),
938
+ };
939
+ }),
940
+ };
517
941
  if (!hasReferences) return resolved;
518
942
  return {
519
943
  ...resolved,
520
- definitions: module.definitions.map((definition) => mapDefinition(definition, resolve)),
944
+ definitions: module.definitions.map(
945
+ (definition) => resolvedDefinitions.get(definition) ?? definition,
946
+ ),
521
947
  assumptions: module.assumptions.map((assumption) => ({
522
948
  ...assumption,
523
- expression: resolve(assumption.expression),
949
+ expression: resolve(assumption.expression, assumption.location),
524
950
  })),
525
951
  };
526
952
  };