tla-ts 0.0.9 → 0.0.10-dev.09e53c2a6

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 (625) hide show
  1. package/README.md +30 -1
  2. package/dist/compile.cjs +23 -0
  3. package/dist/compile.js +23 -0
  4. package/dist/deciders.cjs +41 -37
  5. package/dist/deciders.js +57 -53
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +109 -10
  8. package/dist/index.d.ts +109 -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 +2746 -410
  15. package/dist/prove.js +2745 -409
  16. package/dist/run.cjs +146 -31
  17. package/dist/run.js +146 -31
  18. package/dist/tlapm.cjs +2 -2
  19. package/dist/tlapm.js +2 -2
  20. package/dist/transfer.cjs +132 -104
  21. package/dist/transfer.js +132 -104
  22. package/dist/worker.cjs +6 -6
  23. package/dist/worker.js +6 -6
  24. package/package.json +3 -1
  25. package/src/ast.ts +45 -59
  26. package/src/bags.ts +99 -102
  27. package/src/builtins.ts +28 -75
  28. package/src/bundled-modules.ts +1 -8
  29. package/src/check-failure.ts +116 -0
  30. package/src/check-trace.ts +282 -0
  31. package/src/check.ts +797 -782
  32. package/src/cli/options.ts +12 -32
  33. package/src/cli/run.ts +0 -2
  34. package/src/cli/runtime-invariants.ts +136 -0
  35. package/src/cli/shared.ts +19 -12
  36. package/src/cli/tlapm.ts +433 -82
  37. package/src/cli/tlc-arguments.ts +652 -0
  38. package/src/cli/tlc-output.ts +687 -0
  39. package/src/cli/tlc-usage.ts +360 -0
  40. package/src/cli/tlc.ts +323 -658
  41. package/src/cli/typescript.ts +23 -0
  42. package/src/cli/xml-exporter.ts +27 -49
  43. package/src/cli.ts +0 -1
  44. package/src/codegen.ts +196 -74
  45. package/src/config.ts +140 -109
  46. package/src/coverage.ts +830 -0
  47. package/src/dependencies.ts +36 -54
  48. package/src/dfid.ts +618 -0
  49. package/src/environment-config.ts +315 -0
  50. package/src/environment.ts +178 -339
  51. package/src/errors.ts +100 -57
  52. package/src/evaluate.ts +598 -340
  53. package/src/exit-codes.ts +38 -3
  54. package/src/fingerprints.ts +75 -11
  55. package/src/index.ts +3 -0
  56. package/src/instances.ts +126 -21
  57. package/src/java-hash.ts +7 -0
  58. package/src/java-overrides.ts +4 -19
  59. package/src/json-reader.ts +455 -0
  60. package/src/json.ts +252 -139
  61. package/src/levels.ts +46 -58
  62. package/src/lexer.ts +83 -101
  63. package/src/liveness-checker.ts +590 -311
  64. package/src/liveness.ts +180 -124
  65. package/src/obligations/action.ts +17 -44
  66. package/src/obligations/anonymize.ts +120 -95
  67. package/src/obligations/enabled-axioms.ts +218 -0
  68. package/src/obligations/equality.ts +1 -3
  69. package/src/obligations/expression.ts +37 -26
  70. package/src/obligations/format.ts +0 -10
  71. package/src/obligations/generate.ts +66 -64
  72. package/src/obligations/index.ts +38 -19
  73. package/src/obligations/levels.ts +27 -18
  74. package/src/obligations/module.ts +28 -55
  75. package/src/obligations/normalize.ts +30 -37
  76. package/src/obligations/operators.ts +0 -3
  77. package/src/obligations/pragma.ts +52 -24
  78. package/src/obligations/printer.ts +89 -58
  79. package/src/obligations/proof.ts +3 -6
  80. package/src/obligations/regroup.ts +0 -5
  81. package/src/obligations/simplify.ts +57 -63
  82. package/src/obligations/source.ts +119 -95
  83. package/src/obligations/subexpression.ts +49 -28
  84. package/src/obligations/substitution.ts +1 -5
  85. package/src/obligations/temporal.ts +12 -20
  86. package/src/obligations/tuples.ts +2 -10
  87. package/src/parallel-worker.ts +30 -60
  88. package/src/parallel.ts +59 -73
  89. package/src/parser.ts +1082 -399
  90. package/src/pcal/ast.ts +53 -86
  91. package/src/pcal/parse.ts +144 -219
  92. package/src/pcal/tokenize.ts +91 -131
  93. package/src/pcal/translate.ts +83 -130
  94. package/src/pcal/validate.ts +48 -68
  95. package/src/pretty-print.ts +7 -8
  96. package/src/prover/decide-pool.ts +8 -13
  97. package/src/prover/deciders.ts +12 -13
  98. package/src/prover/first-order.ts +0 -11
  99. package/src/prover/isabelle/decide.ts +3 -31
  100. package/src/prover/isabelle/encode.ts +82 -64
  101. package/src/prover/isabelle/isar/attrib.ts +250 -0
  102. package/src/prover/isabelle/isar/context.ts +335 -0
  103. package/src/prover/isabelle/isar/induct.ts +382 -0
  104. package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
  105. package/src/prover/isabelle/isar/method.ts +510 -226
  106. package/src/prover/isabelle/isar/proof.ts +570 -23
  107. package/src/prover/isabelle/isar/rule-cases.ts +224 -0
  108. package/src/prover/isabelle/isar/theory.ts +488 -88
  109. package/src/prover/isabelle/isar/toplevel.ts +331 -0
  110. package/src/prover/isabelle/isar/type-check.ts +99 -38
  111. package/src/prover/isabelle/provers/blast/blast.ts +16 -105
  112. package/src/prover/isabelle/provers/blast/branch.ts +0 -33
  113. package/src/prover/isabelle/provers/blast/prove.ts +0 -36
  114. package/src/prover/isabelle/provers/blast/rules.ts +5 -45
  115. package/src/prover/isabelle/provers/blast/state.ts +1 -29
  116. package/src/prover/isabelle/provers/blast/term.ts +8 -37
  117. package/src/prover/isabelle/provers/clasimp.ts +0 -14
  118. package/src/prover/isabelle/provers/classical.ts +58 -61
  119. package/src/prover/isabelle/provers/hypsubst.ts +27 -52
  120. package/src/prover/isabelle/pure/bicompose.ts +24 -39
  121. package/src/prover/isabelle/pure/consts.ts +0 -8
  122. package/src/prover/isabelle/pure/conv.ts +2 -18
  123. package/src/prover/isabelle/pure/drule.ts +95 -45
  124. package/src/prover/isabelle/pure/envir.ts +2 -53
  125. package/src/prover/isabelle/pure/goal.ts +1 -9
  126. package/src/prover/isabelle/pure/interrupt.ts +0 -5
  127. package/src/prover/isabelle/pure/list.ts +0 -3
  128. package/src/prover/isabelle/pure/logic.ts +1 -16
  129. package/src/prover/isabelle/pure/name.ts +1 -10
  130. package/src/prover/isabelle/pure/net.ts +2 -60
  131. package/src/prover/isabelle/pure/object-logic.ts +15 -16
  132. package/src/prover/isabelle/pure/pattern.ts +1 -20
  133. package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
  134. package/src/prover/isabelle/pure/rewriter.ts +31 -74
  135. package/src/prover/isabelle/pure/search.ts +2 -11
  136. package/src/prover/isabelle/pure/seq.ts +0 -11
  137. package/src/prover/isabelle/pure/simplifier.ts +27 -16
  138. package/src/prover/isabelle/pure/table.ts +2 -33
  139. package/src/prover/isabelle/pure/tactic.ts +11 -23
  140. package/src/prover/isabelle/pure/tactical.ts +47 -48
  141. package/src/prover/isabelle/pure/term-ord.ts +1 -7
  142. package/src/prover/isabelle/pure/term.ts +1 -44
  143. package/src/prover/isabelle/pure/thm.ts +26 -48
  144. package/src/prover/isabelle/pure/type.ts +1 -16
  145. package/src/prover/isabelle/pure/unify.ts +19 -31
  146. package/src/prover/isabelle/pure/variable.ts +2 -8
  147. package/src/prover/isabelle/tla/classical-setup.ts +17 -25
  148. package/src/prover/isabelle/tla/context.ts +65 -26
  149. package/src/prover/isabelle/tla/logic-data.ts +1 -1
  150. package/src/prover/isabelle/tla/logic.ts +53 -32
  151. package/src/prover/isabelle/tla/simpdata.ts +45 -44
  152. package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
  153. package/src/prover/ocaml.ts +4 -7
  154. package/src/prover/prep/action.ts +33 -66
  155. package/src/prover/prep/enabled-axioms.ts +22 -20
  156. package/src/prover/prep/fingerprint.ts +2 -21
  157. package/src/prover/prep/level-comparison.ts +8 -12
  158. package/src/prover/prep/md5.ts +0 -2
  159. package/src/prover/prep/methods.ts +189 -86
  160. package/src/prover/prep/normalize.ts +42 -37
  161. package/src/prover/prove-worker.ts +0 -2
  162. package/src/prover/prove.ts +398 -133
  163. package/src/prover/ptl/decide.ts +96 -56
  164. package/src/prover/ptl/encode.ts +15 -38
  165. package/src/prover/ptl/sat.ts +24 -32
  166. package/src/prover/ptl/tableau.ts +40 -28
  167. package/src/prover/smt/arithmetic.ts +310 -0
  168. package/src/prover/smt/axioms.ts +12 -15
  169. package/src/prover/smt/context.ts +60 -32
  170. package/src/prover/smt/data.ts +517 -401
  171. package/src/prover/smt/encode.ts +155 -85
  172. package/src/prover/smt/extensionality.ts +5 -13
  173. package/src/prover/smt/flatten.ts +7 -28
  174. package/src/prover/smt/format.ts +33 -14
  175. package/src/prover/smt/instances.ts +7 -11
  176. package/src/prover/smt/layout.ts +91 -0
  177. package/src/prover/smt/rewrite.ts +1026 -658
  178. package/src/prover/smt/simplify.ts +441 -0
  179. package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
  180. package/src/prover/smt/solver/ackr-helper.ts +179 -0
  181. package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
  182. package/src/prover/smt/solver/act-cache.ts +0 -16
  183. package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
  184. package/src/prover/smt/solver/aig-tactic.ts +52 -0
  185. package/src/prover/smt/solver/aig.ts +889 -0
  186. package/src/prover/smt/solver/arith-rewriter.ts +615 -53
  187. package/src/prover/smt/solver/arith-terms.ts +121 -0
  188. package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
  189. package/src/prover/smt/solver/array-rewriter.ts +309 -0
  190. package/src/prover/smt/solver/array.ts +1 -3
  191. package/src/prover/smt/solver/asserted-formulas.ts +87 -58
  192. package/src/prover/smt/solver/ast-lt.ts +166 -22
  193. package/src/prover/smt/solver/ast-util.ts +160 -7
  194. package/src/prover/smt/solver/ast.ts +1424 -180
  195. package/src/prover/smt/solver/auf-solver.ts +7 -44
  196. package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
  197. package/src/prover/smt/solver/bit-blaster.ts +871 -0
  198. package/src/prover/smt/solver/bound-manager.ts +196 -0
  199. package/src/prover/smt/solver/bound-simplifier.ts +600 -0
  200. package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
  201. package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
  202. package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
  203. package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
  204. package/src/prover/smt/solver/bv1-blast.ts +214 -0
  205. package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
  206. package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
  207. package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
  208. package/src/prover/smt/solver/card2bv.ts +110 -0
  209. package/src/prover/smt/solver/case-split-queue.ts +0 -10
  210. package/src/prover/smt/solver/cg-table.ts +39 -42
  211. package/src/prover/smt/solver/check-logic.ts +330 -0
  212. package/src/prover/smt/solver/clause.ts +0 -27
  213. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
  214. package/src/prover/smt/solver/conflict-resolution.ts +78 -11
  215. package/src/prover/smt/solver/context.ts +519 -175
  216. package/src/prover/smt/solver/ctx-simplify.ts +33 -50
  217. package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
  218. package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
  219. package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
  220. package/src/prover/smt/solver/demodulator.ts +786 -0
  221. package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
  222. package/src/prover/smt/solver/der.ts +39 -30
  223. package/src/prover/smt/solver/diff-neq.ts +206 -0
  224. package/src/prover/smt/solver/distribute-forall.ts +57 -0
  225. package/src/prover/smt/solver/dom-simplify.ts +511 -0
  226. package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
  227. package/src/prover/smt/solver/dyn-ack.ts +0 -11
  228. package/src/prover/smt/solver/e-matching.ts +9 -41
  229. package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
  230. package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
  231. package/src/prover/smt/solver/enode.ts +100 -23
  232. package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
  233. package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
  234. package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
  235. package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
  236. package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
  237. package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
  238. package/src/prover/smt/solver/euf/array-solver.ts +306 -0
  239. package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
  240. package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
  241. package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
  242. package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
  243. package/src/prover/smt/solver/euf/egraph.ts +907 -0
  244. package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
  245. package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
  246. package/src/prover/smt/solver/euf/mam.ts +1050 -0
  247. package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
  248. package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
  249. package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
  250. package/src/prover/smt/solver/euf/q-solver.ts +361 -0
  251. package/src/prover/smt/solver/euf/th-solver.ts +335 -0
  252. package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
  253. package/src/prover/smt/solver/expr-ref.ts +0 -5
  254. package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
  255. package/src/prover/smt/solver/expr2polynomial.ts +146 -0
  256. package/src/prover/smt/solver/factor.ts +141 -0
  257. package/src/prover/smt/solver/fd-solver.ts +265 -0
  258. package/src/prover/smt/solver/fingerprints.ts +15 -26
  259. package/src/prover/smt/solver/fix-dl-var.ts +148 -0
  260. package/src/prover/smt/solver/flat-literals.ts +0 -9
  261. package/src/prover/smt/solver/fm-tactic.ts +884 -0
  262. package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
  263. package/src/prover/smt/solver/fpa-rewriter.ts +640 -0
  264. package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
  265. package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
  266. package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
  267. package/src/prover/smt/solver/goal.ts +176 -28
  268. package/src/prover/smt/solver/goal2nlsat.ts +189 -0
  269. package/src/prover/smt/solver/guard-set.ts +219 -0
  270. package/src/prover/smt/solver/hash.ts +0 -9
  271. package/src/prover/smt/solver/hashtable.ts +26 -23
  272. package/src/prover/smt/solver/inf-eps.ts +63 -0
  273. package/src/prover/smt/solver/inj-axiom.ts +101 -0
  274. package/src/prover/smt/solver/internalizer.ts +112 -132
  275. package/src/prover/smt/solver/lackr.ts +381 -0
  276. package/src/prover/smt/solver/lbool.ts +0 -2
  277. package/src/prover/smt/solver/lia2card.ts +268 -0
  278. package/src/prover/smt/solver/lia2pb.ts +154 -0
  279. package/src/prover/smt/solver/literal.ts +0 -4
  280. package/src/prover/smt/solver/logic-tactics.ts +345 -0
  281. package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
  282. package/src/prover/smt/solver/lp/constraints.ts +1 -8
  283. package/src/prover/smt/solver/lp/containers.ts +11 -30
  284. package/src/prover/smt/solver/lp/core-solver.ts +23 -29
  285. package/src/prover/smt/solver/lp/cross-nested.ts +5 -20
  286. package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
  287. package/src/prover/smt/solver/lp/dependency.ts +0 -5
  288. package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
  289. package/src/prover/smt/solver/lp/explanation.ts +0 -6
  290. package/src/prover/smt/solver/lp/gomory.ts +8 -22
  291. package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
  292. package/src/prover/smt/solver/lp/hnf.ts +10 -28
  293. package/src/prover/smt/solver/lp/int-cube.ts +17 -39
  294. package/src/prover/smt/solver/lp/int-solver.ts +3 -35
  295. package/src/prover/smt/solver/lp/lar-solver.ts +69 -82
  296. package/src/prover/smt/solver/lp/lar-term.ts +0 -5
  297. package/src/prover/smt/solver/lp/lp-settings.ts +0 -14
  298. package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
  299. package/src/prover/smt/solver/lp/nex-creator.ts +4 -28
  300. package/src/prover/smt/solver/lp/nex.ts +0 -6
  301. package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
  302. package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
  303. package/src/prover/smt/solver/lp/nla-core.ts +91 -135
  304. package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
  305. package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
  306. package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
  307. package/src/prover/smt/solver/lp/nla-grobner.ts +22 -72
  308. package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
  309. package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
  310. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
  311. package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
  312. package/src/prover/smt/solver/lp/nla-order.ts +0 -13
  313. package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
  314. package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
  315. package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
  316. package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
  317. package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
  318. package/src/prover/smt/solver/lp/nla-types.ts +0 -12
  319. package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
  320. package/src/prover/smt/solver/lp/nra-solver.ts +123 -112
  321. package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
  322. package/src/prover/smt/solver/lp/pdd-interval.ts +0 -3
  323. package/src/prover/smt/solver/lp/pdd-simplifier.ts +1 -14
  324. package/src/prover/smt/solver/lp/pdd-solver.ts +2 -33
  325. package/src/prover/smt/solver/lp/pdd.ts +7 -70
  326. package/src/prover/smt/solver/lp/random-updater.ts +0 -9
  327. package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
  328. package/src/prover/smt/solver/lp/union-find.ts +5 -5
  329. package/src/prover/smt/solver/macro-finder.ts +530 -0
  330. package/src/prover/smt/solver/mam-compiler.ts +129 -139
  331. package/src/prover/smt/solver/mam-interpreter.ts +0 -21
  332. package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
  333. package/src/prover/smt/solver/max-cliques.ts +105 -0
  334. package/src/prover/smt/solver/maxcore.ts +309 -0
  335. package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
  336. package/src/prover/smt/solver/maxlex.ts +115 -0
  337. package/src/prover/smt/solver/maxsmt-base.ts +105 -0
  338. package/src/prover/smt/solver/maxsmt.ts +92 -0
  339. package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
  340. package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
  341. package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
  342. package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
  343. package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
  344. package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
  345. package/src/prover/smt/solver/model-based-opt.ts +844 -0
  346. package/src/prover/smt/solver/model-checker.ts +19 -62
  347. package/src/prover/smt/solver/model-evaluator.ts +190 -40
  348. package/src/prover/smt/solver/model-finder.ts +14 -32
  349. package/src/prover/smt/solver/model-generator.ts +56 -40
  350. package/src/prover/smt/solver/model-macro-solver.ts +60 -114
  351. package/src/prover/smt/solver/model-printer.ts +214 -0
  352. package/src/prover/smt/solver/mpf.ts +711 -0
  353. package/src/prover/smt/solver/mus.ts +51 -0
  354. package/src/prover/smt/solver/muz/dl-context.ts +404 -0
  355. package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
  356. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
  357. package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
  358. package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
  359. package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
  360. package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
  361. package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
  362. package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
  363. package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
  364. package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
  365. package/src/prover/smt/solver/muz/hnf.ts +201 -0
  366. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
  367. package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
  368. package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
  369. package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
  370. package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
  371. package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
  372. package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
  373. package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
  374. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
  375. package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
  376. package/src/prover/smt/solver/muz/substitution.ts +203 -0
  377. package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
  378. package/src/prover/smt/solver/nlqsat.ts +484 -0
  379. package/src/prover/smt/solver/nlsat/algebraic.ts +177 -160
  380. package/src/prover/smt/solver/nlsat/atoms.ts +24 -24
  381. package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
  382. package/src/prover/smt/solver/nlsat/explain.ts +65 -69
  383. package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
  384. package/src/prover/smt/solver/nlsat/levelwise.ts +48 -135
  385. package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
  386. package/src/prover/smt/solver/nlsat/polynomial.ts +29 -161
  387. package/src/prover/smt/solver/nlsat/solver.ts +241 -110
  388. package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
  389. package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
  390. package/src/prover/smt/solver/nlsat/types.ts +0 -9
  391. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -47
  392. package/src/prover/smt/solver/nlsat/upolynomial.ts +10 -93
  393. package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
  394. package/src/prover/smt/solver/nnf.ts +107 -60
  395. package/src/prover/smt/solver/normalize-bounds.ts +53 -0
  396. package/src/prover/smt/solver/occf.ts +97 -0
  397. package/src/prover/smt/solver/opt-context.ts +787 -0
  398. package/src/prover/smt/solver/opt-nlsat.ts +375 -0
  399. package/src/prover/smt/solver/opt-pareto.ts +282 -0
  400. package/src/prover/smt/solver/opt-preprocess.ts +101 -0
  401. package/src/prover/smt/solver/opt-solver.ts +308 -0
  402. package/src/prover/smt/solver/opt-value.ts +55 -0
  403. package/src/prover/smt/solver/optsmt.ts +692 -0
  404. package/src/prover/smt/solver/parallel-tactic.ts +299 -0
  405. package/src/prover/smt/solver/pattern-inference.ts +21 -26
  406. package/src/prover/smt/solver/pb-rewriter.ts +284 -0
  407. package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
  408. package/src/prover/smt/solver/poly-rewriter.ts +204 -79
  409. package/src/prover/smt/solver/probes.ts +512 -0
  410. package/src/prover/smt/solver/propagate-values.ts +37 -30
  411. package/src/prover/smt/solver/proto-model.ts +650 -66
  412. package/src/prover/smt/solver/pull-quant.ts +28 -23
  413. package/src/prover/smt/solver/purify-arith.ts +632 -0
  414. package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
  415. package/src/prover/smt/solver/qe-lite-der.ts +2 -31
  416. package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
  417. package/src/prover/smt/solver/qe-lite.ts +39 -49
  418. package/src/prover/smt/solver/qe-mbp.ts +270 -0
  419. package/src/prover/smt/solver/qe.ts +1498 -0
  420. package/src/prover/smt/solver/qel.ts +25 -0
  421. package/src/prover/smt/solver/qi-queue.ts +0 -16
  422. package/src/prover/smt/solver/qsat.ts +814 -0
  423. package/src/prover/smt/solver/quant-hoist.ts +196 -0
  424. package/src/prover/smt/solver/quant-tactics.ts +17 -74
  425. package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
  426. package/src/prover/smt/solver/quantifier-manager.ts +8 -23
  427. package/src/prover/smt/solver/quasi-macros.ts +243 -0
  428. package/src/prover/smt/solver/random-gen.ts +0 -2
  429. package/src/prover/smt/solver/rational.ts +45 -8
  430. package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
  431. package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
  432. package/src/prover/smt/solver/reduce-args.ts +225 -0
  433. package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
  434. package/src/prover/smt/solver/ref-vector.ts +0 -6
  435. package/src/prover/smt/solver/relevancy.ts +2 -16
  436. package/src/prover/smt/solver/rewriter-tpl.ts +52 -129
  437. package/src/prover/smt/solver/rewriter.ts +477 -120
  438. package/src/prover/smt/solver/rlimit.ts +39 -21
  439. package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
  440. package/src/prover/smt/solver/sat/big.ts +177 -0
  441. package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
  442. package/src/prover/smt/solver/sat/clause.ts +203 -0
  443. package/src/prover/smt/solver/sat/cleaner.ts +94 -0
  444. package/src/prover/smt/solver/sat/config.ts +122 -0
  445. package/src/prover/smt/solver/sat/consequences.ts +203 -0
  446. package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
  447. package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
  448. package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
  449. package/src/prover/smt/solver/sat/model-converter.ts +136 -0
  450. package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
  451. package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
  452. package/src/prover/smt/solver/sat/probing.ts +170 -0
  453. package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
  454. package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
  455. package/src/prover/smt/solver/sat/scc.ts +142 -0
  456. package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
  457. package/src/prover/smt/solver/sat/solver.ts +2127 -0
  458. package/src/prover/smt/solver/sat/var-queue.ts +117 -0
  459. package/src/prover/smt/solver/sat/watch-list.ts +140 -0
  460. package/src/prover/smt/solver/search-tree.ts +284 -0
  461. package/src/prover/smt/solver/seq-axioms.ts +1010 -0
  462. package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
  463. package/src/prover/smt/solver/seq-derive.ts +1301 -0
  464. package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
  465. package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
  466. package/src/prover/smt/solver/seq-factory.ts +89 -0
  467. package/src/prover/smt/solver/seq-monadic.ts +728 -0
  468. package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
  469. package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
  470. package/src/prover/smt/solver/seq-re-util.ts +758 -0
  471. package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
  472. package/src/prover/smt/solver/seq-regex-live.ts +200 -0
  473. package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
  474. package/src/prover/smt/solver/seq-skolem.ts +317 -0
  475. package/src/prover/smt/solver/seq-subset.ts +165 -0
  476. package/src/prover/smt/solver/seq-view-witness.ts +353 -0
  477. package/src/prover/smt/solver/smt-consequences.ts +297 -0
  478. package/src/prover/smt/solver/smt-kernel.ts +83 -0
  479. package/src/prover/smt/solver/smt-logics.ts +66 -0
  480. package/src/prover/smt/solver/smt-setup.ts +496 -0
  481. package/src/prover/smt/solver/smt2-printer.ts +765 -0
  482. package/src/prover/smt/solver/smtlib-parser.ts +3140 -365
  483. package/src/prover/smt/solver/smtlib-script.ts +1631 -0
  484. package/src/prover/smt/solver/solve-eqs.ts +929 -0
  485. package/src/prover/smt/solver/solver.ts +119 -39
  486. package/src/prover/smt/solver/sort.ts +1 -5
  487. package/src/prover/smt/solver/static-features.ts +314 -0
  488. package/src/prover/smt/solver/sticky-generations.ts +0 -6
  489. package/src/prover/smt/solver/tactic.ts +1986 -0
  490. package/src/prover/smt/solver/term-enumeration.ts +205 -0
  491. package/src/prover/smt/solver/theory-array.ts +1240 -0
  492. package/src/prover/smt/solver/theory-bv.ts +1200 -0
  493. package/src/prover/smt/solver/theory-char.ts +355 -0
  494. package/src/prover/smt/solver/theory-datatype.ts +598 -0
  495. package/src/prover/smt/solver/theory-finite-set.ts +30 -0
  496. package/src/prover/smt/solver/theory-fpa.ts +389 -0
  497. package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
  498. package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
  499. package/src/prover/smt/solver/theory-lra-final-check.ts +59 -91
  500. package/src/prover/smt/solver/theory-lra-internalize.ts +94 -53
  501. package/src/prover/smt/solver/theory-lra-model.ts +23 -53
  502. package/src/prover/smt/solver/theory-lra-propagate.ts +24 -40
  503. package/src/prover/smt/solver/theory-lra-state.ts +6 -27
  504. package/src/prover/smt/solver/theory-lra.ts +188 -8
  505. package/src/prover/smt/solver/theory-pb.ts +934 -0
  506. package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
  507. package/src/prover/smt/solver/theory-recfun.ts +307 -0
  508. package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
  509. package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
  510. package/src/prover/smt/solver/theory-seq-state.ts +871 -0
  511. package/src/prover/smt/solver/theory-seq.ts +961 -0
  512. package/src/prover/smt/solver/theory.ts +189 -0
  513. package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
  514. package/src/prover/smt/solver/var-subst.ts +37 -39
  515. package/src/prover/smt/table.ts +3 -10
  516. package/src/prover/smt/types.ts +146 -0
  517. package/src/prover/tlapm/cache.ts +67 -41
  518. package/src/prover/tlapm/ocaml-marshal.ts +19 -21
  519. package/src/prover/tlapm/tlapm.ts +21 -20
  520. package/src/prover/tlapm-library.ts +3208 -0
  521. package/src/prover/verdict.ts +9 -2
  522. package/src/prover/zenon/check/check.ts +1 -11
  523. package/src/prover/zenon/check/definitions.ts +5 -15
  524. package/src/prover/zenon/check/equality.ts +0 -8
  525. package/src/prover/zenon/check/functions.ts +0 -4
  526. package/src/prover/zenon/check/keys.ts +0 -7
  527. package/src/prover/zenon/check/propositional.ts +0 -3
  528. package/src/prover/zenon/check/records.ts +1 -6
  529. package/src/prover/zenon/check/relations.ts +2 -14
  530. package/src/prover/zenon/check/rewrites.ts +2 -21
  531. package/src/prover/zenon/check/sets.ts +40 -61
  532. package/src/prover/zenon/check/terms.ts +1 -19
  533. package/src/prover/zenon/check/tla.ts +0 -6
  534. package/src/prover/zenon/decide.ts +10 -19
  535. package/src/prover/zenon/encode.ts +0 -9
  536. package/src/prover/zenon/eqrel.ts +2 -15
  537. package/src/prover/zenon/equality-rules.ts +0 -6
  538. package/src/prover/zenon/expr.ts +8 -28
  539. package/src/prover/zenon/index-table.ts +26 -59
  540. package/src/prover/zenon/isar-case.ts +8 -20
  541. package/src/prover/zenon/isar.ts +35 -65
  542. package/src/prover/zenon/limits.ts +0 -4
  543. package/src/prover/zenon/llproof.ts +2 -22
  544. package/src/prover/zenon/mltoll.ts +66 -106
  545. package/src/prover/zenon/node.ts +20 -15
  546. package/src/prover/zenon/ocaml.ts +1 -17
  547. package/src/prover/zenon/parse.ts +9 -13
  548. package/src/prover/zenon/phrase.ts +1 -13
  549. package/src/prover/zenon/proof.ts +0 -11
  550. package/src/prover/zenon/propositional-rules.ts +0 -7
  551. package/src/prover/zenon/rules.ts +2 -8
  552. package/src/prover/zenon/search.ts +11 -35
  553. package/src/prover/zenon/tla/functions.ts +59 -33
  554. package/src/prover/zenon/tla/llproof.ts +67 -78
  555. package/src/prover/zenon/tla/records.ts +57 -35
  556. package/src/prover/zenon/tla/rewrites.ts +12 -21
  557. package/src/prover/zenon/tla/sets.ts +88 -59
  558. package/src/prover/zenon/tla/terms.ts +0 -8
  559. package/src/prover/zenon/tla/tla.ts +66 -66
  560. package/src/randomization.ts +81 -35
  561. package/src/resolve.ts +67 -185
  562. package/src/runtime.ts +26 -22
  563. package/src/sany/builtins.ts +2 -5
  564. package/src/sany/generation.ts +394 -0
  565. package/src/sany/generator-def-entries.ts +210 -0
  566. package/src/sany/generator-definitions.ts +686 -0
  567. package/src/sany/generator-expressions.ts +1100 -0
  568. package/src/sany/generator-proofs.ts +662 -0
  569. package/src/sany/generator.ts +191 -2764
  570. package/src/sany/levels.ts +5 -35
  571. package/src/sany/lexer.ts +58 -77
  572. package/src/sany/linter.ts +0 -10
  573. package/src/sany/modules.ts +1 -5
  574. package/src/sany/nodes.ts +5 -43
  575. package/src/sany/parse-error.ts +39 -117
  576. package/src/sany/report.ts +32 -69
  577. package/src/sany/selectors.ts +49 -76
  578. package/src/sany/source.ts +1 -17
  579. package/src/sany/xml.ts +35 -117
  580. package/src/search.ts +671 -169
  581. package/src/simulate.ts +712 -0
  582. package/src/spec-description.ts +192 -100
  583. package/src/standard-definitions.ts +4 -4
  584. package/src/standard-modules.ts +264 -95
  585. package/src/state-graph.ts +52 -33
  586. package/src/subexpressions.ts +69 -52
  587. package/src/substitution-levels.ts +7 -7
  588. package/src/successors.ts +267 -100
  589. package/src/symmetry.ts +35 -27
  590. package/src/tableau.ts +29 -26
  591. package/src/tlc/fingerprint.ts +267 -79
  592. package/src/tlc/jar-data.ts +112 -6
  593. package/src/tlc/messages.ts +125 -54
  594. package/src/tlc/order.ts +39 -69
  595. package/src/tlc/random.ts +37 -49
  596. package/src/tlc/replay.ts +553 -228
  597. package/src/tlc/summary.ts +64 -60
  598. package/src/tlc/tlc-operators.ts +78 -44
  599. package/src/tlc/tlcext-operators.ts +171 -122
  600. package/src/tlc/trace-spec.ts +249 -0
  601. package/src/tlc/value-stream.ts +139 -0
  602. package/src/tlc/version.ts +1 -4
  603. package/src/transfer.ts +22 -25
  604. package/src/typed-tier.ts +6535 -0
  605. package/src/typescript/actions.ts +479 -0
  606. package/src/typescript/collections.ts +614 -0
  607. package/src/typescript/compile.ts +63 -0
  608. package/src/typescript/context.ts +94 -0
  609. package/src/typescript/emit.ts +121 -0
  610. package/src/typescript/expressions.ts +496 -0
  611. package/src/typescript/formula.ts +154 -0
  612. package/src/typescript/functions.ts +284 -0
  613. package/src/typescript/model.ts +162 -0
  614. package/src/typescript/names.ts +114 -0
  615. package/src/typescript/program.ts +48 -0
  616. package/src/typescript/properties.ts +139 -0
  617. package/src/typescript/scope.ts +112 -0
  618. package/src/typescript/steps.ts +167 -0
  619. package/src/typescript/types.ts +171 -0
  620. package/src/values.ts +832 -484
  621. package/src/worker.ts +7 -8
  622. package/src/prover/isabelle/isar/statement.ts +0 -57
  623. package/src/prover/smt/solver/z3-license.txt +0 -10
  624. package/src/prover/tlaps-module.ts +0 -510
  625. package/src/prover/zenon/LICENSE +0 -32
