tla-ts 0.0.9 → 0.0.10-dev.63a6693bd

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 (400) hide show
  1. package/README.md +29 -1
  2. package/dist/compile.cjs +23 -0
  3. package/dist/compile.js +23 -0
  4. package/dist/deciders.cjs +29 -29
  5. package/dist/deciders.js +42 -42
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +106 -10
  8. package/dist/index.d.ts +106 -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 +117 -37
  15. package/dist/prove.js +116 -36
  16. package/dist/run.cjs +143 -31
  17. package/dist/run.js +143 -31
  18. package/dist/tlapm.cjs +2 -2
  19. package/dist/tlapm.js +2 -2
  20. package/dist/transfer.cjs +129 -104
  21. package/dist/transfer.js +129 -104
  22. package/dist/worker.cjs +7 -7
  23. package/dist/worker.js +7 -7
  24. package/package.json +3 -1
  25. package/src/ast.ts +48 -62
  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 +599 -754
  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 +14 -25
  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 +361 -0
  40. package/src/cli/tlc.ts +309 -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 +14 -53
  48. package/src/dfid.ts +618 -0
  49. package/src/environment-config.ts +315 -0
  50. package/src/environment.ts +169 -335
  51. package/src/errors.ts +71 -55
  52. package/src/evaluate.ts +598 -340
  53. package/src/exit-codes.ts +37 -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 +80 -100
  63. package/src/liveness-checker.ts +103 -153
  64. package/src/liveness.ts +150 -109
  65. package/src/obligations/action.ts +8 -39
  66. package/src/obligations/anonymize.ts +88 -82
  67. package/src/obligations/equality.ts +1 -1
  68. package/src/obligations/expression.ts +20 -21
  69. package/src/obligations/format.ts +1 -9
  70. package/src/obligations/generate.ts +46 -49
  71. package/src/obligations/index.ts +2 -13
  72. package/src/obligations/levels.ts +4 -8
  73. package/src/obligations/module.ts +28 -53
  74. package/src/obligations/normalize.ts +7 -25
  75. package/src/obligations/operators.ts +1 -2
  76. package/src/obligations/pragma.ts +1 -10
  77. package/src/obligations/printer.ts +47 -46
  78. package/src/obligations/proof.ts +1 -5
  79. package/src/obligations/regroup.ts +1 -4
  80. package/src/obligations/simplify.ts +42 -58
  81. package/src/obligations/source.ts +48 -78
  82. package/src/obligations/subexpression.ts +5 -11
  83. package/src/obligations/substitution.ts +1 -3
  84. package/src/obligations/temporal.ts +13 -19
  85. package/src/obligations/tuples.ts +3 -9
  86. package/src/parallel-worker.ts +30 -60
  87. package/src/parallel.ts +57 -71
  88. package/src/parser.ts +584 -316
  89. package/src/pcal/ast.ts +53 -86
  90. package/src/pcal/parse.ts +144 -219
  91. package/src/pcal/tokenize.ts +91 -131
  92. package/src/pcal/translate.ts +83 -130
  93. package/src/pcal/validate.ts +48 -68
  94. package/src/pretty-print.ts +7 -8
  95. package/src/prover/decide-pool.ts +8 -13
  96. package/src/prover/deciders.ts +3 -7
  97. package/src/prover/first-order.ts +0 -11
  98. package/src/prover/isabelle/decide.ts +0 -6
  99. package/src/prover/isabelle/encode.ts +11 -23
  100. package/src/prover/isabelle/isar/inner-syntax.ts +114 -115
  101. package/src/prover/isabelle/isar/method.ts +29 -53
  102. package/src/prover/isabelle/isar/proof.ts +1 -10
  103. package/src/prover/isabelle/isar/statement.ts +1 -6
  104. package/src/prover/isabelle/isar/theory.ts +26 -36
  105. package/src/prover/isabelle/isar/type-check.ts +17 -31
  106. package/src/prover/isabelle/provers/blast/blast.ts +17 -104
  107. package/src/prover/isabelle/provers/blast/branch.ts +1 -32
  108. package/src/prover/isabelle/provers/blast/prove.ts +1 -35
  109. package/src/prover/isabelle/provers/blast/rules.ts +6 -44
  110. package/src/prover/isabelle/provers/blast/state.ts +2 -28
  111. package/src/prover/isabelle/provers/blast/term.ts +9 -36
  112. package/src/prover/isabelle/provers/clasimp.ts +1 -13
  113. package/src/prover/isabelle/provers/classical.ts +14 -42
  114. package/src/prover/isabelle/provers/hypsubst.ts +28 -51
  115. package/src/prover/isabelle/pure/bicompose.ts +25 -38
  116. package/src/prover/isabelle/pure/consts.ts +1 -7
  117. package/src/prover/isabelle/pure/conv.ts +3 -17
  118. package/src/prover/isabelle/pure/drule.ts +33 -42
  119. package/src/prover/isabelle/pure/envir.ts +3 -52
  120. package/src/prover/isabelle/pure/goal.ts +1 -7
  121. package/src/prover/isabelle/pure/interrupt.ts +0 -5
  122. package/src/prover/isabelle/pure/list.ts +0 -3
  123. package/src/prover/isabelle/pure/logic.ts +2 -15
  124. package/src/prover/isabelle/pure/name.ts +2 -9
  125. package/src/prover/isabelle/pure/net.ts +3 -59
  126. package/src/prover/isabelle/pure/object-logic.ts +3 -10
  127. package/src/prover/isabelle/pure/pattern.ts +2 -19
  128. package/src/prover/isabelle/pure/raw-simplifier.ts +17 -62
  129. package/src/prover/isabelle/pure/rewriter.ts +31 -67
  130. package/src/prover/isabelle/pure/search.ts +3 -10
  131. package/src/prover/isabelle/pure/seq.ts +1 -10
  132. package/src/prover/isabelle/pure/simplifier.ts +4 -12
  133. package/src/prover/isabelle/pure/table.ts +3 -32
  134. package/src/prover/isabelle/pure/tactic.ts +12 -22
  135. package/src/prover/isabelle/pure/tactical.ts +48 -47
  136. package/src/prover/isabelle/pure/term-ord.ts +2 -6
  137. package/src/prover/isabelle/pure/term.ts +2 -43
  138. package/src/prover/isabelle/pure/thm.ts +27 -47
  139. package/src/prover/isabelle/pure/type.ts +2 -15
  140. package/src/prover/isabelle/pure/unify.ts +20 -30
  141. package/src/prover/isabelle/pure/variable.ts +3 -7
  142. package/src/prover/isabelle/tla/classical-setup.ts +17 -24
  143. package/src/prover/isabelle/tla/context.ts +15 -18
  144. package/src/prover/isabelle/tla/logic.ts +14 -32
  145. package/src/prover/isabelle/tla/simpdata.ts +46 -43
  146. package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
  147. package/src/prover/ocaml.ts +0 -6
  148. package/src/prover/prep/action.ts +14 -54
  149. package/src/prover/prep/enabled-axioms.ts +12 -19
  150. package/src/prover/prep/fingerprint.ts +2 -21
  151. package/src/prover/prep/level-comparison.ts +8 -12
  152. package/src/prover/prep/md5.ts +0 -2
  153. package/src/prover/prep/methods.ts +33 -39
  154. package/src/prover/prep/normalize.ts +4 -28
  155. package/src/prover/prove-worker.ts +0 -2
  156. package/src/prover/prove.ts +87 -100
  157. package/src/prover/ptl/decide.ts +7 -12
  158. package/src/prover/ptl/encode.ts +14 -36
  159. package/src/prover/ptl/sat.ts +24 -32
  160. package/src/prover/ptl/tableau.ts +12 -26
  161. package/src/prover/smt/axioms.ts +0 -7
  162. package/src/prover/smt/context.ts +20 -28
  163. package/src/prover/smt/data.ts +433 -424
  164. package/src/prover/smt/encode.ts +43 -52
  165. package/src/prover/smt/extensionality.ts +0 -10
  166. package/src/prover/smt/flatten.ts +3 -22
  167. package/src/prover/smt/format.ts +5 -10
  168. package/src/prover/smt/instances.ts +0 -10
  169. package/src/prover/smt/rewrite.ts +663 -667
  170. package/src/prover/smt/solver/act-cache.ts +0 -15
  171. package/src/prover/smt/solver/arith-rewriter.ts +3 -48
  172. package/src/prover/smt/solver/array.ts +1 -3
  173. package/src/prover/smt/solver/asserted-formulas.ts +1 -43
  174. package/src/prover/smt/solver/ast-lt.ts +1 -11
  175. package/src/prover/smt/solver/ast-util.ts +1 -6
  176. package/src/prover/smt/solver/ast.ts +1 -165
  177. package/src/prover/smt/solver/auf-solver.ts +8 -44
  178. package/src/prover/smt/solver/case-split-queue.ts +1 -9
  179. package/src/prover/smt/solver/cg-table.ts +1 -18
  180. package/src/prover/smt/solver/clause.ts +1 -27
  181. package/src/prover/smt/solver/conflict-resolution.ts +0 -9
  182. package/src/prover/smt/solver/context.ts +7 -64
  183. package/src/prover/smt/solver/ctx-simplify.ts +14 -41
  184. package/src/prover/smt/solver/der.ts +2 -21
  185. package/src/prover/smt/solver/dyn-ack.ts +1 -11
  186. package/src/prover/smt/solver/e-matching.ts +4 -35
  187. package/src/prover/smt/solver/enode.ts +1 -21
  188. package/src/prover/smt/solver/expr-ref.ts +1 -5
  189. package/src/prover/smt/solver/expr-safe-replace.ts +1 -6
  190. package/src/prover/smt/solver/fingerprints.ts +1 -12
  191. package/src/prover/smt/solver/flat-literals.ts +1 -9
  192. package/src/prover/smt/solver/goal.ts +2 -14
  193. package/src/prover/smt/solver/hash.ts +0 -8
  194. package/src/prover/smt/solver/hashtable.ts +1 -12
  195. package/src/prover/smt/solver/internalizer.ts +7 -100
  196. package/src/prover/smt/solver/lbool.ts +1 -2
  197. package/src/prover/smt/solver/literal.ts +0 -3
  198. package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
  199. package/src/prover/smt/solver/lp/constraints.ts +2 -8
  200. package/src/prover/smt/solver/lp/containers.ts +12 -30
  201. package/src/prover/smt/solver/lp/core-solver.ts +10 -31
  202. package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
  203. package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
  204. package/src/prover/smt/solver/lp/dependency.ts +1 -4
  205. package/src/prover/smt/solver/lp/dioph-eq.ts +9 -102
  206. package/src/prover/smt/solver/lp/explanation.ts +1 -6
  207. package/src/prover/smt/solver/lp/gomory.ts +9 -22
  208. package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
  209. package/src/prover/smt/solver/lp/hnf.ts +11 -26
  210. package/src/prover/smt/solver/lp/int-cube.ts +15 -36
  211. package/src/prover/smt/solver/lp/int-solver.ts +4 -34
  212. package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
  213. package/src/prover/smt/solver/lp/lar-term.ts +1 -5
  214. package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
  215. package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
  216. package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
  217. package/src/prover/smt/solver/lp/nex.ts +1 -6
  218. package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
  219. package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
  220. package/src/prover/smt/solver/lp/nla-core.ts +36 -135
  221. package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
  222. package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
  223. package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
  224. package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
  225. package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
  226. package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
  227. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
  228. package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
  229. package/src/prover/smt/solver/lp/nla-order.ts +2 -13
  230. package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
  231. package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
  232. package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
  233. package/src/prover/smt/solver/lp/nla-types.ts +1 -11
  234. package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
  235. package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
  236. package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
  237. package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
  238. package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
  239. package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
  240. package/src/prover/smt/solver/lp/pdd.ts +7 -70
  241. package/src/prover/smt/solver/lp/random-updater.ts +1 -8
  242. package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
  243. package/src/prover/smt/solver/lp/union-find.ts +1 -6
  244. package/src/prover/smt/solver/mam-compiler.ts +18 -58
  245. package/src/prover/smt/solver/mam-interpreter.ts +1 -21
  246. package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
  247. package/src/prover/smt/solver/model-checker.ts +3 -37
  248. package/src/prover/smt/solver/model-evaluator.ts +3 -29
  249. package/src/prover/smt/solver/model-finder.ts +15 -32
  250. package/src/prover/smt/solver/model-generator.ts +1 -12
  251. package/src/prover/smt/solver/model-macro-solver.ts +23 -88
  252. package/src/prover/smt/solver/nlsat/algebraic.ts +63 -159
  253. package/src/prover/smt/solver/nlsat/atoms.ts +25 -23
  254. package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
  255. package/src/prover/smt/solver/nlsat/explain.ts +10 -69
  256. package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
  257. package/src/prover/smt/solver/nlsat/levelwise.ts +49 -135
  258. package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
  259. package/src/prover/smt/solver/nlsat/polynomial.ts +29 -159
  260. package/src/prover/smt/solver/nlsat/solver.ts +18 -90
  261. package/src/prover/smt/solver/nlsat/types.ts +1 -8
  262. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +2 -45
  263. package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
  264. package/src/prover/smt/solver/nnf.ts +3 -38
  265. package/src/prover/smt/solver/pattern-inference.ts +2 -15
  266. package/src/prover/smt/solver/poly-rewriter.ts +3 -23
  267. package/src/prover/smt/solver/propagate-values.ts +1 -10
  268. package/src/prover/smt/solver/proto-model.ts +3 -52
  269. package/src/prover/smt/solver/pull-quant.ts +1 -12
  270. package/src/prover/smt/solver/qe-lite-der.ts +1 -29
  271. package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
  272. package/src/prover/smt/solver/qe-lite.ts +3 -33
  273. package/src/prover/smt/solver/qi-queue.ts +1 -16
  274. package/src/prover/smt/solver/quant-tactics.ts +5 -22
  275. package/src/prover/smt/solver/quantifier-analyzer.ts +27 -47
  276. package/src/prover/smt/solver/quantifier-manager.ts +2 -13
  277. package/src/prover/smt/solver/random-gen.ts +1 -2
  278. package/src/prover/smt/solver/rational.ts +1 -8
  279. package/src/prover/smt/solver/ref-vector.ts +1 -6
  280. package/src/prover/smt/solver/relevancy.ts +2 -15
  281. package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
  282. package/src/prover/smt/solver/rewriter.ts +3 -85
  283. package/src/prover/smt/solver/rlimit.ts +2 -20
  284. package/src/prover/smt/solver/smtlib-parser.ts +80 -131
  285. package/src/prover/smt/solver/solver.ts +23 -34
  286. package/src/prover/smt/solver/sort.ts +1 -5
  287. package/src/prover/smt/solver/sticky-generations.ts +0 -5
  288. package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
  289. package/src/prover/smt/solver/theory-lra-bounds.ts +1 -7
  290. package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
  291. package/src/prover/smt/solver/theory-lra-internalize.ts +6 -43
  292. package/src/prover/smt/solver/theory-lra-model.ts +4 -19
  293. package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
  294. package/src/prover/smt/solver/theory-lra-state.ts +3 -8
  295. package/src/prover/smt/solver/theory-lra.ts +1 -8
  296. package/src/prover/smt/solver/var-subst.ts +2 -26
  297. package/src/prover/smt/table.ts +0 -8
  298. package/src/prover/tlapm/cache.ts +45 -40
  299. package/src/prover/tlapm/ocaml-marshal.ts +19 -21
  300. package/src/prover/tlapm/tlapm.ts +21 -20
  301. package/src/prover/verdict.ts +7 -2
  302. package/src/prover/zenon/check/check.ts +1 -11
  303. package/src/prover/zenon/check/definitions.ts +5 -15
  304. package/src/prover/zenon/check/equality.ts +0 -8
  305. package/src/prover/zenon/check/functions.ts +0 -4
  306. package/src/prover/zenon/check/keys.ts +0 -7
  307. package/src/prover/zenon/check/propositional.ts +0 -3
  308. package/src/prover/zenon/check/records.ts +1 -6
  309. package/src/prover/zenon/check/relations.ts +2 -14
  310. package/src/prover/zenon/check/rewrites.ts +2 -21
  311. package/src/prover/zenon/check/sets.ts +40 -61
  312. package/src/prover/zenon/check/terms.ts +1 -19
  313. package/src/prover/zenon/check/tla.ts +0 -6
  314. package/src/prover/zenon/decide.ts +0 -12
  315. package/src/prover/zenon/encode.ts +1 -8
  316. package/src/prover/zenon/eqrel.ts +2 -13
  317. package/src/prover/zenon/equality-rules.ts +0 -4
  318. package/src/prover/zenon/expr.ts +8 -26
  319. package/src/prover/zenon/index-table.ts +26 -57
  320. package/src/prover/zenon/isar-case.ts +9 -19
  321. package/src/prover/zenon/isar.ts +36 -64
  322. package/src/prover/zenon/limits.ts +0 -4
  323. package/src/prover/zenon/llproof.ts +2 -20
  324. package/src/prover/zenon/mltoll.ts +66 -104
  325. package/src/prover/zenon/node.ts +1 -11
  326. package/src/prover/zenon/ocaml.ts +1 -17
  327. package/src/prover/zenon/parse.ts +4 -12
  328. package/src/prover/zenon/phrase.ts +1 -11
  329. package/src/prover/zenon/proof.ts +0 -9
  330. package/src/prover/zenon/propositional-rules.ts +0 -5
  331. package/src/prover/zenon/rules.ts +2 -6
  332. package/src/prover/zenon/search.ts +5 -31
  333. package/src/prover/zenon/tla/functions.ts +59 -31
  334. package/src/prover/zenon/tla/llproof.ts +67 -76
  335. package/src/prover/zenon/tla/records.ts +57 -33
  336. package/src/prover/zenon/tla/rewrites.ts +12 -19
  337. package/src/prover/zenon/tla/sets.ts +83 -53
  338. package/src/prover/zenon/tla/terms.ts +0 -6
  339. package/src/prover/zenon/tla/tla.ts +66 -64
  340. package/src/randomization.ts +81 -35
  341. package/src/resolve.ts +67 -184
  342. package/src/runtime.ts +22 -22
  343. package/src/sany/builtins.ts +2 -5
  344. package/src/sany/generation.ts +394 -0
  345. package/src/sany/generator-def-entries.ts +210 -0
  346. package/src/sany/generator-definitions.ts +686 -0
  347. package/src/sany/generator-expressions.ts +1100 -0
  348. package/src/sany/generator-proofs.ts +662 -0
  349. package/src/sany/generator.ts +191 -2764
  350. package/src/sany/levels.ts +6 -34
  351. package/src/sany/lexer.ts +58 -77
  352. package/src/sany/linter.ts +1 -9
  353. package/src/sany/modules.ts +1 -5
  354. package/src/sany/nodes.ts +5 -43
  355. package/src/sany/parse-error.ts +39 -117
  356. package/src/sany/report.ts +32 -69
  357. package/src/sany/selectors.ts +49 -76
  358. package/src/sany/source.ts +1 -17
  359. package/src/sany/xml.ts +35 -117
  360. package/src/search.ts +541 -163
  361. package/src/simulate.ts +709 -0
  362. package/src/spec-description.ts +192 -100
  363. package/src/standard-definitions.ts +0 -4
  364. package/src/standard-modules.ts +264 -95
  365. package/src/state-graph.ts +52 -31
  366. package/src/subexpressions.ts +69 -52
  367. package/src/substitution-levels.ts +7 -7
  368. package/src/successors.ts +266 -99
  369. package/src/symmetry.ts +33 -25
  370. package/src/tableau.ts +27 -24
  371. package/src/tlc/fingerprint.ts +183 -67
  372. package/src/tlc/jar-data.ts +112 -6
  373. package/src/tlc/messages.ts +125 -54
  374. package/src/tlc/order.ts +39 -69
  375. package/src/tlc/random.ts +37 -49
  376. package/src/tlc/replay.ts +553 -228
  377. package/src/tlc/summary.ts +36 -47
  378. package/src/tlc/tlc-operators.ts +78 -44
  379. package/src/tlc/tlcext-operators.ts +139 -122
  380. package/src/tlc/trace-spec.ts +249 -0
  381. package/src/tlc/value-stream.ts +139 -0
  382. package/src/tlc/version.ts +1 -4
  383. package/src/transfer.ts +22 -25
  384. package/src/typescript/actions.ts +479 -0
  385. package/src/typescript/collections.ts +614 -0
  386. package/src/typescript/compile.ts +63 -0
  387. package/src/typescript/context.ts +94 -0
  388. package/src/typescript/emit.ts +121 -0
  389. package/src/typescript/expressions.ts +496 -0
  390. package/src/typescript/formula.ts +154 -0
  391. package/src/typescript/functions.ts +284 -0
  392. package/src/typescript/model.ts +162 -0
  393. package/src/typescript/names.ts +114 -0
  394. package/src/typescript/program.ts +48 -0
  395. package/src/typescript/properties.ts +139 -0
  396. package/src/typescript/scope.ts +112 -0
  397. package/src/typescript/steps.ts +167 -0
  398. package/src/typescript/types.ts +171 -0
  399. package/src/values.ts +832 -484
  400. package/src/worker.ts +7 -8
