tla-ts 0.0.9 → 0.0.10-dev.06b481ee0

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 (631) 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 +48 -44
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +122 -12
  8. package/dist/index.d.ts +122 -12
  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 +144 -31
  17. package/dist/run.js +144 -31
  18. package/dist/tlapm.cjs +2 -2
  19. package/dist/tlapm.js +2 -2
  20. package/dist/transfer.cjs +134 -104
  21. package/dist/transfer.js +134 -104
  22. package/dist/worker.cjs +7 -7
  23. package/dist/worker.js +7 -7
  24. package/package.json +3 -1
  25. package/src/ast.ts +56 -60
  26. package/src/bags.ts +128 -110
  27. package/src/builtins.ts +31 -77
  28. package/src/bundled-modules.ts +1 -8
  29. package/src/check-failure.ts +118 -0
  30. package/src/check-trace.ts +320 -0
  31. package/src/check.ts +1156 -888
  32. package/src/cli/options.ts +12 -32
  33. package/src/cli/run.ts +0 -2
  34. package/src/cli/runtime-invariants.ts +100 -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 +701 -0
  39. package/src/cli/tlc-usage.ts +360 -0
  40. package/src/cli/tlc.ts +330 -659
  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 +217 -82
  45. package/src/config.ts +140 -109
  46. package/src/coverage.ts +1019 -0
  47. package/src/dependencies.ts +101 -66
  48. package/src/dfid.ts +683 -0
  49. package/src/environment-config.ts +315 -0
  50. package/src/environment.ts +263 -370
  51. package/src/errors.ts +107 -57
  52. package/src/evaluate.ts +898 -369
  53. package/src/exit-codes.ts +63 -13
  54. package/src/fingerprints.ts +75 -11
  55. package/src/index.ts +3 -0
  56. package/src/instances.ts +137 -22
  57. package/src/java-hash.ts +21 -0
  58. package/src/java-overrides.ts +6 -21
  59. package/src/json-reader.ts +455 -0
  60. package/src/json.ts +252 -139
  61. package/src/levels.ts +231 -154
  62. package/src/lexer.ts +83 -101
  63. package/src/liveness-checker.ts +743 -322
  64. package/src/liveness.ts +230 -133
  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 +39 -20
  73. package/src/obligations/levels.ts +27 -18
  74. package/src/obligations/module.ts +28 -55
  75. package/src/obligations/normalize.ts +31 -41
  76. package/src/obligations/operators.ts +0 -3
  77. package/src/obligations/pragma.ts +52 -24
  78. package/src/obligations/printer.ts +94 -63
  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 +121 -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 +36 -60
  88. package/src/parallel.ts +64 -73
  89. package/src/parser.ts +1184 -531
  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 +226 -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 +1 -15
  118. package/src/prover/isabelle/provers/classical.ts +58 -61
  119. package/src/prover/isabelle/provers/hypsubst.ts +29 -54
  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 +34 -77
  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 +4 -47
  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 +26 -31
  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 +1021 -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 +626 -56
  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 +319 -0
  190. package/src/prover/smt/solver/array.ts +1 -3
  191. package/src/prover/smt/solver/asserted-formulas.ts +241 -99
  192. package/src/prover/smt/solver/ast-lt.ts +165 -21
  193. package/src/prover/smt/solver/ast-util.ts +160 -7
  194. package/src/prover/smt/solver/ast.ts +1480 -184
  195. package/src/prover/smt/solver/auf-solver.ts +30 -56
  196. package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
  197. package/src/prover/smt/solver/bit-blaster.ts +871 -0
  198. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  199. package/src/prover/smt/solver/bound-manager.ts +196 -0
  200. package/src/prover/smt/solver/bound-simplifier.ts +598 -0
  201. package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
  202. package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
  203. package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
  204. package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
  205. package/src/prover/smt/solver/bv1-blast.ts +214 -0
  206. package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
  207. package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
  208. package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
  209. package/src/prover/smt/solver/card2bv.ts +127 -0
  210. package/src/prover/smt/solver/case-split-queue.ts +0 -10
  211. package/src/prover/smt/solver/cg-table.ts +39 -42
  212. package/src/prover/smt/solver/check-logic.ts +330 -0
  213. package/src/prover/smt/solver/clause.ts +0 -27
  214. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
  215. package/src/prover/smt/solver/conflict-resolution.ts +78 -11
  216. package/src/prover/smt/solver/context.ts +600 -187
  217. package/src/prover/smt/solver/ctx-simplify.ts +34 -52
  218. package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
  219. package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
  220. package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
  221. package/src/prover/smt/solver/demodulator.ts +786 -0
  222. package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
  223. package/src/prover/smt/solver/der.ts +39 -30
  224. package/src/prover/smt/solver/diff-neq.ts +205 -0
  225. package/src/prover/smt/solver/distribute-forall.ts +57 -0
  226. package/src/prover/smt/solver/dom-simplify.ts +511 -0
  227. package/src/prover/smt/solver/dt2bv-tactic.ts +296 -0
  228. package/src/prover/smt/solver/dyn-ack.ts +0 -11
  229. package/src/prover/smt/solver/e-matching.ts +9 -41
  230. package/src/prover/smt/solver/elim-bounds.ts +89 -0
  231. package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
  232. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  233. package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
  234. package/src/prover/smt/solver/enode.ts +100 -23
  235. package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
  236. package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
  237. package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
  238. package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
  239. package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
  240. package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
  241. package/src/prover/smt/solver/euf/array-solver.ts +306 -0
  242. package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
  243. package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
  244. package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
  245. package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
  246. package/src/prover/smt/solver/euf/egraph.ts +901 -0
  247. package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
  248. package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
  249. package/src/prover/smt/solver/euf/mam.ts +1046 -0
  250. package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
  251. package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
  252. package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
  253. package/src/prover/smt/solver/euf/q-solver.ts +361 -0
  254. package/src/prover/smt/solver/euf/th-solver.ts +328 -0
  255. package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
  256. package/src/prover/smt/solver/expr-ref.ts +0 -5
  257. package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
  258. package/src/prover/smt/solver/expr2polynomial.ts +271 -0
  259. package/src/prover/smt/solver/factor.ts +163 -0
  260. package/src/prover/smt/solver/fd-solver.ts +734 -0
  261. package/src/prover/smt/solver/fingerprints.ts +15 -26
  262. package/src/prover/smt/solver/fix-dl-var.ts +147 -0
  263. package/src/prover/smt/solver/flat-literals.ts +0 -9
  264. package/src/prover/smt/solver/fm-tactic.ts +884 -0
  265. package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
  266. package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
  267. package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
  268. package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
  269. package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
  270. package/src/prover/smt/solver/goal.ts +179 -28
  271. package/src/prover/smt/solver/goal2nlsat.ts +216 -0
  272. package/src/prover/smt/solver/guard-set.ts +219 -0
  273. package/src/prover/smt/solver/hash.ts +0 -9
  274. package/src/prover/smt/solver/hashtable.ts +30 -23
  275. package/src/prover/smt/solver/inf-eps.ts +63 -0
  276. package/src/prover/smt/solver/inj-axiom.ts +101 -0
  277. package/src/prover/smt/solver/internalizer.ts +113 -133
  278. package/src/prover/smt/solver/lackr.ts +381 -0
  279. package/src/prover/smt/solver/lbool.ts +0 -2
  280. package/src/prover/smt/solver/lia2card.ts +268 -0
  281. package/src/prover/smt/solver/lia2pb.ts +154 -0
  282. package/src/prover/smt/solver/literal.ts +0 -4
  283. package/src/prover/smt/solver/logic-tactics.ts +355 -0
  284. package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
  285. package/src/prover/smt/solver/lp/constraints.ts +1 -8
  286. package/src/prover/smt/solver/lp/containers.ts +18 -31
  287. package/src/prover/smt/solver/lp/core-solver.ts +35 -37
  288. package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
  289. package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
  290. package/src/prover/smt/solver/lp/dependency.ts +0 -5
  291. package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
  292. package/src/prover/smt/solver/lp/explanation.ts +0 -6
  293. package/src/prover/smt/solver/lp/gomory.ts +8 -22
  294. package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
  295. package/src/prover/smt/solver/lp/hnf.ts +10 -28
  296. package/src/prover/smt/solver/lp/int-cube.ts +17 -39
  297. package/src/prover/smt/solver/lp/int-solver.ts +3 -35
  298. package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
  299. package/src/prover/smt/solver/lp/lar-term.ts +0 -5
  300. package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
  301. package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
  302. package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
  303. package/src/prover/smt/solver/lp/nex.ts +2 -7
  304. package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
  305. package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
  306. package/src/prover/smt/solver/lp/nla-core.ts +92 -136
  307. package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
  308. package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
  309. package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
  310. package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
  311. package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
  312. package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
  313. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
  314. package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
  315. package/src/prover/smt/solver/lp/nla-order.ts +0 -13
  316. package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
  317. package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
  318. package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
  319. package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
  320. package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
  321. package/src/prover/smt/solver/lp/nla-types.ts +0 -12
  322. package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
  323. package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
  324. package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
  325. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
  326. package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
  327. package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
  328. package/src/prover/smt/solver/lp/pdd.ts +730 -358
  329. package/src/prover/smt/solver/lp/random-updater.ts +0 -9
  330. package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
  331. package/src/prover/smt/solver/lp/union-find.ts +5 -5
  332. package/src/prover/smt/solver/macro-finder.ts +530 -0
  333. package/src/prover/smt/solver/mam-compiler.ts +129 -139
  334. package/src/prover/smt/solver/mam-interpreter.ts +0 -21
  335. package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
  336. package/src/prover/smt/solver/max-cliques.ts +105 -0
  337. package/src/prover/smt/solver/maxcore.ts +310 -0
  338. package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
  339. package/src/prover/smt/solver/maxlex.ts +115 -0
  340. package/src/prover/smt/solver/maxsmt-base.ts +106 -0
  341. package/src/prover/smt/solver/maxsmt.ts +92 -0
  342. package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
  343. package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
  344. package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
  345. package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
  346. package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
  347. package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
  348. package/src/prover/smt/solver/model-based-opt.ts +844 -0
  349. package/src/prover/smt/solver/model-checker.ts +20 -63
  350. package/src/prover/smt/solver/model-evaluator.ts +192 -40
  351. package/src/prover/smt/solver/model-finder.ts +14 -32
  352. package/src/prover/smt/solver/model-generator.ts +104 -46
  353. package/src/prover/smt/solver/model-macro-solver.ts +60 -114
  354. package/src/prover/smt/solver/model-printer.ts +214 -0
  355. package/src/prover/smt/solver/mpf.ts +709 -0
  356. package/src/prover/smt/solver/mus.ts +50 -0
  357. package/src/prover/smt/solver/muz/dl-context.ts +382 -0
  358. package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
  359. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
  360. package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
  361. package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
  362. package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
  363. package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
  364. package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
  365. package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
  366. package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
  367. package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
  368. package/src/prover/smt/solver/muz/hnf.ts +201 -0
  369. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
  370. package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
  371. package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
  372. package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
  373. package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
  374. package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
  375. package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
  376. package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
  377. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
  378. package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
  379. package/src/prover/smt/solver/muz/substitution.ts +203 -0
  380. package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
  381. package/src/prover/smt/solver/nlqsat.ts +484 -0
  382. package/src/prover/smt/solver/nlsat/algebraic.ts +357 -236
  383. package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
  384. package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
  385. package/src/prover/smt/solver/nlsat/explain.ts +429 -275
  386. package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
  387. package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
  388. package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
  389. package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
  390. package/src/prover/smt/solver/nlsat/solver.ts +297 -156
  391. package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
  392. package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
  393. package/src/prover/smt/solver/nlsat/types.ts +0 -9
  394. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
  395. package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
  396. package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
  397. package/src/prover/smt/solver/nnf.ts +112 -61
  398. package/src/prover/smt/solver/normalize-bounds.ts +53 -0
  399. package/src/prover/smt/solver/occf.ts +97 -0
  400. package/src/prover/smt/solver/opt-context.ts +801 -0
  401. package/src/prover/smt/solver/opt-nlsat.ts +386 -0
  402. package/src/prover/smt/solver/opt-pareto.ts +301 -0
  403. package/src/prover/smt/solver/opt-preprocess.ts +101 -0
  404. package/src/prover/smt/solver/opt-solver.ts +312 -0
  405. package/src/prover/smt/solver/opt-value.ts +55 -0
  406. package/src/prover/smt/solver/optsmt.ts +692 -0
  407. package/src/prover/smt/solver/parallel-tactic.ts +299 -0
  408. package/src/prover/smt/solver/pattern-inference.ts +21 -26
  409. package/src/prover/smt/solver/pb-rewriter.ts +281 -0
  410. package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
  411. package/src/prover/smt/solver/poly-rewriter.ts +261 -79
  412. package/src/prover/smt/solver/probes.ts +577 -0
  413. package/src/prover/smt/solver/propagate-values.ts +37 -30
  414. package/src/prover/smt/solver/proto-model.ts +650 -66
  415. package/src/prover/smt/solver/pull-quant.ts +28 -23
  416. package/src/prover/smt/solver/purify-arith.ts +632 -0
  417. package/src/prover/smt/solver/push-app-ite.ts +37 -0
  418. package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
  419. package/src/prover/smt/solver/qe-lite-der.ts +2 -31
  420. package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
  421. package/src/prover/smt/solver/qe-lite.ts +41 -51
  422. package/src/prover/smt/solver/qe-mbp.ts +270 -0
  423. package/src/prover/smt/solver/qe.ts +1499 -0
  424. package/src/prover/smt/solver/qel.ts +25 -0
  425. package/src/prover/smt/solver/qi-queue.ts +0 -16
  426. package/src/prover/smt/solver/qsat.ts +829 -0
  427. package/src/prover/smt/solver/quant-hoist.ts +196 -0
  428. package/src/prover/smt/solver/quant-tactics.ts +17 -74
  429. package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
  430. package/src/prover/smt/solver/quantifier-manager.ts +22 -32
  431. package/src/prover/smt/solver/quasi-macros.ts +243 -0
  432. package/src/prover/smt/solver/random-gen.ts +0 -2
  433. package/src/prover/smt/solver/rational.ts +45 -8
  434. package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
  435. package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
  436. package/src/prover/smt/solver/reduce-args.ts +225 -0
  437. package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
  438. package/src/prover/smt/solver/ref-vector.ts +0 -6
  439. package/src/prover/smt/solver/relevancy.ts +2 -16
  440. package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
  441. package/src/prover/smt/solver/rewriter.ts +507 -144
  442. package/src/prover/smt/solver/rlimit.ts +46 -24
  443. package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
  444. package/src/prover/smt/solver/sat/big.ts +177 -0
  445. package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
  446. package/src/prover/smt/solver/sat/clause.ts +203 -0
  447. package/src/prover/smt/solver/sat/cleaner.ts +94 -0
  448. package/src/prover/smt/solver/sat/config.ts +122 -0
  449. package/src/prover/smt/solver/sat/consequences.ts +203 -0
  450. package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
  451. package/src/prover/smt/solver/sat/goal2sat.ts +579 -0
  452. package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
  453. package/src/prover/smt/solver/sat/model-converter.ts +136 -0
  454. package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
  455. package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
  456. package/src/prover/smt/solver/sat/probing.ts +170 -0
  457. package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
  458. package/src/prover/smt/solver/sat/sat2goal.ts +189 -0
  459. package/src/prover/smt/solver/sat/scc.ts +142 -0
  460. package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
  461. package/src/prover/smt/solver/sat/solver.ts +2107 -0
  462. package/src/prover/smt/solver/sat/var-queue.ts +117 -0
  463. package/src/prover/smt/solver/sat/watch-list.ts +140 -0
  464. package/src/prover/smt/solver/search-tree.ts +284 -0
  465. package/src/prover/smt/solver/seq-axioms.ts +995 -0
  466. package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
  467. package/src/prover/smt/solver/seq-derive.ts +1298 -0
  468. package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
  469. package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
  470. package/src/prover/smt/solver/seq-factory.ts +89 -0
  471. package/src/prover/smt/solver/seq-monadic.ts +730 -0
  472. package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
  473. package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
  474. package/src/prover/smt/solver/seq-re-util.ts +758 -0
  475. package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
  476. package/src/prover/smt/solver/seq-regex-live.ts +200 -0
  477. package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
  478. package/src/prover/smt/solver/seq-skolem.ts +294 -0
  479. package/src/prover/smt/solver/seq-subset.ts +165 -0
  480. package/src/prover/smt/solver/seq-view-witness.ts +353 -0
  481. package/src/prover/smt/solver/smt-consequences.ts +297 -0
  482. package/src/prover/smt/solver/smt-kernel.ts +124 -0
  483. package/src/prover/smt/solver/smt-logics.ts +66 -0
  484. package/src/prover/smt/solver/smt-setup.ts +589 -0
  485. package/src/prover/smt/solver/smt2-printer.ts +765 -0
  486. package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
  487. package/src/prover/smt/solver/smtlib-script.ts +2134 -0
  488. package/src/prover/smt/solver/solve-eqs.ts +928 -0
  489. package/src/prover/smt/solver/solver.ts +135 -40
  490. package/src/prover/smt/solver/sort.ts +1 -5
  491. package/src/prover/smt/solver/static-features.ts +314 -0
  492. package/src/prover/smt/solver/sticky-generations.ts +0 -6
  493. package/src/prover/smt/solver/tactic.ts +2141 -0
  494. package/src/prover/smt/solver/term-enumeration.ts +205 -0
  495. package/src/prover/smt/solver/theory-array.ts +1240 -0
  496. package/src/prover/smt/solver/theory-bv.ts +1210 -0
  497. package/src/prover/smt/solver/theory-char.ts +355 -0
  498. package/src/prover/smt/solver/theory-datatype.ts +598 -0
  499. package/src/prover/smt/solver/theory-finite-set.ts +30 -0
  500. package/src/prover/smt/solver/theory-fpa.ts +389 -0
  501. package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
  502. package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
  503. package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
  504. package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
  505. package/src/prover/smt/solver/theory-lra-model.ts +23 -53
  506. package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
  507. package/src/prover/smt/solver/theory-lra-state.ts +7 -28
  508. package/src/prover/smt/solver/theory-lra.ts +189 -9
  509. package/src/prover/smt/solver/theory-pb.ts +951 -0
  510. package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
  511. package/src/prover/smt/solver/theory-recfun.ts +307 -0
  512. package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
  513. package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
  514. package/src/prover/smt/solver/theory-seq-state.ts +852 -0
  515. package/src/prover/smt/solver/theory-seq.ts +961 -0
  516. package/src/prover/smt/solver/theory-without-terms.ts +24 -0
  517. package/src/prover/smt/solver/theory.ts +189 -0
  518. package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
  519. package/src/prover/smt/solver/var-subst.ts +37 -39
  520. package/src/prover/smt/table.ts +3 -10
  521. package/src/prover/smt/types.ts +146 -0
  522. package/src/prover/tlapm/cache.ts +74 -48
  523. package/src/prover/tlapm/ocaml-marshal.ts +19 -21
  524. package/src/prover/tlapm/tlapm.ts +21 -20
  525. package/src/prover/tlapm-library.ts +3208 -0
  526. package/src/prover/verdict.ts +9 -2
  527. package/src/prover/zenon/check/check.ts +1 -11
  528. package/src/prover/zenon/check/definitions.ts +5 -15
  529. package/src/prover/zenon/check/equality.ts +0 -8
  530. package/src/prover/zenon/check/functions.ts +0 -4
  531. package/src/prover/zenon/check/keys.ts +0 -7
  532. package/src/prover/zenon/check/propositional.ts +0 -3
  533. package/src/prover/zenon/check/records.ts +1 -6
  534. package/src/prover/zenon/check/relations.ts +2 -14
  535. package/src/prover/zenon/check/rewrites.ts +2 -21
  536. package/src/prover/zenon/check/sets.ts +40 -61
  537. package/src/prover/zenon/check/terms.ts +1 -19
  538. package/src/prover/zenon/check/tla.ts +0 -6
  539. package/src/prover/zenon/decide.ts +10 -19
  540. package/src/prover/zenon/encode.ts +0 -9
  541. package/src/prover/zenon/eqrel.ts +2 -15
  542. package/src/prover/zenon/equality-rules.ts +24 -6
  543. package/src/prover/zenon/expr.ts +29 -28
  544. package/src/prover/zenon/index-table.ts +33 -61
  545. package/src/prover/zenon/isar-case.ts +9 -21
  546. package/src/prover/zenon/isar.ts +37 -67
  547. package/src/prover/zenon/limits.ts +0 -4
  548. package/src/prover/zenon/llproof.ts +2 -22
  549. package/src/prover/zenon/mltoll.ts +66 -106
  550. package/src/prover/zenon/node.ts +20 -15
  551. package/src/prover/zenon/ocaml.ts +1 -17
  552. package/src/prover/zenon/parse.ts +9 -13
  553. package/src/prover/zenon/phrase.ts +2 -14
  554. package/src/prover/zenon/proof.ts +0 -11
  555. package/src/prover/zenon/propositional-rules.ts +0 -7
  556. package/src/prover/zenon/rules.ts +3 -8
  557. package/src/prover/zenon/search.ts +11 -35
  558. package/src/prover/zenon/tla/functions.ts +59 -33
  559. package/src/prover/zenon/tla/llproof.ts +67 -78
  560. package/src/prover/zenon/tla/records.ts +57 -35
  561. package/src/prover/zenon/tla/rewrites.ts +12 -21
  562. package/src/prover/zenon/tla/sets.ts +88 -59
  563. package/src/prover/zenon/tla/terms.ts +0 -8
  564. package/src/prover/zenon/tla/tla.ts +66 -66
  565. package/src/randomization.ts +81 -35
  566. package/src/resolve.ts +1132 -430
  567. package/src/runtime.ts +33 -23
  568. package/src/sany/builtins.ts +11 -14
  569. package/src/sany/generation.ts +383 -0
  570. package/src/sany/generator-def-entries.ts +210 -0
  571. package/src/sany/generator-definitions.ts +688 -0
  572. package/src/sany/generator-expressions.ts +1108 -0
  573. package/src/sany/generator-proofs.ts +665 -0
  574. package/src/sany/generator.ts +192 -2764
  575. package/src/sany/levels.ts +5 -35
  576. package/src/sany/lexer.ts +61 -80
  577. package/src/sany/linter.ts +0 -10
  578. package/src/sany/modules.ts +5 -7
  579. package/src/sany/nodes.ts +6 -44
  580. package/src/sany/parse-error.ts +39 -117
  581. package/src/sany/report.ts +32 -69
  582. package/src/sany/selectors.ts +60 -82
  583. package/src/sany/source.ts +1 -17
  584. package/src/sany/xml.ts +37 -120
  585. package/src/search.ts +913 -227
  586. package/src/simulate.ts +765 -0
  587. package/src/spec-description.ts +198 -104
  588. package/src/standard-definitions.ts +4 -4
  589. package/src/standard-modules.ts +302 -99
  590. package/src/state-graph.ts +52 -33
  591. package/src/subexpressions.ts +578 -166
  592. package/src/substitution-levels.ts +7 -7
  593. package/src/successors.ts +299 -108
  594. package/src/symmetry.ts +37 -28
  595. package/src/tableau.ts +29 -26
  596. package/src/tlc/fingerprint.ts +267 -79
  597. package/src/tlc/jar-data.ts +122 -6
  598. package/src/tlc/messages.ts +127 -56
  599. package/src/tlc/order.ts +53 -72
  600. package/src/tlc/random.ts +38 -49
  601. package/src/tlc/replay.ts +579 -230
  602. package/src/tlc/summary.ts +64 -60
  603. package/src/tlc/tlc-operators.ts +83 -47
  604. package/src/tlc/tlcext-operators.ts +205 -127
  605. package/src/tlc/trace-spec.ts +235 -0
  606. package/src/tlc/value-stream.ts +139 -0
  607. package/src/tlc/version.ts +1 -4
  608. package/src/trace-liveness.ts +529 -0
  609. package/src/transfer.ts +22 -25
  610. package/src/typed-tier.ts +6556 -0
  611. package/src/typescript/actions.ts +479 -0
  612. package/src/typescript/collections.ts +614 -0
  613. package/src/typescript/compile.ts +63 -0
  614. package/src/typescript/context.ts +94 -0
  615. package/src/typescript/emit.ts +121 -0
  616. package/src/typescript/expressions.ts +496 -0
  617. package/src/typescript/formula.ts +154 -0
  618. package/src/typescript/functions.ts +284 -0
  619. package/src/typescript/model.ts +162 -0
  620. package/src/typescript/names.ts +114 -0
  621. package/src/typescript/program.ts +48 -0
  622. package/src/typescript/properties.ts +139 -0
  623. package/src/typescript/scope.ts +112 -0
  624. package/src/typescript/steps.ts +167 -0
  625. package/src/typescript/types.ts +171 -0
  626. package/src/values.ts +945 -526
  627. package/src/worker.ts +7 -8
  628. package/src/prover/isabelle/isar/statement.ts +0 -57
  629. package/src/prover/smt/solver/z3-license.txt +0 -10
  630. package/src/prover/tlaps-module.ts +0 -510
  631. package/src/prover/zenon/LICENSE +0 -32