@@ -1,10 +1,5 @@
1
- // Ported from Zenon's mltoll.ml, as shipped in tlapm. Copyright 2004 INRIA, see LICENSE.
2
- //
3
- // Translates the proof that the search finds into a low-level proof: the derived rules expand into
4
- // core rules, and each proof that the search reused becomes a lemma.
5
-
6
1
  import { TlaZenonError } from "../../errors";
7
- import type { Direction, Origin, Relations } from "./eqrel";
2
+ import type { Direction, Origin, RelationProperty, Relations } from "./eqrel";
8
3
  import {
9
4
  difference,
10
5
  union,
@@ -13,13 +8,12 @@ import {
13
8
  type Expressions,
14
9
  type VarExpr,
15
10
  } from "./expr";
16
- import { connect, type Connective, type Lemma, type LlProof, type LlRule } from "./llproof";
11
+ import type { Connective, Lemma, LlProof, LlRule } from "./llproof";
17
12
  import type { Definition, Phrase } from "./parse";
18
13
  import type { Rule } from "./proof";
19
14
  import { getTlaLlProof } from "./tla/llproof";
20
15
 
21
- // The search's proofs, and the rule that only the translation builds.
22
- export type MlRule = Rule | { name: "notall" | "notallex"; args: [Expr] };
16
+ type MlRule = Rule | { name: "notall" | "notallex"; args: [Expr] };
23
17
 
24
18
  export interface MlProof {
25
19
  conclusions: Expr[];
@@ -27,22 +21,15 @@ export interface MlProof {
27
21
  subproofs: MlProof[];
28
22
  }
29
23
 
30
- // A translated proof, with the hypotheses it uses that aren't conclusions of the node.
31
24
  export type Translated = [LlProof, Expr[]];
32
25
 
33
26
  interface TranslateContext {
34
27
  exprs: Expressions;
35
- // Zenon's Index.get_number, which also names the formulas in the Isar output.
36
28
  getNumber: (expression: Expr) => number;
37
- // The proofs that the search reused, which Zenon counts in mlrefc.
38
29
  sharedProofs: ReadonlySet<MlProof>;
39
30
  relations: Relations;
40
31
  }
41
32
 
42
- type RelationProperty = "reflexive" | "symmetric" | "transitive";
43
-
44
- // Zenon's Eqrel.hyp_kind: how to prove a hypothesis about a relation. A relation is also
45
- // symmetric or transitive when it's reflexive and transitive in the symmetric sense.
46
33
  type HypothesisKind =
47
34
  | { kind: "reflexive"; origin: Origin }
48
35
  | { kind: "symmetric"; origin: Origin }
@@ -61,7 +48,6 @@ export const isMetaName = (name: string) => name.startsWith(META_PREFIX);
61
48
 
62
49
  const isAlphanumeric = (char: string) => /^[A-Za-z0-9]$/.test(char);
63
50
 
64
- // Zenon's type_to_ident.
65
51
  const toIdentifier = (type: string) =>
66
52
  [...type]
67
53
  .map((char) =>
@@ -79,7 +65,6 @@ const getSingle = (proof: MlProof) => {
79
65
  return proof.subproofs[0];
80
66
  };
81
67
 
82
- // Zenon's Mlproof.make_node: the node's conclusions and those its subproofs leave open.
83
68
  const makeNode = (
84
69
  conclusions: Expr[],
85
70
  rule: MlRule,
@@ -119,7 +104,6 @@ const isDerived = (rule: MlRule) => {
119
104
  }
120
105
  };
121
106
 
122
- // The rules that tr_rule translates directly: the core rules and the extension rules named "".
123
107
  const CORE_RULES = new Set<string>([
124
108
  "close",
125
109
  "false",
@@ -150,7 +134,6 @@ const CORE_RULES = new Set<string>([
150
134
  "stringdiffrr",
151
135
  ]);
152
136
 
153
- // Zenon's Mltoll.translate: the lemmas in the order they were made, then the theorem.
154
137
  export const translateProof = (
155
138
  context: TranslateContext,
156
139
  phrases: Phrase[],
@@ -158,14 +141,11 @@ export const translateProof = (
158
141
  ): Lemma[] => {
159
142
  const exprs = context.exprs;
160
143
  const translatedExprs = new Map<Expr, Expr>();
161
- const lemmaNumbers = new Map<MlProof, number>();
162
- const lemmaTable = new Map<string, [Lemma, Expr[]]>();
144
+ const lemmaTable = new Map<MlProof, [Lemma, Expr[]]>();
163
145
  const lemmas: Lemma[] = [];
164
- const getLemmaName = (number: number) => `${LEMMA_PREFIX}${number}_`;
165
146
 
166
147
  const equal = (left: Expr, right: Expr) => exprs.eapp("=", [left, right]);
167
148
 
168
- // Zenon's tr_expr: metavariables become variables named after their quantifier.
169
149
  const translateExpr = (expression: Expr): Expr => {
170
150
  if (expression.metas.length === 0) return expression;
171
151
  const cached = translatedExprs.get(expression);
@@ -189,13 +169,13 @@ export const translateProof = (
189
169
  case "imply":
190
170
  case "equiv": {
191
171
  const right = translateExpr(expression.args[1]);
192
- return connect(exprs, expression.kind, translateExpr(expression.args[0]), right);
172
+ return exprs.binary(expression.kind, translateExpr(expression.args[0]), right);
193
173
  }
194
174
  case "all":
195
175
  case "ex":
196
176
  case "tau":
197
177
  case "lam":
198
- return makeBinder(
178
+ return exprs.binder(
199
179
  expression.kind,
200
180
  expression.args[0],
201
181
  expression.symbol,
@@ -209,41 +189,31 @@ export const translateProof = (
209
189
  return result;
210
190
  };
211
191
 
212
- const makeBinder = (kind: BinderExpr["kind"], variable: VarExpr, type: string, body: Expr) =>
213
- kind === "all"
214
- ? exprs.eall(variable, type, body)
215
- : kind === "ex"
216
- ? exprs.eex(variable, type, body)
217
- : kind === "tau"
218
- ? exprs.etau(variable, type, body)
219
- : exprs.elam(variable, type, body);
220
-
221
192
  const translateRule = (rule: MlRule): LlRule => {
222
- const tr = translateExpr;
223
193
  switch (rule.name) {
224
194
  case "close":
225
- return { kind: "axiom", formula: tr(rule.args[0]) };
195
+ return { kind: "axiom", formula: translateExpr(rule.args[0]) };
226
196
  case "close_refl":
227
- return { kind: "noteq", term: tr(rule.args[0]) };
197
+ return { kind: "noteq", term: translateExpr(rule.args[0]) };
228
198
  case "close_sym": {
229
- const right = tr(rule.args[1]);
230
- return { kind: "eqsym", left: tr(rule.args[0]), right };
199
+ const right = translateExpr(rule.args[1]);
200
+ return { kind: "eqsym", left: translateExpr(rule.args[0]), right };
231
201
  }
232
202
  case "false":
233
203
  return { kind: "false" };
234
204
  case "not_true":
235
205
  return { kind: "nottrue" };
236
206
  case "not_not":
237
- return { kind: "notnot", formula: tr(rule.args[0]) };
207
+ return { kind: "notnot", formula: translateExpr(rule.args[0]) };
238
208
  case "and":
239
209
  case "or":
240
210
  case "impl":
241
211
  case "equiv": {
242
- const right = tr(rule.args[1]);
212
+ const right = translateExpr(rule.args[1]);
243
213
  return {
244
214
  kind: "connect",
245
215
  connective: RULE_CONNECTIVES[rule.name],
246
- left: tr(rule.args[0]),
216
+ left: translateExpr(rule.args[0]),
247
217
  right,
248
218
  };
249
219
  }
@@ -251,57 +221,59 @@ export const translateProof = (
251
221
  case "not_impl":
252
222
  case "not_and":
253
223
  case "not_equiv": {
254
- const right = tr(rule.args[1]);
224
+ const right = translateExpr(rule.args[1]);
255
225
  return {
256
226
  kind: "notconnect",
257
227
  connective: RULE_CONNECTIVES[rule.name],
258
- left: tr(rule.args[0]),
228
+ left: translateExpr(rule.args[0]),
259
229
  right,
260
230
  };
261
231
  }
262
232
  case "ex": {
263
233
  const quantified = getBinder(rule.args[0], "ex");
264
- const term = tr(exprs.etau(quantified.args[0], quantified.symbol, quantified.args[1]));
265
- return { kind: "ex", quantified: tr(quantified), term };
234
+ const term = translateExpr(
235
+ exprs.etau(quantified.args[0], quantified.symbol, quantified.args[1]),
236
+ );
237
+ return { kind: "ex", quantified: translateExpr(quantified), term };
266
238
  }
267
239
  case "all": {
268
- const term = tr(rule.args[1]);
269
- return { kind: "all", quantified: tr(rule.args[0]), term };
240
+ const term = translateExpr(rule.args[1]);
241
+ return { kind: "all", quantified: translateExpr(rule.args[0]), term };
270
242
  }
271
243
  case "not_ex": {
272
244
  const negation = rule.args[0];
273
245
  if (negation.kind !== "not") throw new TlaZenonError("Zenon: not_ex without a negation");
274
- const term = tr(rule.args[1]);
275
- return { kind: "notex", quantified: tr(negation.args[0]), term };
246
+ const term = translateExpr(rule.args[1]);
247
+ return { kind: "notex", quantified: translateExpr(negation.args[0]), term };
276
248
  }
277
249
  case "p_not_p": {
278
- const negative = tr(rule.args[1]);
279
- return { kind: "pnotp", positive: tr(rule.args[0]), negative };
250
+ const negative = translateExpr(rule.args[1]);
251
+ return { kind: "pnotp", positive: translateExpr(rule.args[0]), negative };
280
252
  }
281
253
  case "not_equal": {
282
- const right = tr(rule.args[1]);
283
- return { kind: "notequal", left: tr(rule.args[0]), right };
254
+ const right = translateExpr(rule.args[1]);
255
+ return { kind: "notequal", left: translateExpr(rule.args[0]), right };
284
256
  }
285
257
  case "definition": {
286
258
  if (rule.definition.kind !== "real")
287
259
  throw new TlaZenonError("Zenon: a pseudo-definition in tr_rule");
288
- const unfolded = tr(rule.args[1]);
260
+ const unfolded = translateExpr(rule.args[1]);
289
261
  return {
290
262
  kind: "definition",
291
263
  name: rule.definition.name,
292
- folded: tr(rule.args[0]),
264
+ folded: translateExpr(rule.args[0]),
293
265
  unfolded,
294
266
  };
295
267
  }
296
268
  case "cut":
297
- return { kind: "cut", formula: tr(rule.args[0]) };
269
+ return { kind: "cut", formula: translateExpr(rule.args[0]) };
298
270
  case "congruence_lr":
299
271
  case "congruence_rl": {
300
- const right = tr(rule.args[2]);
301
- const left = tr(rule.args[1]);
272
+ const right = translateExpr(rule.args[2]);
273
+ const left = translateExpr(rule.args[1]);
302
274
  return {
303
275
  kind: rule.name === "congruence_lr" ? "congruencelr" : "congruencerl",
304
- context: tr(rule.args[0]),
276
+ context: translateExpr(rule.args[0]),
305
277
  left,
306
278
  right,
307
279
  };
@@ -309,10 +281,10 @@ export const translateProof = (
309
281
  case "notall": {
310
282
  const negation = rule.args[0];
311
283
  const quantified = getBinder(negation.kind === "not" ? negation.args[0] : negation, "all");
312
- const term = tr(
284
+ const term = translateExpr(
313
285
  exprs.etau(quantified.args[0], quantified.symbol, exprs.enot(quantified.args[1])),
314
286
  );
315
- return { kind: "notall", quantified: tr(quantified), term };
287
+ return { kind: "notall", quantified: translateExpr(quantified), term };
316
288
  }
317
289
  case "notallex": {
318
290
  const lambda = getBinder(rule.args[0], "lam");
@@ -344,7 +316,10 @@ export const translateProof = (
344
316
  case "stringdifflr":
345
317
  case "stringdiffrl":
346
318
  case "stringdiffrr": {
347
- const [first, firstValue, second, secondValue] = rule.args;
319
+ const first = rule.args[0];
320
+ const firstValue = rule.args[1];
321
+ const second = rule.args[2];
322
+ const secondValue = rule.args[3];
348
323
  const isFirstLeft = rule.name === "stringdiffll" || rule.name === "stringdifflr";
349
324
  const isSecondLeft = rule.name === "stringdiffll" || rule.name === "stringdiffrl";
350
325
  const firstConclusion = isFirstLeft ? equal(first, firstValue) : equal(firstValue, first);
@@ -366,7 +341,6 @@ export const translateProof = (
366
341
  }
367
342
  };
368
343
 
369
- // Zenon's get_params: the free taus of a lemma's conclusions, each with its type.
370
344
  const getParams = (accumulated: [string, Expr][], expression: Expr): [string, Expr][] => {
371
345
  const merge = (type: string, term: Expr): [string, Expr][] =>
372
346
  accumulated.some((param) => param[1] === term) ? accumulated : [[type, term], ...accumulated];
@@ -385,8 +359,7 @@ export const translateProof = (
385
359
  };
386
360
 
387
361
  const getLemmaReference = (proof: MlProof): Translated => {
388
- const number = lemmaNumbers.get(proof);
389
- const entry = number === undefined ? undefined : lemmaTable.get(getLemmaName(number));
362
+ const entry = lemmaTable.get(proof);
390
363
  if (entry === undefined) throw new TlaZenonError("Zenon: a lemma that was never made");
391
364
  const lemma = entry[0];
392
365
  return [
@@ -400,19 +373,17 @@ export const translateProof = (
400
373
  };
401
374
 
402
375
  const makeLemma = (translated: LlProof, extras: Expr[], proof: MlProof) => {
403
- const number = lemmas.length + 1;
404
- lemmaNumbers.set(proof, number);
405
376
  const lemma = {
406
- name: getLemmaName(number),
377
+ name: `${LEMMA_PREFIX}${lemmas.length + 1}_`,
407
378
  params: translated.conclusions.reduce(getParams, []),
408
379
  proof: translated,
409
380
  };
410
- lemmaTable.set(lemma.name, [lemma, extras]);
381
+ lemmaTable.set(proof, [lemma, extras]);
411
382
  lemmas.push(lemma);
412
383
  };
413
384
 
414
385
  const translate = (proof: MlProof): Translated => {
415
- if (lemmaNumbers.has(proof)) return getLemmaReference(proof);
386
+ if (lemmaTable.has(proof)) return getLemmaReference(proof);
416
387
  const result = isDerived(proof.rule)
417
388
  ? translateDerived(proof)
418
389
  : ((): Translated => {
@@ -433,9 +404,8 @@ export const translateProof = (
433
404
  };
434
405
 
435
406
  const isSharedProof = (proof: MlProof) =>
436
- context.sharedProofs.has(proof) && !lemmaNumbers.has(proof);
407
+ context.sharedProofs.has(proof) && !lemmaTable.has(proof);
437
408
 
438
- // Zenon's get_sub: the subproofs, and the union of their extras from the right.
439
409
  const translateAll = (proofs: MlProof[]): [LlProof[], Expr[]] => {
440
410
  const translated = proofs.map(translate);
441
411
  return [
@@ -444,7 +414,6 @@ export const translateProof = (
444
414
  ];
445
415
  };
446
416
 
447
- // A node of recomp_conj, with the formulas it removes from its subproof's conclusions.
448
417
  const recompose = (
449
418
  conclusion: Expr,
450
419
  rule: LlRule,
@@ -518,12 +487,11 @@ export const translateProof = (
518
487
  }
519
488
  };
520
489
 
521
- // Zenon's recomp_disj: consumes the translated subproofs, one for each disjunct.
522
490
  const recompDisj = (subs: Translated[], formula: Expr): [LlProof, Expr[], Translated[]] => {
523
491
  const node = (
524
492
  conclusion: Expr,
525
493
  connectiveName: Connective,
526
- negated: boolean,
494
+ isNegated: boolean,
527
495
  left: Expr,
528
496
  right: Expr,
529
497
  first: [LlProof, Expr[], Translated[]],
@@ -540,7 +508,12 @@ export const translateProof = (
540
508
  difference(second[0].conclusions, [secondRemoved]),
541
509
  ),
542
510
  ),
543
- rule: { kind: negated ? "notconnect" : "connect", connective: connectiveName, left, right },
511
+ rule: {
512
+ kind: isNegated ? "notconnect" : "connect",
513
+ connective: connectiveName,
514
+ left,
515
+ right,
516
+ },
544
517
  subproofs: [first[0], second[0]],
545
518
  },
546
519
  difference(union(first[1], second[1]), [extra]),
@@ -643,7 +616,6 @@ export const translateProof = (
643
616
  return [subs[0][0], subs[0][1], subs.slice(1)];
644
617
  };
645
618
 
646
- // The constructors of Zenon's Mlproof, for the proofs that the translation builds.
647
619
  const makeClose = (formula: Expr) =>
648
620
  makeNode([formula, exprs.enot(formula)], { name: "close", args: [formula] }, [], []);
649
621
  const makeCloseRefl = (relation: string, term: Expr) =>
@@ -704,7 +676,6 @@ export const translateProof = (
704
676
  const instance = exprs.substitute([[binder.args[0], terms[0]]], binder.args[1]);
705
677
  return makeAll(quantified, terms[0], makeAlls(instance, terms.slice(1), subproof));
706
678
  };
707
- // Zenon's make_impls: the implications from `hypotheses` to `conclusion`, and their proof.
708
679
  const makeImplies = (
709
680
  hypotheses: Expr[],
710
681
  conclusion: Expr,
@@ -737,8 +708,6 @@ export const translateProof = (
737
708
  [first, second],
738
709
  );
739
710
 
740
- // Zenon's Eqrel.get_refl_hyp, get_sym_hyp and get_trans_hyp: the hypothesis that states a
741
- // property of a relation, which the translation proves from the hypotheses that implied it.
742
711
  const relationHypotheses = new Map<string, Expr>();
743
712
  const hypothesisKinds = new Map<Expr, HypothesisKind>();
744
713
  const getRelationHypothesis = (property: RelationProperty, relation: string) => {
@@ -795,7 +764,6 @@ export const translateProof = (
795
764
  return hypothesis;
796
765
  };
797
766
 
798
- // Zenon's inst_nall: the instance of a negated universal at its counterexample.
799
767
  const instantiateNegation = (negation: Expr): [Expr, Expr] => {
800
768
  if (negation.kind !== "not") throw new TlaZenonError("Zenon: inst_nall without a negation");
801
769
  const binder = getBinder(negation.args[0], "all");
@@ -804,7 +772,6 @@ export const translateProof = (
804
772
  return [exprs.substitute([[binder.args[0], witness]], body), witness];
805
773
  };
806
774
 
807
- // Zenon's decompose_disj: closes each literal of a disjunction with one of `forms`.
808
775
  const decomposeDisjunction = (formula: Expr, forms: Expr[]): MlProof => {
809
776
  const visit = (disjunct: Expr) => decomposeDisjunction(disjunct, forms);
810
777
  const getForm = (form: Expr) => {
@@ -867,8 +834,6 @@ export const translateProof = (
867
834
  }
868
835
  };
869
836
 
870
- // Zenon's decompose_conj: follows `directions` to the conjunct that states a property, and
871
- // instantiates the quantifiers at `variables` with `witnesses`, the others with metavariables.
872
837
  const decomposeConjunction = (
873
838
  position: number,
874
839
  formula: Expr,
@@ -986,8 +951,6 @@ export const translateProof = (
986
951
  return decomposeDisjunction(formula, forms);
987
952
  };
988
953
 
989
- // Zenon's Eqrel.get_proof: proves a relation hypothesis from the hypotheses that implied it,
990
- // and returns the proof with those hypotheses.
991
954
  const getRelationProof = (hypothesis: Expr): [MlProof, Expr[]] => {
992
955
  const kind = hypothesisKinds.get(hypothesis);
993
956
  if (kind === undefined)
@@ -1124,7 +1087,6 @@ export const translateProof = (
1124
1087
 
1125
1088
  const relate = (relation: string, left: Expr, right: Expr) => exprs.eapp(relation, [left, right]);
1126
1089
 
1127
- // Zenon's make_direct_trans: r(a, b), r(b, c) / r(a, c) / (proof).
1128
1090
  const makeDirectTrans = (relation: string, a: Expr, b: Expr, c: Expr, proof: MlProof) => {
1129
1091
  const hypothesis = getRelationHypothesis("transitive", relation);
1130
1092
  const ab = relate(relation, a, b);
@@ -1137,21 +1099,18 @@ export const translateProof = (
1137
1099
  );
1138
1100
  return makeAlls(hypothesis, [a, b, c], implied[1]);
1139
1101
  };
1140
- // Zenon's make_direct_nsym: -r(a, b) / -r(b, a) / (proof).
1141
1102
  const makeDirectNotSym = (relation: string, a: Expr, b: Expr, proof: MlProof) => {
1142
1103
  const hypothesis = getRelationHypothesis("symmetric", relation);
1143
1104
  const ab = relate(relation, a, b);
1144
1105
  const ba = relate(relation, b, a);
1145
1106
  return makeAlls(hypothesis, [b, a], makeImply(ba, ab, proof, makeClose(ab)));
1146
1107
  };
1147
- // Zenon's make_direct_sym_neq: a != b / b != a / (proof).
1148
1108
  const makeSymmetricDisequality = (a: Expr, b: Expr, proof: MlProof) => {
1149
1109
  const reflexive = equal(b, b);
1150
1110
  const refuted = makeCloseRefl("=", b);
1151
1111
  const swapped = makePNotP(reflexive, exprs.enot(equal(a, b)), [proof, refuted]);
1152
1112
  return makeCut(reflexive, swapped, refuted);
1153
1113
  };
1154
- // Zenon's make_direct_sym_eq: a = b / b = a / (proof).
1155
1114
  const makeSymmetricEquality = (a: Expr, b: Expr, proof: MlProof) => {
1156
1115
  const ab = equal(a, b);
1157
1116
  return makeCut(equal(b, a), proof, makeSymmetricDisequality(b, a, makeClose(ab)));
@@ -1265,7 +1224,6 @@ export const translateProof = (
1265
1224
  return [proof.subproofs[0], proof.subproofs[1], proof.subproofs[2]];
1266
1225
  };
1267
1226
 
1268
- // A derived rule's expansion, with the hypotheses it relies on that no phrase may state.
1269
1227
  const translateWith = (expanded: MlProof, hypotheses: Expr[]): Translated => {
1270
1228
  const translated = translate(expanded);
1271
1229
  return [translated[0], union(hypotheses, translated[1])];
@@ -1295,7 +1253,8 @@ export const translateProof = (
1295
1253
  }
1296
1254
  case "close_sym": {
1297
1255
  const hypothesis = getRelationHypothesis("symmetric", rule.relation);
1298
- const [a, b] = rule.args;
1256
+ const a = rule.args[0];
1257
+ const b = rule.args[1];
1299
1258
  const ab = relate(rule.relation, a, b);
1300
1259
  const ba = relate(rule.relation, b, a);
1301
1260
  const implied = makeImply(ab, ba, makeClose(ab), makeClose(ba));
@@ -1310,7 +1269,8 @@ export const translateProof = (
1310
1269
  }
1311
1270
  case "refl": {
1312
1271
  const hypothesis = getRelationHypothesis("reflexive", rule.relation);
1313
- const [a, b] = rule.args;
1272
+ const a = rule.args[0];
1273
+ const b = rule.args[1];
1314
1274
  const reflexive = relate(rule.relation, a, a);
1315
1275
  const negated = exprs.enot(relate(rule.relation, a, b));
1316
1276
  const closed = makePNotP(reflexive, negated, [makeCloseRefl("=", a), getSingle(proof)]);
@@ -1325,7 +1285,8 @@ export const translateProof = (
1325
1285
  return translate(makeSymmetricDisequality(negative.args[0], negative.args[1], node));
1326
1286
  }
1327
1287
  const hypothesis = getRelationHypothesis("symmetric", rule.relation);
1328
- const [a, b] = positive.args;
1288
+ const a = positive.args[0];
1289
+ const b = positive.args[1];
1329
1290
  const ba = relate(rule.relation, b, a);
1330
1291
  const node = makePNotP(ba, rule.args[1], [proof.subproofs[0], proof.subproofs[1]]);
1331
1292
  const implied = makeImply(rule.args[0], ba, makeClose(rule.args[0]), node);
@@ -1335,8 +1296,11 @@ export const translateProof = (
1335
1296
  case "trans_sym": {
1336
1297
  const positive = getRelation(rule.args[0]);
1337
1298
  const relation = positive.symbol;
1338
- const [a, b] = positive.args;
1339
- const [c, d] = getRelation(rule.args[1]).args;
1299
+ const a = positive.args[0];
1300
+ const b = positive.args[1];
1301
+ const negative = getRelation(rule.args[1]);
1302
+ const c = negative.args[0];
1303
+ const d = negative.args[1];
1340
1304
  const first = proof.subproofs[0];
1341
1305
  const second = proof.subproofs[1];
1342
1306
  if (relation === "=")
@@ -1365,7 +1329,8 @@ export const translateProof = (
1365
1329
  case "trans_eq_sym": {
1366
1330
  const negative = getRelation(rule.args[2]);
1367
1331
  const relation = negative.symbol;
1368
- const [c, d] = negative.args;
1332
+ const c = negative.args[0];
1333
+ const d = negative.args[1];
1369
1334
  const a = rule.args[0];
1370
1335
  const b = rule.args[1];
1371
1336
  const proofs = getThree(proof);
@@ -1402,7 +1367,6 @@ export const translateProof = (
1402
1367
  }
1403
1368
  };
1404
1369
 
1405
- // Zenon's make_ex.
1406
1370
  const makeExistential = (existential: Expr, subproof: MlProof) => {
1407
1371
  const binder = getBinder(existential, "ex");
1408
1372
  const witness = exprs.etau(binder.args[0], binder.symbol, binder.args[1]);
@@ -1410,7 +1374,6 @@ export const translateProof = (
1410
1374
  return makeNode([existential], { name: "ex", args: [existential] }, [[instance]], [subproof]);
1411
1375
  };
1412
1376
 
1413
- // Zenon's find_diff: the context in which two formulas differ, and the two subterms.
1414
1377
  const findDiff = (variable: VarExpr, left: Expr, right: Expr): [Expr, Expr, Expr] => {
1415
1378
  if (left === right) throw new TlaZenonError("Zenon: find_diff on equal formulas");
1416
1379
  if (left.kind === "app" && right.kind === "app" && left.symbol === right.symbol) {
@@ -1439,10 +1402,10 @@ export const translateProof = (
1439
1402
  ) {
1440
1403
  if (left.args[0] === right.args[0]) {
1441
1404
  const diff = findDiff(variable, left.args[1], right.args[1]);
1442
- return [connect(exprs, left.kind, left.args[0], diff[0]), diff[1], diff[2]];
1405
+ return [exprs.binary(left.kind, left.args[0], diff[0]), diff[1], diff[2]];
1443
1406
  }
1444
1407
  const diff = findDiff(variable, left.args[0], right.args[0]);
1445
- return [connect(exprs, left.kind, diff[0], left.args[1]), diff[1], diff[2]];
1408
+ return [exprs.binary(left.kind, diff[0], left.args[1]), diff[1], diff[2]];
1446
1409
  }
1447
1410
  if (
1448
1411
  left.kind === right.kind &&
@@ -1452,7 +1415,6 @@ export const translateProof = (
1452
1415
  return [variable, left, right];
1453
1416
  };
1454
1417
 
1455
- // Zenon's translate_pseudo_def: instantiates the defining hypothesis, then rewrites with it.
1456
1418
  const translatePseudoDefinition = (
1457
1419
  proof: MlProof,
1458
1420
  definition: Extract<Definition, { kind: "pseudo" }>,
@@ -1535,8 +1497,6 @@ export const translateProof = (
1535
1497
  const translated = translate(proof);
1536
1498
  const isCharged = (formula: Expr) =>
1537
1499
  !phrases.some((phrase) => phrase.kind === "hyp" && phrase.formula === formula);
1538
- // Zenon's discharge_extra: cuts each hypothesis about a relation that the phrases don't state,
1539
- // and proves it from the hypotheses that do.
1540
1500
  const discharged = translated[1].filter(isCharged).reduce((current: LlProof, extra): LlProof => {
1541
1501
  const relationProof = getRelationProof(extra);
1542
1502
  const proved = translate(relationProof[0]);
@@ -1,9 +1,3 @@
1
- // Ported from Zenon's node.ml and heap.ml, as shipped in tlapm. Copyright 2001-2004 INRIA, see
2
- // LICENSE.
3
- //
4
- // Tableau nodes and the queue that orders them. The search keeps the queue of every open branch,
5
- // so the queue is persistent: inserting or removing returns a new queue and shares the rest.
6
-
7
1
  import type { Expr } from "./expr";
8
2
  import type { Rule } from "./proof";
9
3
 
@@ -32,7 +26,6 @@ const reverse = <Item>(list: List<Item>) => {
32
26
  return result;
33
27
  };
34
28
 
35
- // A node in the instance heap, with the size of the term that instantiates its formula.
36
29
  interface Entry {
37
30
  node: Node;
38
31
  size: number;
@@ -44,7 +37,6 @@ interface Tree {
44
37
  right: Tree | undefined;
45
38
  }
46
39
 
47
- // Zenon's Heap: a persistent binary heap that alternates insertion paths.
48
40
  interface Heap {
49
41
  tree: Tree | undefined;
50
42
  path: number;
@@ -101,9 +93,9 @@ export interface Queue {
101
93
  instSize: List<[number, Heap]>;
102
94
  instFront: List<Node>;
103
95
  instBack: List<Node>;
104
- // The nodes inserted since the root. Removed nodes still count, because the queues of the
105
- // branches above keep them.
106
- insertedCount: number;
96
+ // The OCaml words of the nodes inserted so far. Removed nodes still count, because the queues of
97
+ // the branches above keep them.
98
+ nodeWords: number;
107
99
  }
108
100
 
109
101
  const SMALL_INSTANCES = 16;
@@ -124,7 +116,7 @@ export const EMPTY_QUEUE: Queue = {
124
116
  instSize: undefined,
125
117
  instFront: undefined,
126
118
  instBack: undefined,
127
- insertedCount: 0,
119
+ nodeWords: 0,
128
120
  };
129
121
 
130
122
  const insertByGoalness = (list: List<[number, Heap]>, entry: Entry): List<[number, Heap]> => {
@@ -163,8 +155,23 @@ const canInstantiate = (meta: Expr, expression: Expr): boolean => {
163
155
  }
164
156
  };
165
157
 
158
+ // A list cell and a node record take 3 and 6 words, and each block has a header word.
159
+ const getNodeWords = (node: Node) => {
160
+ let words =
161
+ 3 +
162
+ 6 +
163
+ 3 * node.conclusions.length +
164
+ 1 +
165
+ node.rule.args.length +
166
+ (typeof node.priority === "object" ? 2 : 0) +
167
+ 1 +
168
+ node.branches.length;
169
+ for (const branch of node.branches) words += 3 * branch.length;
170
+ return words;
171
+ };
172
+
166
173
  export const insertNode = (previous: Queue, node: Node): Queue => {
167
- const queue = { ...previous, insertedCount: previous.insertedCount + 1 };
174
+ const queue = { ...previous, nodeWords: previous.nodeWords + getNodeWords(node) };
168
175
  const priority = node.priority;
169
176
  if (priority === "prop")
170
177
  return node.branches.length < 2
@@ -212,8 +219,6 @@ const removeAt = (
212
219
  return [removed[0], cons([list.head[0], removed[1]], list.tail)];
213
220
  };
214
221
 
215
- // On even states, the smallest instance of the most goal-directed formulas; on odd states, the
216
- // smallest instance overall.
217
222
  const removeByGoalness = (state: number, list: List<[number, Heap]>) => {
218
223
  if (state % 2 === 0) return removeAt(0, list);
219
224
  let best = 0;