@@ -1,14 +1,9 @@
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:.
1
+ // Ported from Isabelle2025's Provers/classical.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
7
2
 
8
3
  import { TlaIsabelleError } from "../../../errors";
9
4
  import { revcutRl, thinRl, zeroVarIndexes, makeElim } from "../pure/drule";
10
5
  import { selectGoal } from "../pure/goal";
11
- import { aconv, sizeOfTerm } from "../pure/term";
6
+ import { aconv, sizeOfTerm, type Term } from "../pure/term";
12
7
  import { stripAssumsConcl, stripAssumsHyp } from "../pure/logic";
13
8
  import { listOfSeq, seqHead } from "../pure/seq";
14
9
  import { trade } from "../pure/variable";
@@ -48,10 +43,17 @@ import {
48
43
  type NetPair,
49
44
  type TaggedRule,
50
45
  } from "../pure/tactic";
51
- import { assumption, biresolution, nprems, premsOf, rs, rsn, type Thm } from "../pure/thm";
46
+ import {
47
+ assumption,
48
+ biresolution,
49
+ nprems,
50
+ premsOf,
51
+ rs,
52
+ rsn,
53
+ type BiresRule,
54
+ type Thm,
55
+ } from "../pure/thm";
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[];
@@ -79,17 +80,11 @@ export interface Claset {
79
80
  readonly dup: NetPair<TaggedRule>;
80
81
  }