@@ -1,24 +1,18 @@
1
- // Ported from Isabelle2025's Provers/classical.ML. Copyright (c) 1986-2025 University of
2
- // Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
3
- //
4
- // The classical reasoner: rule sets of safe and unsafe introduction and elimination rules, and
5
- // the tactics that search with them. The rules Isabelle/TLA+ declares come with the logic; a
6
- // method adds more with intro: and dest:.
7
-
8
1
  import { TlaIsabelleError } from "../../../errors";
9
2
  import { revcutRl, thinRl, zeroVarIndexes, makeElim } from "../pure/drule";
10
3
  import { selectGoal } from "../pure/goal";
11
- import { aconv, sizeOfTerm } from "../pure/term";
4
+ import { aconv, sizeOfTerm, type Term } from "../pure/term";
12
5
  import { stripAssumsConcl, stripAssumsHyp } from "../pure/logic";
13
6
  import { listOfSeq, seqHead } from "../pure/seq";
14
7
  import { trade } from "../pure/variable";
15
- import { atomizePremsTac } from "../pure/object-logic";
8
+ import { atomizePremsTac, flatRule } from "../pure/object-logic";
16
9
  import { bestFirst } from "../pure/search";
17
10
  import {
18
11
  allGoals,
19
12
  allTac,
20
13
  appendGoal,
21
14
  condTac,
15
+ depthSolve,
22
16
  firstGoal,
23
17
  firstGoalTac,
24
18
  hasFewerPrems,
@@ -48,10 +42,18 @@ import {
48
42
  type NetPair,
49
43
  type TaggedRule,
50
44
  } from "../pure/tactic";
51
- import { assumption, biresolution, nprems, premsOf, rs, rsn, type Thm } from "../pure/thm";
45
+ import {
46
+ assumption,
47
+ biresolution,
48
+ nprems,
49
+ premsOf,
50
+ rs,
51
+ rsn,
52
+ type BiresRule,
53
+ type Thm,
54
+ } from "../pure/thm";
55
+ import type { ContextRule } from "../tools/intuitionistic";
52
56
 
53
- // A rule as the user gave it, as the nets use it, and as the complete search duplicates it, each
54
- // with its swapped forms for negated assumptions.
55
57
  export interface ClassicalRule {
56
58
  readonly rule: Thm;
57
59
  readonly internal: Thm;
@@ -66,7 +68,6 @@ export interface Wrapper {
66
68
  }
67
69
 
68
70
  export interface Claset {
69
- // Newest first, as Item_Net.content lists them.
70
71
  readonly safeIs: readonly ClassicalRule[];
71
72
  readonly safeEs: readonly ClassicalRule[];
72
73
  readonly unsafeIs: readonly ClassicalRule[];
@@ -77,19 +78,14 @@ export interface Claset {
77
78
  readonly safep: NetPair<TaggedRule>;
78
79
  readonly unsafe: NetPair<TaggedRule>;
79
80
  readonly dup: NetPair<TaggedRule>;
81
+ readonly extra: NetPair<ContextRule>;
80
82
  }
81
83
 
82
- // CLASSICAL_DATA: the object logic's rules for the classical reasoner.
83
84
  export interface ClassicalData {
84
- // P --> Q ==> (~ R ==> P) ==> (Q ==> R) ==> R
85
85
  readonly impElim: Thm;
86
- // ~P ==> P ==> R
87
86
  readonly notElim: Thm;
88
- // ~ P ==> (~ R ==> P) ==> R
89
87
  readonly swap: Thm;
90
- // (~ P ==> P) ==> P
91
88
  readonly classical: Thm;
92
- // The object logic's Trueprop, which Object_Logic.elim_concl looks through.
93
89
  readonly judgment: string;
94
90
  readonly hypSubstTacs: readonly ((limits: Limits) => GoalTactic)[];
95
91
  }
@@ -105,8 +101,6 @@ export const withClaset = (context: ClassicalContext, claset: Claset): Classical
105
101
  claset,
106
102
  });
107
103
 
108
- // classical_rule: strengthens an elimination rule whose conclusion is a variable, so that the
109
- // negated conclusion becomes available to every case.
110
104
  const classicalRule = (data: ClassicalData, rule: Thm, limits: Limits): Thm => {
111
105
  const concl = premsOf(rule).length === 0 ? rule.prop : stripAssumsConcl(rule.prop);
112
106
  const body =
@@ -118,7 +112,7 @@ const classicalRule = (data: ClassicalData, rule: Thm, limits: Limits): Thm => {
118
112
  if (!isElim) return rule;
119
113
  const strengthened = rs(rule, data.classical);
120
114
  const strengthenedConcl = stripAssumsConcl(strengthened.prop);
121
- const isRedundant = (goal: ReturnType<typeof premsOf>[number]) => {
115
+ const isRedundant = (goal: Term) => {
122
116
  if (aconv(strengthenedConcl, stripAssumsConcl(goal))) return true;
123
117
  const hyps = stripAssumsHyp(goal);
124
118
  return hyps.length > 0 && hyps.slice(1).some((hyp) => aconv(hyp, hyps[0]));
@@ -135,7 +129,6 @@ const classicalRule = (data: ClassicalData, rule: Thm, limits: Limits): Thm => {
135
129
  return aconv(result.prop, rule.prop) ? rule : result;
136
130
  };
137
131
 
138
- // swapify: the rules that eliminate ~A from the rules that introduce A.
139
132
  const swapify = (data: ClassicalData, rules: readonly Thm[]) =>
140
133
  rules.flatMap((rule) =>
141
134
  listOfSeq(biresolution(undefined, false, [{ isElim: false, rule }], 2, data.swap)),
@@ -143,8 +136,6 @@ const swapify = (data: ClassicalData, rules: readonly Thm[]) =>
143
136
 
144
137
  const dupIntr = (data: ClassicalData, rule: Thm) => zeroVarIndexes(rs(rule, data.classical));
145
138
 
146
- // Drule.rule_by_tactic: runs the tactic on the rule with its variables fixed.
147
- // Tactic.rule_by_tactic
148
139
  const ruleByTactic = (tactic: Tactic, rule: Thm): Thm =>
149
140
  zeroVarIndexes(
150
141
  trade((fixed) => {
@@ -163,8 +154,7 @@ const dupElim = (limits: Limits, rule: Thm) => {
163
154
  );
164
155
  };
165
156
 
166
- // tag_brls: rules with fewer subgoals first, then the rules added last.
167
- const tagRules = (start: number, rules: readonly { isElim: boolean; rule: Thm }[]): TaggedRule[] =>
157
+ const tagRules = (start: number, rules: readonly BiresRule[]): TaggedRule[] =>
168
158
  rules.map((brule, index) => ({ tag: 1000000 * subgoalsOfBrl(brule) + start + index, ...brule }));
169
159
 
170
160
  const insertRules = (
@@ -178,26 +168,29 @@ const insertRules = (
178
168
  ...intros.map((rule) => ({ isElim: false, rule })),
179
169
  ]).reduceRight((result, tagged) => insertTaggedBrl(tagged, result), netpair);
180
170
 
171
+ // insert' with the default weight of an unsafe rule.
172
+ const insertExtra = (
173
+ counts: readonly [number, number],
174
+ isElim: boolean,
175
+ rule: Thm,
176
+ netpair: NetPair<ContextRule>,
177
+ ) => insertTaggedBrl({ weight: 1, tag: -(counts[0] + counts[1]), isElim, rule }, netpair);
178
+
181
179
  const isMember = (rules: readonly ClassicalRule[], rule: ClassicalRule) =>
182
180
  rules.some((other) => aconv(other.rule.prop, rule.rule.prop));
183
181
 
184
- // addI: an unsafe introduction rule, which intro: declares.
185
- export const addUnsafeIntro = (context: ClassicalContext, rule: Thm): Claset => {
182
+ export const addUnsafeIntro = (
183
+ context: ClassicalContext,
184
+ rule: Thm,
185
+ atomizeRules: readonly Thm[],
186
+ ): Claset => {
186
187
  const claset = context.claset;
187
- if (
188
- premsOf(rule).some(
189
- (premise) =>
190
- premise.kind === "App" &&
191
- premise.fun.kind === "Const" &&
192
- premise.fun.name.startsWith("Pure."),
193
- )
194
- )
195
- throw new TlaIsabelleError("ERROR", "Rules with meta-level premises are not supported");
196
- const dup = dupIntr(context.data, rule);
188
+ const flat = flatRule(context.limits, atomizeRules, rule);
189
+ const dup = dupIntr(context.data, flat);
197
190
  const entry: ClassicalRule = {
198
191
  rule,
199
- internal: rule,
200
- swapped: swapify(context.data, [rule]),
192
+ internal: flat,
193
+ swapped: swapify(context.data, [flat]),
201
194
  dup,
202
195
  dupSwapped: swapify(context.data, [dup]),
203
196
  };
@@ -208,14 +201,22 @@ export const addUnsafeIntro = (context: ClassicalContext, rule: Thm): Claset =>
208
201
  unsafeIs: [entry, ...claset.unsafeIs],
209
202
  unsafe: insertRules(counts, [entry.internal], entry.swapped, claset.unsafe),
210
203
  dup: insertRules(counts, [entry.dup], entry.dupSwapped, claset.dup),
204
+ extra: insertExtra(counts, false, rule, claset.extra),
211
205
  };
212
206
  };
213
207
 
214
- // addE: an unsafe elimination rule.
215
- const addUnsafeElim = (context: ClassicalContext, rule: Thm): Claset => {
208
+ export const addUnsafeElim = (
209
+ context: ClassicalContext,
210
+ rule: Thm,
211
+ atomizeRules: readonly Thm[],
212
+ ): Claset => {
216
213
  const claset = context.claset;
217
214
  if (nprems(rule) < 1) throw new TlaIsabelleError("ERROR", "Ill-formed elimination rule");
218
- const internal = classicalRule(context.data, rule, context.limits);
215
+ const internal = classicalRule(
216
+ context.data,
217
+ flatRule(context.limits, atomizeRules, rule),
218
+ context.limits,
219
+ );
219
220
  const entry: ClassicalRule = {
220
221
  rule,
221
222
  internal,
@@ -230,28 +231,29 @@ const addUnsafeElim = (context: ClassicalContext, rule: Thm): Claset => {
230
231
  unsafeEs: [entry, ...claset.unsafeEs],
231
232
  unsafe: insertRules(counts, [], [entry.internal], claset.unsafe),
232
233
  dup: insertRules(counts, [], [entry.dup], claset.dup),
234
+ extra: insertExtra(counts, true, rule, claset.extra),
233
235
  };
234
236
  };
235
237
 
236
- // addD: an unsafe destruction rule, which dest: declares.
237
- export const addUnsafeDest = (context: ClassicalContext, rule: Thm): Claset => {
238
+ export const addUnsafeDest = (
239
+ context: ClassicalContext,
240
+ rule: Thm,
241
+ atomizeRules: readonly Thm[],
242
+ ): Claset => {
238
243
  if (nprems(rule) < 1) throw new TlaIsabelleError("ERROR", "Ill-formed destruction rule");
239
- return addUnsafeElim(context, makeElim(rule));
244
+ return addUnsafeElim(context, makeElim(rule), atomizeRules);
240
245
  };
241
246
 
242
- // AList.update: replaces a wrapper of the same name in place, or adds it in front.
243
247
  const updateWrappers = (wrappers: readonly Wrapper[], wrapper: Wrapper) =>
244
248
  wrappers.some((other) => other.name === wrapper.name)
245
249
  ? wrappers.map((other) => (other.name === wrapper.name ? wrapper : other))
246
250
  : [wrapper, ...wrappers];
247
251
 
248
- // addSafter: a safe tactic to try after safe_step_tac fails.
249
252
  export const addSafter = (claset: Claset, name: string, tactic: GoalTactic): Claset => ({
250
253
  ...claset,
251
254
  swrappers: updateWrappers(claset.swrappers, { name, wrap: (inner) => orElseGoal(inner, tactic) }),
252
255
  });
253
256
 
254
- // addbefore: a tactic to try before the unsafe step tactic, with backtracking.
255
257
  export const addbefore = (claset: Claset, name: string, tactic: GoalTactic): Claset => ({
256
258
  ...claset,
257
259
  uwrappers: updateWrappers(claset.uwrappers, { name, wrap: (inner) => appendGoal(tactic, inner) }),
@@ -263,14 +265,12 @@ const appSWrappers = (context: ClassicalContext, tactic: GoalTactic) =>
263
265
  export const appWrappers = (context: ClassicalContext, tactic: GoalTactic) =>
264
266
  context.claset.uwrappers.reduce((result, wrapper) => wrapper.wrap(result), tactic);
265
267
 
266
- // contr_tac: solves a goal that assumes both P and ~P.
267
268
  const contrTac = (context: ClassicalContext): GoalTactic =>
268
269
  thenGoal(
269
270
  eresolveTac(context.limits, [context.data.notElim]),
270
271
  orElseGoal(eqAssumeTac, assumeTac(context.limits)),
271
272
  );
272
273
 
273
- // eq_mp_tac: from P --> Q and P, keeps Q, without instantiating variables.
274
274
  const eqMpTac =
275
275
  (context: ClassicalContext): GoalTactic =>
276
276
  (index) =>
@@ -279,7 +279,6 @@ const eqMpTac =
279
279
  eqAssumeTac(index),
280
280
  );
281
281
 
282
- // safe_step_tac: one safe inference, by matching rather than unification.
283
282
  const safeStepTac = (context: ClassicalContext): GoalTactic =>
284
283
  appSWrappers(
285
284
  context,
@@ -292,7 +291,6 @@ const safeStepTac = (context: ClassicalContext): GoalTactic =>
292
291
  ]),
293
292
  );
294
293
 
295
- // safe_steps_tac: safe inferences on goal index for as long as they apply.
296
294
  export const safeStepsTac =
297
295
  (context: ClassicalContext): GoalTactic =>
298
296
  (index) =>
@@ -300,7 +298,6 @@ export const safeStepsTac =
300
298
  condTac(hasFewerPrems(index), noTac, (state) => safeStepTac(context)(index)(state)),
301
299
  );
302
300
 
303
- // safe_tac: safe inferences on all goals for as long as they apply.
304
301
  export const safeTac = (context: ClassicalContext): Tactic =>
305
302
  repeatDeterm1(firstGoalTac(safeStepsTac(context)));
306
303
 
@@ -324,7 +321,6 @@ const eqContrTac =
324
321
  const eqAssumeContrTac = (context: ClassicalContext) =>
325
322
  orElseGoal(eqAssumeTac, eqContrTac(context));
326
323
 
327
- // bimatch2_tac: two-way branching only where one branch closes at once.
328
324
  const bimatch2Tac =
329
325
  (context: ClassicalContext, netpair: NetPair<TaggedRule>): GoalTactic =>
330
326
  (index) =>
@@ -345,7 +341,6 @@ const clarifyStepTac = (context: ClassicalContext): GoalTactic =>
345
341
  ]),
346
342
  );
347
343
 
348
- // clarify_tac: safe steps that do not split the goal.
349
344
  export const clarifyTac = (context: ClassicalContext): GoalTactic =>
350
345
  selectGoal(repeatDeterm(clarifyStepTac(context)(1)));
351
346
 
@@ -364,7 +359,6 @@ const instStepTac = (context: ClassicalContext): GoalTactic =>
364
359
  export const unsafeStepTac = (context: ClassicalContext): GoalTactic =>
365
360
  biresolveFromNetsTac(context.limits, context.claset.unsafe);
366
361
 
367
- // step_tac: a safe step, or else an unsafe one.
368
362
  const stepTac =
369
363
  (context: ClassicalContext): GoalTactic =>
370
364
  (index) =>
@@ -373,15 +367,18 @@ const stepTac =
373
367
  appWrappers(context, orElseGoal(instStepTac(context), unsafeStepTac(context)))(index),
374
368
  );
375
369
 
376
- // Drule.size_of_thm, the sizef of Isabelle/TLA+'s Classical: the size of the proposition with its
377
- // flex-flex pairs.
370
+ export const fastTac = (context: ClassicalContext, atomizeRules: readonly Thm[]): GoalTactic =>
371
+ thenGoal(
372
+ atomizePremsTac(context.limits, atomizeRules),
373
+ selectGoal(depthSolve(stepTac(context)(1))),
374
+ );
375
+
378
376
  const sizeOfThm = (thm: Thm) =>
379
377
  thm.tpairs.reduce(
380
378
  (size, pair) => size + 2 + sizeOfTerm(pair[0]) + sizeOfTerm(pair[1]),
381
379
  sizeOfTerm(thm.prop),
382
380
  );
383
381
 
384
- // first_best_tac: best-first search with step_tac on the first goal.
385
382
  export const firstBestTac = (context: ClassicalContext, atomizeRules: readonly Thm[]): GoalTactic =>
386
383
  thenGoal(
387
384
  atomizePremsTac(context.limits, atomizeRules),
@@ -1,15 +1,17 @@
1
- // Ported from Isabelle2025's Provers/hypsubst.ML. Copyright (c) 1986-2025 University of
2
- // Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
3
- //
4
- // Substitution using an equality assumption x = t: eliminates x from the subgoal.
5
-
6
- import { TlaIsabelleError } from "../../../errors";
1
+ import { isIsabelleError, TlaIsabelleError } from "../../../errors";
7
2
  import { asmRl, compIncr, revcutRl, thinRl, zeroVarIndexes } from "../pure/drule";
8
3
  import { aeconv, etaContract } from "../pure/envir";
9
- import { occs, stripAssumsConcl, stripAssumsHyp, stripParams } from "../pure/logic";
4
+ import {
5
+ isAllAbs,
6
+ isImplies,
7
+ occs,
8
+ stripAssumsConcl,
9
+ stripAssumsHyp,
10
+ stripParams,
11
+ } from "../pure/logic";
10
12
  import { isBoundName } from "../pure/name";
11
13
  import { emptySimpset, type SimpContext } from "../pure/raw-simplifier";
12
- import { listOfSeq } from "../pure/seq";
14
+ import { seqHead } from "../pure/seq";
13
15
  import { asmLrSimpTac } from "../pure/simplifier";
14
16
  import {
15
17
  determ,
@@ -77,17 +79,9 @@ interface HypsubstContext {
77
79
  readonly data: HypsubstData;
78
80
  }
79
81
 
80
- // The equality offers no variable to eliminate.
81
82
  class NoMatch {}
82
- // The subgoal has no suitable equality.
83
83
  class EqVar {}
84
84
 
85
- const isTermError = (error: unknown) =>
86
- error instanceof TlaIsabelleError && error.exception === "TERM";
87
- const isThmError = (error: unknown) =>
88
- error instanceof TlaIsabelleError && error.exception === "THM";
89
-
90
- // The simplifier turns bound variables into special free variables; any bound variable will do.
91
85
  const inspectContract = (term: Term) => {
92
86
  const contracted = etaContract(term);
93
87
  return contracted.kind === "Free" && isBoundName(contracted.name) ? mkBound(0) : contracted;
@@ -96,8 +90,6 @@ const inspectContract = (term: Term) => {
96
90
  const hasVars = (term: Term) => (flagsOf(term) & HAS_VAR) !== 0;
97
91
  const hasTVars = (term: Term) => existsType((type) => maxidxOfTyp(type) >= 0, term);
98
92
 
99
- // inspect_pair: true to use the equality as it is, false to reorient it first, with the variable
100
- // to substitute.
101
93
  const inspectPair = (
102
94
  isBound: boolean,
103
95
  isNoVars: boolean,
@@ -127,8 +119,6 @@ const inspectPair = (
127
119
  throw new NoMatch();
128
120
  };
129
121
 
130
- // eq_var: the number of assumptions before a substitutable equality, its orientation, and whether
131
- // it eliminates a free variable.
132
122
  const eqVar = (
133
123
  data: HypsubstData,
134
124
  isBound: boolean,
@@ -151,19 +141,8 @@ const eqVar = (
151
141
  term: Term,
152
142
  hyps: readonly Term[],
153
143
  ): [number, [boolean, boolean]] => {
154
- if (
155
- term.kind === "App" &&
156
- term.fun.kind === "Const" &&
157
- term.fun.name === "Pure.all" &&
158
- term.arg.kind === "Abs"
159
- )
160
- return visit(count, term.arg.body, hyps);
161
- if (
162
- term.kind === "App" &&
163
- term.fun.kind === "App" &&
164
- term.fun.fun.kind === "Const" &&
165
- term.fun.fun.name === "Pure.imp"
166
- ) {
144
+ if (isAllAbs(term)) return visit(count, term.arg.body, hyps);
145
+ if (isImplies(term)) {
167
146
  const premise = term.fun.arg;
168
147
  const conclusion = term.arg;
169
148
  try {
@@ -171,7 +150,7 @@ const eqVar = (
171
150
  const [orientation, variable] = inspectPair(isBound, isNoVars, left, right);
172
151
  return [count, checkFree([conclusion, ...hyps], orientation, variable)];
173
152
  } catch (error) {
174
- if (!isTermError(error) && !(error instanceof NoMatch)) throw error;
153
+ if (!isIsabelleError(error, "TERM") && !(error instanceof NoMatch)) throw error;
175
154
  return visit(count + 1, conclusion, [premise, ...hyps]);
176
155
  }
177
156
  }
@@ -185,12 +164,11 @@ const withEqVar = (build: (goal: Term, index: number) => Tactic): GoalTactic =>
185
164
  try {
186
165
  return build(goal, index);
187
166
  } catch (error) {
188
- if (error instanceof EqVar || isThmError(error)) return noTac;
167
+ if (error instanceof EqVar || isIsabelleError(error, "THM")) return noTac;
189
168
  throw error;
190
169
  }
191
170
  });
192
171
 
193
- // mk_eqs: the equality as a rewrite rule that eliminates its variable.
194
172
  const mkEqs = (data: HypsubstData, isBound: boolean, thm: Thm): Thm[] => {
195
173
  try {
196
174
  const [left, right] = data.destEq(data.destTrueprop(thm.prop));
@@ -198,7 +176,7 @@ const mkEqs = (data: HypsubstData, isBound: boolean, thm: Thm): Thm[] => {
198
176
  ? [rs(thm, data.eqReflection)]
199
177
  : [symmetric(rs(thm, data.eqReflection))];
200
178
  } catch (error) {
201
- if (isTermError(error) || error instanceof NoMatch) return [];
179
+ if (isIsabelleError(error, "TERM") || error instanceof NoMatch) return [];
202
180
  throw error;
203
181
  }
204
182
  };
@@ -239,7 +217,7 @@ const instSubstTac = (context: HypsubstContext, isLeft: boolean, rule: Thm): Goa
239
217
  const [left, right] = data.destEq(data.destTrueprop(hyp));
240
218
  return [etaContract(left), etaContract(right)] as const;
241
219
  } catch (error) {
242
- if (isTermError(error)) return undefined;
220
+ if (isIsabelleError(error, "TERM")) return undefined;
243
221
  throw error;
244
222
  }
245
223
  })();
@@ -253,7 +231,9 @@ const instSubstTac = (context: HypsubstContext, isLeft: boolean, rule: Thm): Goa
253
231
  const conclusion = data.destTrueprop(stripAssumsConcl(goal));
254
232
  const lifted = liftRule(goal, state.maxidx, rule);
255
233
  const head = headOf(data.destTrueprop(stripAssumsConcl(lifted.prop)));
256
- const [v1, v2] = data.destEq(data.destTrueprop(stripAssumsConcl(premsOf(lifted)[0])));
234
+ const [leftVar, rightVar] = data.destEq(
235
+ data.destTrueprop(stripAssumsConcl(premsOf(lifted)[0])),
236
+ );
257
237
  if (head.kind !== "Var") throw new TlaIsabelleError("TERM", "dest_Var");
258
238
  const binders = binderTypes(head.type);
259
239
  const paramTypes = binders.slice(0, -1);
@@ -265,9 +245,9 @@ const instSubstTac = (context: HypsubstContext, isLeft: boolean, rule: Thm): Goa
265
245
  chosen.kind === "Bound"
266
246
  ? substBounds(
267
247
  [
268
- ...Array.from({ length: chosen.index }, (_, position) => mkBound(position + 1)),
248
+ ...Array.from({ length: chosen.index }, (_value, position) => mkBound(position + 1)),
269
249
  mkBound(0),
270
- ...Array.from({ length: params.length - chosen.index - 1 }, (_, position) =>
250
+ ...Array.from({ length: params.length - chosen.index - 1 }, (_value, position) =>
271
251
  mkBound(chosen.index + 2 + position),
272
252
  ),
273
253
  ],
@@ -277,9 +257,9 @@ const instSubstTac = (context: HypsubstContext, isLeft: boolean, rule: Thm): Goa
277
257
  const motive = absParams(mkAbs("x", paramType, body));
278
258
  const tyenv = matchTypes(lastType, paramType, emptyTyEnv);
279
259
  if (tyenv === undefined) throw new TlaIsabelleError("TYPE", "Thm.match");
280
- const headV1 = headOf(v1);
281
- const headV2 = headOf(v2);
282
- if (headV1.kind !== "Var" || headV2.kind !== "Var")
260
+ const leftHead = headOf(leftVar);
261
+ const rightHead = headOf(rightVar);
262
+ if (leftHead.kind !== "Var" || rightHead.kind !== "Var")
283
263
  throw new TlaIsabelleError("TERM", "dest_Var");
284
264
  const instantiated = instantiate(
285
265
  [
@@ -296,8 +276,8 @@ const instSubstTac = (context: HypsubstContext, isLeft: boolean, rule: Thm): Goa
296
276
  },
297
277
  {
298
278
  variable: mkVar(
299
- headV1.name,
300
- headV1.index,
279
+ leftHead.name,
280
+ leftHead.index,
301
281
  funTs(
302
282
  paramTypes.map((type) => substType(tyenv, type)),
303
283
  paramType,
@@ -307,8 +287,8 @@ const instSubstTac = (context: HypsubstContext, isLeft: boolean, rule: Thm): Goa
307
287
  },
308
288
  {
309
289
  variable: mkVar(
310
- headV2.name,
311
- headV2.index,
290
+ rightHead.name,
291
+ rightHead.index,
312
292
  funTs(
313
293
  paramTypes.map((type) => substType(tyenv, type)),
314
294
  paramType,
@@ -349,13 +329,11 @@ const varsGenHypSubstTac = (context: HypsubstContext, isBound: boolean): GoalTac
349
329
  });
350
330
 
351
331
  const revDupElim = (thm: Thm) => {
352
- const result = listOfSeq(assumption(undefined, 2, rsn(thm, 2, revcutRl)))[0];
332
+ const result = seqHead(assumption(undefined, 2, rsn(thm, 2, revcutRl)));
353
333
  if (result === undefined) throw new TlaIsabelleError("THM", "rev_dup_elim");
354
334
  return result;
355
335
  };
356
336
 
357
- // hyp_subst_tac with hypsubst_thin off, its default: substitutes for free or bound variables and
358
- // drops equalities on bound variables.
359
337
  export const hypSubstTac =
360
338
  (context: HypsubstContext): GoalTactic =>
361
339
  (index) =>
@@ -386,7 +364,6 @@ const reverseNTac = (context: HypsubstContext, count: number, index: number): Ta
386
364
  ),
387
365
  );
388
366
 
389
- // all_imp_intr_tac: reintroduces the hypotheses, leaving the changed ones at the end.
390
367
  const allImpIntrTac = (context: HypsubstContext, hyps: readonly Term[], index: number): Tactic => {
391
368
  const imptac =
392
369
  (count: number, remaining: readonly Term[]): Tactic =>
@@ -407,8 +384,6 @@ const allImpIntrTac = (context: HypsubstContext, hyps: readonly Term[], index: n
407
384
  return imptac(0, [...hyps].reverse());
408
385
  };
409
386
 
410
- // blast_hyp_subst_tac: the version for blast, which moves the hypotheses the substitution changes
411
- // to the front.
412
387
  export const blastHypSubstTac = (context: HypsubstContext): GoalTactic =>
413
388
  withEqVar((goal, index) => {
414
389
  const [count, [orientation]] = eqVar(context.data, false, false, false, goal);
@@ -1,37 +1,16 @@
1
- // Ported from Isabelle2025's Pure/thm.ML. Copyright (c) 1986-2025 University of Cambridge,
2
- // Technische Universitaet Muenchen, and contributors, see LICENSE.
3
- //
4
- // The term operations behind Thm.bicompose, which builds the theorem itself in thm.ts.
5
-
6
1
  import { TlaIsabelleError } from "../../../errors";
7
2
  import { normTerm, type Envir } from "./envir";
8
- import { allConst, mkImplies } from "./logic";
3
+ import { allConst, isAllAbs, isImplies, mkImplies } from "./logic";
9
4
  import { unifyTypesEnvir } from "./pattern";
10
5
  import type { Thm } from "./thm";
11
6
  import { normType } from "./type";
12
7
  import { eqTyp, foldVars, matchBvars, mkAbs, mkApp, mkVar, type Term, type Typ } from "./term";
13
8
  import type { Tpair } from "./unify";
14
9
 
15
- const isImpApp = (
16
- term: Term,
17
- ): term is Extract<Term, { kind: "App" }> & { fun: Extract<Term, { kind: "App" }> } =>
18
- term.kind === "App" &&
19
- term.fun.kind === "App" &&
20
- term.fun.fun.kind === "Const" &&
21
- term.fun.fun.name === "Pure.imp";
22
-
23
- const isAllApp = (
24
- term: Term,
25
- ): term is Extract<Term, { kind: "App" }> & { arg: Extract<Term, { kind: "Abs" }> } =>
26
- term.kind === "App" &&
27
- term.fun.kind === "Const" &&
28
- term.fun.name === "Pure.all" &&
29
- term.arg.kind === "Abs";
30
-
31
10
  export const stripApply = (apply: (term: Term) => Term, lifted: Term, term: Term): Term => {
32
- if (isImpApp(lifted) && isImpApp(term))
11
+ if (isImplies(lifted) && isImplies(term))
33
12
  return mkApp(mkApp(lifted.fun.fun, term.fun.arg), stripApply(apply, lifted.arg, term.arg));
34
- if (isAllApp(lifted) && isAllApp(term))
13
+ if (isAllAbs(lifted) && isAllAbs(term))
35
14
  return mkApp(
36
15
  lifted.fun,
37
16
  mkAbs(term.arg.name, term.arg.type, stripApply(apply, lifted.arg.body, term.arg.body)),
@@ -40,8 +19,8 @@ export const stripApply = (apply: (term: Term) => Term, lifted: Term, term: Term
40
19
  };
41
20
 
42
21
  const stripLifted = (lifted: Term, term: Term): Term => {
43
- if (isImpApp(lifted) && isImpApp(term)) return stripLifted(lifted.arg, term.arg);
44
- if (isAllApp(lifted) && isAllApp(term)) return stripLifted(lifted.arg.body, term.arg.body);
22
+ if (isImplies(lifted) && isImplies(term)) return stripLifted(lifted.arg, term.arg);
23
+ if (isAllAbs(lifted) && isAllAbs(term)) return stripLifted(lifted.arg.body, term.arg.body);
45
24
  return term;
46
25
  };
47
26
 
@@ -54,8 +33,6 @@ const makeDistinct = (pairs: readonly [string, string][]) => {
54
33
  return table;
55
34
  };
56
35
 
57
- // Thm.rename_bvars: renames bound variables and some unknowns of the new premises after the
58
- // names in the disagreement pairs.
59
36
  export const renameBvars = (
60
37
  dpairs: readonly Tpair[],
61
38
  tpairs: readonly Tpair[],
@@ -86,16 +63,24 @@ export const renameBvars = (
86
63
  );
87
64
  const delClashing = (
88
65
  isClash: boolean,
89
- xs: Set<string>,
90
- ys: Set<string>,
66
+ clashed: Set<string>,
67
+ taken: Set<string>,
91
68
  rest: readonly [string, string][],
92
69
  kept: [string, string][],
93
70
  ): [string, string][] => {
94
- if (rest.length === 0) return isClash ? delClashing(false, xs, new Set(xs), kept, []) : kept;
95
- const [pair, ...others] = rest;
96
- if (ys.has(pair[1]))
97
- return delClashing(true, new Set(xs).add(pair[0]), new Set(ys).add(pair[0]), others, kept);
98
- return delClashing(isClash, xs, new Set(ys).add(pair[1]), others, [pair, ...kept]);
71
+ if (rest.length === 0)
72
+ return isClash ? delClashing(false, clashed, new Set(clashed), kept, []) : kept;
73
+ const pair = rest[0];
74
+ const others = rest.slice(1);
75
+ if (taken.has(pair[1]))
76
+ return delClashing(
77
+ true,
78
+ new Set(clashed).add(pair[0]),
79
+ new Set(taken).add(pair[0]),
80
+ others,
81
+ kept,
82
+ );
83
+ return delClashing(isClash, clashed, new Set(taken).add(pair[1]), others, [pair, ...kept]);
99
84
  };
100
85
  const vars = makeDistinct(delClashing(false, unchanged, new Set(unchanged), distinct, []));
101
86
  const bounds = makeDistinct(pairs);
@@ -122,8 +107,8 @@ export const renameBvars = (
122
107
  };
123
108
 
124
109
  export const stripAssums2 = (lifted: Term, goal: Term): Tpair => {
125
- if (isImpApp(lifted) && isImpApp(goal)) return stripAssums2(lifted.arg, goal.arg);
126
- if (isAllApp(lifted) && isAllApp(goal)) {
110
+ if (isImplies(lifted) && isImplies(goal)) return stripAssums2(lifted.arg, goal.arg);
111
+ if (isAllAbs(lifted) && isAllAbs(goal)) {
127
112
  const [left, right] = stripAssums2(lifted.arg.body, goal.arg.body);
128
113
  return [
129
114
  mkAbs(lifted.arg.name, lifted.arg.type, left),
@@ -135,14 +120,14 @@ export const stripAssums2 = (lifted: Term, goal: Term): Tpair => {
135
120
 
136
121
  export const normTermSkip = (envir: Envir, count: number, term: Term): Term => {
137
122
  if (count === 0) return normTerm(envir, term);
138
- if (isAllApp(term)) {
123
+ if (isAllAbs(term)) {
139
124
  const type = normType(envir.tyenv, term.arg.type);
140
125
  return mkApp(
141
126
  allConst(type),
142
127
  mkAbs(term.arg.name, type, normTermSkip(envir, count, term.arg.body)),
143
128
  );
144
129
  }
145
- if (isImpApp(term)) return mkImplies(term.fun.arg, normTermSkip(envir, count - 1, term.arg));
130
+ if (isImplies(term)) return mkImplies(term.fun.arg, normTermSkip(envir, count - 1, term.arg));
146
131
  throw new TlaIsabelleError("ERROR", "norm_term_skip: too few assumptions??");
147
132
  };
148
133
 
@@ -1,15 +1,8 @@
1
- // Ported from Isabelle2025's Pure/consts.ML. Copyright (c) 1986-2025 University of Cambridge,
2
- // Technische Universitaet Muenchen, and contributors, see LICENSE.
3
- //
4
- // A constant's type arguments: the instances of the type variables of its declared type, which
5
- // Consts.declare locates once so that Consts.typargs only has to look them up.
6
-
7
1
  import { TlaIsabelleError } from "../../../errors";
8
2
  import type { Typ } from "./term";
9
3
 
10
4
  export type TypargPosition = readonly number[];
11
5
 
12
- // Consts.typargs_of: the path to the first occurrence of each type variable.
13
6
  export const typargsOf = (type: Typ): TypargPosition[] => {
14
7
  const found = new Map<string, TypargPosition>();
15
8
  const visit = (current: Typ, path: readonly number[]) => {
@@ -21,7 +14,6 @@ export const typargsOf = (type: Typ): TypargPosition[] => {
21
14
  return [...found.values()];
22
15
  };
23
16
 
24
- // Consts.typargs: the type arguments of a constant at an instance of its declared type.
25
17
  export const typargs = (positions: readonly TypargPosition[], type: Typ): Typ[] =>
26
18
  positions.map((path) =>
27
19
  path.reduce((current, index) => {