81
82
 
82
- // CLASSICAL_DATA: the object logic's rules for the classical reasoner.
83
83
  export interface ClassicalData {
84
- // P --> Q ==> (~ R ==> P) ==> (Q ==> R) ==> R
85
84
  readonly impElim: Thm;
86
- // ~P ==> P ==> R
87
85
  readonly notElim: Thm;
88
- // ~ P ==> (~ R ==> P) ==> R
89
86
  readonly swap: Thm;
90
- // (~ P ==> P) ==> P
91
87
  readonly classical: Thm;
92
- // The object logic's Trueprop, which Object_Logic.elim_concl looks through.
93
88
  readonly judgment: string;
94
89
  readonly hypSubstTacs: readonly ((limits: Limits) => GoalTactic)[];
95
90
  }
@@ -105,8 +100,6 @@ export const withClaset = (context: ClassicalContext, claset: Claset): Classical
105
100
  claset,
106
101
  });
107
102
 
108
- // classical_rule: strengthens an elimination rule whose conclusion is a variable, so that the
109
- // negated conclusion becomes available to every case.
110
103
  const classicalRule = (data: ClassicalData, rule: Thm, limits: Limits): Thm => {
111
104
  const concl = premsOf(rule).length === 0 ? rule.prop : stripAssumsConcl(rule.prop);
112
105
  const body =
@@ -118,7 +111,7 @@ const classicalRule = (data: ClassicalData, rule: Thm, limits: Limits): Thm => {
118
111
  if (!isElim) return rule;
119
112
  const strengthened = rs(rule, data.classical);
120
113
  const strengthenedConcl = stripAssumsConcl(strengthened.prop);
121
- const isRedundant = (goal: ReturnType<typeof premsOf>[number]) => {
114
+ const isRedundant = (goal: Term) => {
122
115
  if (aconv(strengthenedConcl, stripAssumsConcl(goal))) return true;
123
116
  const hyps = stripAssumsHyp(goal);
124
117
  return hyps.length > 0 && hyps.slice(1).some((hyp) => aconv(hyp, hyps[0]));
@@ -135,7 +128,6 @@ const classicalRule = (data: ClassicalData, rule: Thm, limits: Limits): Thm => {
135
128
  return aconv(result.prop, rule.prop) ? rule : result;
136
129
  };
137
130
 
138
- // swapify: the rules that eliminate ~A from the rules that introduce A.
139
131
  const swapify = (data: ClassicalData, rules: readonly Thm[]) =>
140
132
  rules.flatMap((rule) =>
141
133
  listOfSeq(biresolution(undefined, false, [{ isElim: false, rule }], 2, data.swap)),
@@ -143,8 +135,6 @@ const swapify = (data: ClassicalData, rules: readonly Thm[]) =>
143
135
 
144
136
  const dupIntr = (data: ClassicalData, rule: Thm) => zeroVarIndexes(rs(rule, data.classical));
145
137
 
146
- // Drule.rule_by_tactic: runs the tactic on the rule with its variables fixed.
147
- // Tactic.rule_by_tactic
148
138
  const ruleByTactic = (tactic: Tactic, rule: Thm): Thm =>
149
139
  zeroVarIndexes(
150
140
  trade((fixed) => {
@@ -163,8 +153,7 @@ const dupElim = (limits: Limits, rule: Thm) => {
163
153
  );
164
154
  };
165
155
 
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[] =>
156
+ const tagRules = (start: number, rules: readonly BiresRule[]): TaggedRule[] =>
168
157
  rules.map((brule, index) => ({ tag: 1000000 * subgoalsOfBrl(brule) + start + index, ...brule }));
169
158
 
170
159
  const insertRules = (
@@ -181,7 +170,6 @@ const insertRules = (
181
170
  const isMember = (rules: readonly ClassicalRule[], rule: ClassicalRule) =>
182
171
  rules.some((other) => aconv(other.rule.prop, rule.rule.prop));
183
172
 
184
- // addI: an unsafe introduction rule, which intro: declares.
185
173
  export const addUnsafeIntro = (context: ClassicalContext, rule: Thm): Claset => {
186
174
  const claset = context.claset;
187
175
  if (
@@ -211,7 +199,6 @@ export const addUnsafeIntro = (context: ClassicalContext, rule: Thm): Claset =>
211
199
  };
212
200
  };
213
201
 
214
- // addE: an unsafe elimination rule.
215
202
  const addUnsafeElim = (context: ClassicalContext, rule: Thm): Claset => {
216
203
  const claset = context.claset;
217
204
  if (nprems(rule) < 1) throw new TlaIsabelleError("ERROR", "Ill-formed elimination rule");
@@ -233,25 +220,21 @@ const addUnsafeElim = (context: ClassicalContext, rule: Thm): Claset => {
233
220
  };
234
221
  };
235
222
 
236
- // addD: an unsafe destruction rule, which dest: declares.
237
223
  export const addUnsafeDest = (context: ClassicalContext, rule: Thm): Claset => {
238
224
  if (nprems(rule) < 1) throw new TlaIsabelleError("ERROR", "Ill-formed destruction rule");
239
225
  return addUnsafeElim(context, makeElim(rule));
240
226
  };
241
227
 
242
- // AList.update: replaces a wrapper of the same name in place, or adds it in front.
243
228
  const updateWrappers = (wrappers: readonly Wrapper[], wrapper: Wrapper) =>
244
229
  wrappers.some((other) => other.name === wrapper.name)
245
230
  ? wrappers.map((other) => (other.name === wrapper.name ? wrapper : other))
246
231
  : [wrapper, ...wrappers];
247
232
 
248
- // addSafter: a safe tactic to try after safe_step_tac fails.
249
233
  export const addSafter = (claset: Claset, name: string, tactic: GoalTactic): Claset => ({
250
234
  ...claset,
251
235
  swrappers: updateWrappers(claset.swrappers, { name, wrap: (inner) => orElseGoal(inner, tactic) }),
252
236
  });
253
237
 
254
- // addbefore: a tactic to try before the unsafe step tactic, with backtracking.
255
238
  export const addbefore = (claset: Claset, name: string, tactic: GoalTactic): Claset => ({
256
239
  ...claset,
257
240
  uwrappers: updateWrappers(claset.uwrappers, { name, wrap: (inner) => appendGoal(tactic, inner) }),
@@ -263,14 +246,12 @@ const appSWrappers = (context: ClassicalContext, tactic: GoalTactic) =>
263
246
  export const appWrappers = (context: ClassicalContext, tactic: GoalTactic) =>
264
247
  context.claset.uwrappers.reduce((result, wrapper) => wrapper.wrap(result), tactic);
265
248
 
266
- // contr_tac: solves a goal that assumes both P and ~P.
267
249
  const contrTac = (context: ClassicalContext): GoalTactic =>
268
250
  thenGoal(
269
251
  eresolveTac(context.limits, [context.data.notElim]),
270
252
  orElseGoal(eqAssumeTac, assumeTac(context.limits)),
271
253
  );
272
254
 
273
- // eq_mp_tac: from P --> Q and P, keeps Q, without instantiating variables.
274
255
  const eqMpTac =
275
256
  (context: ClassicalContext): GoalTactic =>
276
257
  (index) =>
@@ -279,7 +260,6 @@ const eqMpTac =
279
260
  eqAssumeTac(index),
280
261
  );
281
262
 
282
- // safe_step_tac: one safe inference, by matching rather than unification.
283
263
  const safeStepTac = (context: ClassicalContext): GoalTactic =>
284
264
  appSWrappers(
285
265
  context,
@@ -292,7 +272,6 @@ const safeStepTac = (context: ClassicalContext): GoalTactic =>
292
272
  ]),
293
273
  );
294
274
 
295
- // safe_steps_tac: safe inferences on goal index for as long as they apply.
296
275
  export const safeStepsTac =
297
276
  (context: ClassicalContext): GoalTactic =>
298
277
  (index) =>
@@ -300,7 +279,6 @@ export const safeStepsTac =
300
279
  condTac(hasFewerPrems(index), noTac, (state) => safeStepTac(context)(index)(state)),
301
280
  );
302
281
 
303
- // safe_tac: safe inferences on all goals for as long as they apply.
304
282
  export const safeTac = (context: ClassicalContext): Tactic =>
305
283
  repeatDeterm1(firstGoalTac(safeStepsTac(context)));
306
284
 
@@ -324,7 +302,6 @@ const eqContrTac =
324
302
  const eqAssumeContrTac = (context: ClassicalContext) =>
325
303
  orElseGoal(eqAssumeTac, eqContrTac(context));
326
304
 
327
- // bimatch2_tac: two-way branching only where one branch closes at once.
328
305
  const bimatch2Tac =
329
306
  (context: ClassicalContext, netpair: NetPair<TaggedRule>): GoalTactic =>
330
307
  (index) =>
@@ -345,7 +322,6 @@ const clarifyStepTac = (context: ClassicalContext): GoalTactic =>
345
322
  ]),
346
323
  );
347
324
 
348
- // clarify_tac: safe steps that do not split the goal.
349
325
  export const clarifyTac = (context: ClassicalContext): GoalTactic =>
350
326
  selectGoal(repeatDeterm(clarifyStepTac(context)(1)));
351
327
 
@@ -364,7 +340,6 @@ const instStepTac = (context: ClassicalContext): GoalTactic =>
364
340
  export const unsafeStepTac = (context: ClassicalContext): GoalTactic =>
365
341
  biresolveFromNetsTac(context.limits, context.claset.unsafe);
366
342
 
367
- // step_tac: a safe step, or else an unsafe one.
368
343
  const stepTac =
369
344
  (context: ClassicalContext): GoalTactic =>
370
345
  (index) =>
@@ -373,15 +348,12 @@ const stepTac =
373
348
  appWrappers(context, orElseGoal(instStepTac(context), unsafeStepTac(context)))(index),
374
349
  );
375
350
 
376
- // Drule.size_of_thm, the sizef of Isabelle/TLA+'s Classical: the size of the proposition with its
377
- // flex-flex pairs.
378
351
  const sizeOfThm = (thm: Thm) =>
379
352
  thm.tpairs.reduce(
380
353
  (size, pair) => size + 2 + sizeOfTerm(pair[0]) + sizeOfTerm(pair[1]),
381
354
  sizeOfTerm(thm.prop),
382
355
  );
383
356
 
384
- // first_best_tac: best-first search with step_tac on the first goal.
385
357
  export const firstBestTac = (context: ClassicalContext, atomizeRules: readonly Thm[]): GoalTactic =>
386
358
  thenGoal(
387
359
  atomizePremsTac(context.limits, atomizeRules),
@@ -1,15 +1,19 @@
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.
1
+ // Ported from Isabelle2025's Provers/hypsubst.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
5
2
 
6
- import { TlaIsabelleError } from "../../../errors";
3
+ import { isIsabelleError, TlaIsabelleError } from "../../../errors";
7
4
  import { asmRl, compIncr, revcutRl, thinRl, zeroVarIndexes } from "../pure/drule";
8
5
  import { aeconv, etaContract } from "../pure/envir";
9
- import { occs, stripAssumsConcl, stripAssumsHyp, stripParams } from "../pure/logic";
6
+ import {
7
+ isAllAbs,
8
+ isImplies,
9
+ occs,
10
+ stripAssumsConcl,
11
+ stripAssumsHyp,
12
+ stripParams,
13
+ } from "../pure/logic";
10
14
  import { isBoundName } from "../pure/name";
11
15
  import { emptySimpset, type SimpContext } from "../pure/raw-simplifier";
12
- import { listOfSeq } from "../pure/seq";
16
+ import { seqHead } from "../pure/seq";
13
17
  import { asmLrSimpTac } from "../pure/simplifier";
14
18
  import {
15
19
  determ,
@@ -77,17 +81,9 @@ interface HypsubstContext {
77
81
  readonly data: HypsubstData;
78
82
  }
79
83
 
80
- // The equality offers no variable to eliminate.
81
84
  class NoMatch {}
82
- // The subgoal has no suitable equality.
83
85
  class EqVar {}
84
86
 
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
87
  const inspectContract = (term: Term) => {
92
88
  const contracted = etaContract(term);
93
89
  return contracted.kind === "Free" && isBoundName(contracted.name) ? mkBound(0) : contracted;
@@ -96,8 +92,6 @@ const inspectContract = (term: Term) => {
96
92
  const hasVars = (term: Term) => (flagsOf(term) & HAS_VAR) !== 0;
97
93
  const hasTVars = (term: Term) => existsType((type) => maxidxOfTyp(type) >= 0, term);
98
94
 
99
- // inspect_pair: true to use the equality as it is, false to reorient it first, with the variable
100
- // to substitute.
101
95
  const inspectPair = (
102
96
  isBound: boolean,
103
97
  isNoVars: boolean,
@@ -127,8 +121,6 @@ const inspectPair = (
127
121
  throw new NoMatch();
128
122
  };
129
123
 
130
- // eq_var: the number of assumptions before a substitutable equality, its orientation, and whether
131
- // it eliminates a free variable.
132
124
  const eqVar = (
133
125
  data: HypsubstData,
134
126
  isBound: boolean,
@@ -151,19 +143,8 @@ const eqVar = (
151
143
  term: Term,
152
144
  hyps: readonly Term[],
153
145
  ): [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
- ) {
146
+ if (isAllAbs(term)) return visit(count, term.arg.body, hyps);
147
+ if (isImplies(term)) {
167
148
  const premise = term.fun.arg;
168
149
  const conclusion = term.arg;
169
150
  try {
@@ -171,7 +152,7 @@ const eqVar = (
171
152
  const [orientation, variable] = inspectPair(isBound, isNoVars, left, right);
172
153
  return [count, checkFree([conclusion, ...hyps], orientation, variable)];
173
154
  } catch (error) {
174
- if (!isTermError(error) && !(error instanceof NoMatch)) throw error;
155
+ if (!isIsabelleError(error, "TERM") && !(error instanceof NoMatch)) throw error;
175
156
  return visit(count + 1, conclusion, [premise, ...hyps]);
176
157
  }
177
158
  }
@@ -185,12 +166,11 @@ const withEqVar = (build: (goal: Term, index: number) => Tactic): GoalTactic =>
185
166
  try {
186
167
  return build(goal, index);
187
168
  } catch (error) {
188
- if (error instanceof EqVar || isThmError(error)) return noTac;
169
+ if (error instanceof EqVar || isIsabelleError(error, "THM")) return noTac;
189
170
  throw error;
190
171
  }
191
172
  });
192
173
 
193
- // mk_eqs: the equality as a rewrite rule that eliminates its variable.
194
174
  const mkEqs = (data: HypsubstData, isBound: boolean, thm: Thm): Thm[] => {
195
175
  try {
196
176
  const [left, right] = data.destEq(data.destTrueprop(thm.prop));
@@ -198,7 +178,7 @@ const mkEqs = (data: HypsubstData, isBound: boolean, thm: Thm): Thm[] => {
198
178
  ? [rs(thm, data.eqReflection)]
199
179
  : [symmetric(rs(thm, data.eqReflection))];
200
180
  } catch (error) {
201
- if (isTermError(error) || error instanceof NoMatch) return [];
181
+ if (isIsabelleError(error, "TERM") || error instanceof NoMatch) return [];
202
182
  throw error;
203
183
  }
204
184
  };
@@ -239,7 +219,7 @@ const instSubstTac = (context: HypsubstContext, isLeft: boolean, rule: Thm): Goa
239
219
  const [left, right] = data.destEq(data.destTrueprop(hyp));
240
220
  return [etaContract(left), etaContract(right)] as const;
241
221
  } catch (error) {
242
- if (isTermError(error)) return undefined;
222
+ if (isIsabelleError(error, "TERM")) return undefined;
243
223
  throw error;
244
224
  }
245
225
  })();
@@ -253,7 +233,9 @@ const instSubstTac = (context: HypsubstContext, isLeft: boolean, rule: Thm): Goa
253
233
  const conclusion = data.destTrueprop(stripAssumsConcl(goal));
254
234
  const lifted = liftRule(goal, state.maxidx, rule);
255
235
  const head = headOf(data.destTrueprop(stripAssumsConcl(lifted.prop)));
256
- const [v1, v2] = data.destEq(data.destTrueprop(stripAssumsConcl(premsOf(lifted)[0])));
236
+ const [leftVar, rightVar] = data.destEq(
237
+ data.destTrueprop(stripAssumsConcl(premsOf(lifted)[0])),
238
+ );
257
239
  if (head.kind !== "Var") throw new TlaIsabelleError("TERM", "dest_Var");
258
240
  const binders = binderTypes(head.type);
259
241
  const paramTypes = binders.slice(0, -1);
@@ -277,9 +259,9 @@ const instSubstTac = (context: HypsubstContext, isLeft: boolean, rule: Thm): Goa
277
259
  const motive = absParams(mkAbs("x", paramType, body));
278
260
  const tyenv = matchTypes(lastType, paramType, emptyTyEnv);
279
261
  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")
262
+ const leftHead = headOf(leftVar);
263
+ const rightHead = headOf(rightVar);
264
+ if (leftHead.kind !== "Var" || rightHead.kind !== "Var")
283
265
  throw new TlaIsabelleError("TERM", "dest_Var");
284
266
  const instantiated = instantiate(
285
267
  [
@@ -296,8 +278,8 @@ const instSubstTac = (context: HypsubstContext, isLeft: boolean, rule: Thm): Goa
296
278
  },
297
279
  {
298
280
  variable: mkVar(
299
- headV1.name,
300
- headV1.index,
281
+ leftHead.name,
282
+ leftHead.index,
301
283
  funTs(
302
284
  paramTypes.map((type) => substType(tyenv, type)),
303
285
  paramType,
@@ -307,8 +289,8 @@ const instSubstTac = (context: HypsubstContext, isLeft: boolean, rule: Thm): Goa
307
289
  },
308
290
  {
309
291
  variable: mkVar(
310
- headV2.name,
311
- headV2.index,
292
+ rightHead.name,
293
+ rightHead.index,
312
294
  funTs(
313
295
  paramTypes.map((type) => substType(tyenv, type)),
314
296
  paramType,
@@ -349,13 +331,11 @@ const varsGenHypSubstTac = (context: HypsubstContext, isBound: boolean): GoalTac
349
331
  });
350
332
 
351
333
  const revDupElim = (thm: Thm) => {
352
- const result = listOfSeq(assumption(undefined, 2, rsn(thm, 2, revcutRl)))[0];
334
+ const result = seqHead(assumption(undefined, 2, rsn(thm, 2, revcutRl)));
353
335
  if (result === undefined) throw new TlaIsabelleError("THM", "rev_dup_elim");
354
336
  return result;
355
337
  };
356
338
 
357
- // hyp_subst_tac with hypsubst_thin off, its default: substitutes for free or bound variables and
358
- // drops equalities on bound variables.
359
339
  export const hypSubstTac =
360
340
  (context: HypsubstContext): GoalTactic =>
361
341
  (index) =>
@@ -386,7 +366,6 @@ const reverseNTac = (context: HypsubstContext, count: number, index: number): Ta
386
366
  ),
387
367
  );
388
368
 
389
- // all_imp_intr_tac: reintroduces the hypotheses, leaving the changed ones at the end.
390
369
  const allImpIntrTac = (context: HypsubstContext, hyps: readonly Term[], index: number): Tactic => {
391
370
  const imptac =
392
371
  (count: number, remaining: readonly Term[]): Tactic =>
@@ -407,8 +386,6 @@ const allImpIntrTac = (context: HypsubstContext, hyps: readonly Term[], index: n
407
386
  return imptac(0, [...hyps].reverse());
408
387
  };
409
388
 
410
- // blast_hyp_subst_tac: the version for blast, which moves the hypotheses the substitution changes
411
- // to the front.
412
389
  export const blastHypSubstTac = (context: HypsubstContext): GoalTactic =>
413
390
  withEqVar((goal, index) => {
414
391
  const [count, [orientation]] = eqVar(context.data, false, false, false, goal);
@@ -1,37 +1,18 @@
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.
1
+ // Ported from Isabelle2025's Pure/thm.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
5
2
 
6
3
  import { TlaIsabelleError } from "../../../errors";
7
4
  import { normTerm, type Envir } from "./envir";
8
- import { allConst, mkImplies } from "./logic";
5
+ import { allConst, isAllAbs, isImplies, mkImplies } from "./logic";
9
6
  import { unifyTypesEnvir } from "./pattern";
10
7
  import type { Thm } from "./thm";
11
8
  import { normType } from "./type";
12
9
  import { eqTyp, foldVars, matchBvars, mkAbs, mkApp, mkVar, type Term, type Typ } from "./term";
13
10
  import type { Tpair } from "./unify";
14
11
 
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
12
  export const stripApply = (apply: (term: Term) => Term, lifted: Term, term: Term): Term => {
32
- if (isImpApp(lifted) && isImpApp(term))
13
+ if (isImplies(lifted) && isImplies(term))
33
14
  return mkApp(mkApp(lifted.fun.fun, term.fun.arg), stripApply(apply, lifted.arg, term.arg));
34
- if (isAllApp(lifted) && isAllApp(term))
15
+ if (isAllAbs(lifted) && isAllAbs(term))
35
16
  return mkApp(
36
17
  lifted.fun,
37
18
  mkAbs(term.arg.name, term.arg.type, stripApply(apply, lifted.arg.body, term.arg.body)),
@@ -40,8 +21,8 @@ export const stripApply = (apply: (term: Term) => Term, lifted: Term, term: Term
40
21
  };
41
22
 
42
23
  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);
24
+ if (isImplies(lifted) && isImplies(term)) return stripLifted(lifted.arg, term.arg);
25
+ if (isAllAbs(lifted) && isAllAbs(term)) return stripLifted(lifted.arg.body, term.arg.body);
45
26
  return term;
46
27
  };
47
28
 
@@ -54,8 +35,6 @@ const makeDistinct = (pairs: readonly [string, string][]) => {
54
35
  return table;
55
36
  };
56
37
 
57
- // Thm.rename_bvars: renames bound variables and some unknowns of the new premises after the
58
- // names in the disagreement pairs.
59
38
  export const renameBvars = (
60
39
  dpairs: readonly Tpair[],
61
40
  tpairs: readonly Tpair[],
@@ -86,16 +65,24 @@ export const renameBvars = (
86
65
  );
87
66
  const delClashing = (
88
67
  isClash: boolean,
89
- xs: Set<string>,
90
- ys: Set<string>,
68
+ clashed: Set<string>,
69
+ taken: Set<string>,
91
70
  rest: readonly [string, string][],
92
71
  kept: [string, string][],
93
72
  ): [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]);
73
+ if (rest.length === 0)
74
+ return isClash ? delClashing(false, clashed, new Set(clashed), kept, []) : kept;
75
+ const pair = rest[0];
76
+ const others = rest.slice(1);
77
+ if (taken.has(pair[1]))
78
+ return delClashing(
79
+ true,
80
+ new Set(clashed).add(pair[0]),
81
+ new Set(taken).add(pair[0]),
82
+ others,
83
+ kept,
84
+ );
85
+ return delClashing(isClash, clashed, new Set(taken).add(pair[1]), others, [pair, ...kept]);
99
86
  };
100
87
  const vars = makeDistinct(delClashing(false, unchanged, new Set(unchanged), distinct, []));
101
88
  const bounds = makeDistinct(pairs);
@@ -122,8 +109,8 @@ export const renameBvars = (
122
109
  };
123
110
 
124
111
  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)) {
112
+ if (isImplies(lifted) && isImplies(goal)) return stripAssums2(lifted.arg, goal.arg);
113
+ if (isAllAbs(lifted) && isAllAbs(goal)) {
127
114
  const [left, right] = stripAssums2(lifted.arg.body, goal.arg.body);
128
115
  return [
129
116
  mkAbs(lifted.arg.name, lifted.arg.type, left),
@@ -135,14 +122,14 @@ export const stripAssums2 = (lifted: Term, goal: Term): Tpair => {
135
122
 
136
123
  export const normTermSkip = (envir: Envir, count: number, term: Term): Term => {
137
124
  if (count === 0) return normTerm(envir, term);
138
- if (isAllApp(term)) {
125
+ if (isAllAbs(term)) {
139
126
  const type = normType(envir.tyenv, term.arg.type);
140
127
  return mkApp(
141
128
  allConst(type),
142
129
  mkAbs(term.arg.name, type, normTermSkip(envir, count, term.arg.body)),
143
130
  );
144
131
  }
145
- if (isImpApp(term)) return mkImplies(term.fun.arg, normTermSkip(envir, count - 1, term.arg));
132
+ if (isImplies(term)) return mkImplies(term.fun.arg, normTermSkip(envir, count - 1, term.arg));
146
133
  throw new TlaIsabelleError("ERROR", "norm_term_skip: too few assumptions??");
147
134
  };
148
135
 
@@ -1,15 +1,10 @@
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.
1
+ // Ported from Isabelle2025's Pure/consts.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
6
2
 
7
3
  import { TlaIsabelleError } from "../../../errors";
8
4
  import type { Typ } from "./term";
9
5
 
10
6
  export type TypargPosition = readonly number[];
11
7
 
12
- // Consts.typargs_of: the path to the first occurrence of each type variable.
13
8
  export const typargsOf = (type: Typ): TypargPosition[] => {
14
9
  const found = new Map<string, TypargPosition>();
15
10
  const visit = (current: Typ, path: readonly number[]) => {
@@ -21,7 +16,6 @@ export const typargsOf = (type: Typ): TypargPosition[] => {
21
16
  return [...found.values()];
22
17
  };
23
18
 
24
- // Consts.typargs: the type arguments of a constant at an instance of its declared type.
25
19
  export const typargs = (positions: readonly TypargPosition[], type: Typ): Typ[] =>
26
20
  positions.map((path) =>
27
21
  path.reduce((current, index) => {
@@ -1,9 +1,7 @@
1
- // Ported from Isabelle2025's Pure/conv.ML, conversions: functions from a term to a theorem that
2
- // it equals another. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet
3
- // Muenchen, and contributors, see LICENSE.
1
+ // Ported from Isabelle2025's Pure/conv.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
4
2
 
5
3
  import { TlaIsabelleError } from "../../../errors";
6
- import { destEquals, destImplies, implies, isImplies } from "./logic";
4
+ import { destEquals, destImplies, implies, isAllAbs, isImplies } from "./logic";
7
5
  import { declareName, makeNameContext, variantName, type NameContext } from "./name";
8
6
  import { aconv, addFreeNames, mkFree, substBound, type Term } from "./term";
9
7
  import {
@@ -24,11 +22,9 @@ const isReflexive = (eq: Thm) => {
24
22
  return aconv(lhs, rhs);
25
23
  };
26
24
 
27
- // Drule.imp_cong_rule
28
25
  export const impCongRule = (first: Thm, second: Thm) =>
29
26
  combination(combination(reflexive(implies), first), second);
30
27
 
31
- // Conv.prems_conv ~1: converts every premise.
32
28
  export const premsConv =
33
29
  (convert: Conversion): Conversion =>
34
30
  (term) =>
@@ -36,19 +32,11 @@ export const premsConv =
36
32
  ? impCongRule(convert(destImplies(term)[0]), premsConv(convert)(destImplies(term)[1]))
37
33
  : reflexive(term);
38
34
 
39
- // Conv.params_conv ~1: converts the body under every outer parameter, fixed as a fresh free
40
- // variable.
41
35
  export const paramsConv = (convert: Conversion): Conversion => {
42
36
  const under =
43
37
  (names: NameContext): Conversion =>
44
38
  (term) => {
45
- if (
46
- term.kind !== "App" ||
47
- term.fun.kind !== "Const" ||
48
- term.fun.name !== "Pure.all" ||
49
- term.arg.kind !== "Abs"
50
- )
51
- return convert(term);
39
+ if (!isAllAbs(term)) return convert(term);
52
40
  const abs = term.arg;
53
41
  const [name, nextNames] = variantName(abs.name, names);
54
42
  const free = mkFree(name, abs.type);
@@ -60,7 +48,6 @@ export const paramsConv = (convert: Conversion): Conversion => {
60
48
  return (term) => under(makeNameContext(addFreeNames(term, [])))(term);
61
49
  };
62
50
 
63
- // Conv.gconv_rule: converts goal index of a state.
64
51
  export const gconvRule = (convert: Conversion, index: number, state: Thm): Thm => {
65
52
  if (index < 1 || index > nprems(state)) throw new TlaIsabelleError("THM", `gconv_rule ${index}`);
66
53
  const eq = convert(premOf(state, index));
@@ -72,7 +59,6 @@ export const gconvRule = (convert: Conversion, index: number, state: Thm): Thm =
72
59
  return permutePrems(0, 1 - index, converted);
73
60
  };
74
61
 
75
- // Conv.fconv_rule: converts a theorem's proposition.
76
62
  export const fconvRule = (convert: Conversion, thm: Thm): Thm => {
77
63
  const eq = convert(thm.prop);
78
64
  return isReflexive(eq) ? thm : equalElim(eq, thm);