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

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 (568) hide show
  1. package/README.md +2 -1
  2. package/dist/compile.cjs +6 -6
  3. package/dist/compile.js +10 -10
  4. package/dist/deciders.cjs +41 -37
  5. package/dist/deciders.js +57 -53
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +3 -0
  8. package/dist/index.d.ts +3 -0
  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.cjs +2682 -426
  13. package/dist/prove.js +2681 -425
  14. package/dist/run.cjs +45 -42
  15. package/dist/run.js +47 -44
  16. package/dist/tlapm.cjs +2 -2
  17. package/dist/tlapm.js +2 -2
  18. package/dist/transfer.cjs +42 -39
  19. package/dist/transfer.js +42 -39
  20. package/dist/worker.cjs +7 -7
  21. package/dist/worker.js +7 -7
  22. package/package.json +1 -1
  23. package/src/ast.ts +41 -36
  24. package/src/builtins.ts +4 -13
  25. package/src/check-failure.ts +116 -0
  26. package/src/check-trace.ts +282 -0
  27. package/src/check.ts +353 -549
  28. package/src/cli/options.ts +6 -31
  29. package/src/cli/shared.ts +1 -1
  30. package/src/cli/tlapm.ts +433 -70
  31. package/src/cli/tlc-arguments.ts +222 -210
  32. package/src/cli/tlc-output.ts +687 -0
  33. package/src/cli/tlc-usage.ts +1 -2
  34. package/src/cli/tlc.ts +49 -702
  35. package/src/cli/xml-exporter.ts +23 -33
  36. package/src/codegen.ts +5 -10
  37. package/src/coverage.ts +0 -2
  38. package/src/dependencies.ts +30 -14
  39. package/src/dfid.ts +16 -16
  40. package/src/environment-config.ts +315 -0
  41. package/src/environment.ts +55 -338
  42. package/src/errors.ts +33 -5
  43. package/src/evaluate.ts +5 -4
  44. package/src/exit-codes.ts +1 -0
  45. package/src/fingerprints.ts +65 -1
  46. package/src/instances.ts +47 -10
  47. package/src/json.ts +4 -7
  48. package/src/levels.ts +39 -42
  49. package/src/lexer.ts +5 -3
  50. package/src/liveness-checker.ts +553 -237
  51. package/src/liveness.ts +94 -86
  52. package/src/obligations/action.ts +14 -17
  53. package/src/obligations/anonymize.ts +37 -16
  54. package/src/obligations/enabled-axioms.ts +218 -0
  55. package/src/obligations/equality.ts +1 -3
  56. package/src/obligations/expression.ts +36 -8
  57. package/src/obligations/format.ts +0 -2
  58. package/src/obligations/generate.ts +66 -54
  59. package/src/obligations/index.ts +38 -8
  60. package/src/obligations/levels.ts +24 -11
  61. package/src/obligations/module.ts +28 -41
  62. package/src/obligations/normalize.ts +26 -14
  63. package/src/obligations/operators.ts +0 -2
  64. package/src/obligations/pragma.ts +53 -16
  65. package/src/obligations/printer.ts +43 -13
  66. package/src/obligations/proof.ts +3 -2
  67. package/src/obligations/regroup.ts +0 -2
  68. package/src/obligations/simplify.ts +55 -50
  69. package/src/obligations/source.ts +118 -74
  70. package/src/obligations/subexpression.ts +45 -18
  71. package/src/obligations/substitution.ts +1 -3
  72. package/src/obligations/temporal.ts +5 -7
  73. package/src/obligations/tuples.ts +0 -2
  74. package/src/parallel-worker.ts +10 -30
  75. package/src/parallel.ts +24 -47
  76. package/src/parser.ts +580 -180
  77. package/src/pretty-print.ts +1 -1
  78. package/src/prover/decide-pool.ts +3 -3
  79. package/src/prover/deciders.ts +12 -9
  80. package/src/prover/isabelle/decide.ts +3 -25
  81. package/src/prover/isabelle/encode.ts +72 -42
  82. package/src/prover/isabelle/isar/attrib.ts +250 -0
  83. package/src/prover/isabelle/isar/context.ts +335 -0
  84. package/src/prover/isabelle/isar/induct.ts +382 -0
  85. package/src/prover/isabelle/isar/inner-syntax.ts +158 -7
  86. package/src/prover/isabelle/isar/method.ts +509 -212
  87. package/src/prover/isabelle/isar/proof.ts +570 -14
  88. package/src/prover/isabelle/isar/rule-cases.ts +224 -0
  89. package/src/prover/isabelle/isar/theory.ts +487 -76
  90. package/src/prover/isabelle/isar/toplevel.ts +331 -0
  91. package/src/prover/isabelle/isar/type-check.ts +89 -14
  92. package/src/prover/isabelle/provers/blast/blast.ts +7 -65
  93. package/src/prover/isabelle/provers/blast/branch.ts +0 -2
  94. package/src/prover/isabelle/provers/blast/prove.ts +0 -2
  95. package/src/prover/isabelle/provers/blast/rules.ts +0 -2
  96. package/src/prover/isabelle/provers/blast/state.ts +0 -2
  97. package/src/prover/isabelle/provers/blast/term.ts +0 -2
  98. package/src/prover/isabelle/provers/clasimp.ts +0 -2
  99. package/src/prover/isabelle/provers/classical.ts +45 -20
  100. package/src/prover/isabelle/provers/hypsubst.ts +17 -28
  101. package/src/prover/isabelle/pure/bicompose.ts +9 -27
  102. package/src/prover/isabelle/pure/consts.ts +0 -2
  103. package/src/prover/isabelle/pure/conv.ts +2 -10
  104. package/src/prover/isabelle/pure/drule.ts +72 -6
  105. package/src/prover/isabelle/pure/envir.ts +0 -2
  106. package/src/prover/isabelle/pure/goal.ts +1 -3
  107. package/src/prover/isabelle/pure/logic.ts +1 -3
  108. package/src/prover/isabelle/pure/name.ts +0 -2
  109. package/src/prover/isabelle/pure/net.ts +0 -2
  110. package/src/prover/isabelle/pure/object-logic.ts +13 -7
  111. package/src/prover/isabelle/pure/pattern.ts +0 -2
  112. package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
  113. package/src/prover/isabelle/pure/rewriter.ts +6 -17
  114. package/src/prover/isabelle/pure/search.ts +0 -2
  115. package/src/prover/isabelle/pure/seq.ts +0 -2
  116. package/src/prover/isabelle/pure/simplifier.ts +26 -7
  117. package/src/prover/isabelle/pure/table.ts +2 -3
  118. package/src/prover/isabelle/pure/tactic.ts +0 -2
  119. package/src/prover/isabelle/pure/tactical.ts +42 -37
  120. package/src/prover/isabelle/pure/term-ord.ts +0 -2
  121. package/src/prover/isabelle/pure/term.ts +0 -2
  122. package/src/prover/isabelle/pure/thm.ts +14 -13
  123. package/src/prover/isabelle/pure/type.ts +0 -2
  124. package/src/prover/isabelle/pure/unify.ts +0 -2
  125. package/src/prover/isabelle/pure/variable.ts +0 -2
  126. package/src/prover/isabelle/tla/classical-setup.ts +18 -16
  127. package/src/prover/isabelle/tla/context.ts +58 -11
  128. package/src/prover/isabelle/tla/logic-data.ts +1 -1
  129. package/src/prover/isabelle/tla/logic.ts +49 -21
  130. package/src/prover/isabelle/tla/simpdata.ts +1 -12
  131. package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
  132. package/src/prover/ocaml.ts +4 -1
  133. package/src/prover/prep/action.ts +30 -31
  134. package/src/prover/prep/enabled-axioms.ts +11 -2
  135. package/src/prover/prep/fingerprint.ts +2 -5
  136. package/src/prover/prep/methods.ts +181 -51
  137. package/src/prover/prep/normalize.ts +38 -9
  138. package/src/prover/prove.ts +395 -94
  139. package/src/prover/ptl/decide.ts +95 -50
  140. package/src/prover/ptl/encode.ts +2 -3
  141. package/src/prover/ptl/tableau.ts +28 -2
  142. package/src/prover/smt/arithmetic.ts +310 -0
  143. package/src/prover/smt/axioms.ts +12 -8
  144. package/src/prover/smt/context.ts +43 -8
  145. package/src/prover/smt/data.ts +498 -379
  146. package/src/prover/smt/encode.ts +148 -57
  147. package/src/prover/smt/extensionality.ts +5 -3
  148. package/src/prover/smt/flatten.ts +4 -6
  149. package/src/prover/smt/format.ts +28 -4
  150. package/src/prover/smt/instances.ts +7 -1
  151. package/src/prover/smt/layout.ts +91 -0
  152. package/src/prover/smt/rewrite.ts +1021 -618
  153. package/src/prover/smt/simplify.ts +441 -0
  154. package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
  155. package/src/prover/smt/solver/ackr-helper.ts +179 -0
  156. package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
  157. package/src/prover/smt/solver/act-cache.ts +0 -1
  158. package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
  159. package/src/prover/smt/solver/aig-tactic.ts +52 -0
  160. package/src/prover/smt/solver/aig.ts +889 -0
  161. package/src/prover/smt/solver/arith-rewriter.ts +613 -6
  162. package/src/prover/smt/solver/arith-terms.ts +121 -0
  163. package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
  164. package/src/prover/smt/solver/array-rewriter.ts +309 -0
  165. package/src/prover/smt/solver/asserted-formulas.ts +87 -16
  166. package/src/prover/smt/solver/ast-lt.ts +166 -12
  167. package/src/prover/smt/solver/ast-util.ts +160 -2
  168. package/src/prover/smt/solver/ast.ts +1427 -41
  169. package/src/prover/smt/solver/auf-solver.ts +2 -6
  170. package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
  171. package/src/prover/smt/solver/bit-blaster.ts +871 -0
  172. package/src/prover/smt/solver/bound-manager.ts +196 -0
  173. package/src/prover/smt/solver/bound-simplifier.ts +600 -0
  174. package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
  175. package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
  176. package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
  177. package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
  178. package/src/prover/smt/solver/bv1-blast.ts +214 -0
  179. package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
  180. package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
  181. package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
  182. package/src/prover/smt/solver/card2bv.ts +110 -0
  183. package/src/prover/smt/solver/case-split-queue.ts +0 -2
  184. package/src/prover/smt/solver/cg-table.ts +39 -25
  185. package/src/prover/smt/solver/check-logic.ts +330 -0
  186. package/src/prover/smt/solver/clause.ts +0 -1
  187. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
  188. package/src/prover/smt/solver/conflict-resolution.ts +78 -2
  189. package/src/prover/smt/solver/context.ts +516 -115
  190. package/src/prover/smt/solver/ctx-simplify.ts +20 -10
  191. package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
  192. package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
  193. package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
  194. package/src/prover/smt/solver/demodulator.ts +786 -0
  195. package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
  196. package/src/prover/smt/solver/der.ts +38 -10
  197. package/src/prover/smt/solver/diff-neq.ts +206 -0
  198. package/src/prover/smt/solver/distribute-forall.ts +57 -0
  199. package/src/prover/smt/solver/dom-simplify.ts +511 -0
  200. package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
  201. package/src/prover/smt/solver/dyn-ack.ts +0 -1
  202. package/src/prover/smt/solver/e-matching.ts +7 -8
  203. package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
  204. package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
  205. package/src/prover/smt/solver/enode.ts +100 -3
  206. package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
  207. package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
  208. package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
  209. package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
  210. package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
  211. package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
  212. package/src/prover/smt/solver/euf/array-solver.ts +306 -0
  213. package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
  214. package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
  215. package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
  216. package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
  217. package/src/prover/smt/solver/euf/egraph.ts +907 -0
  218. package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
  219. package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
  220. package/src/prover/smt/solver/euf/mam.ts +1050 -0
  221. package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
  222. package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
  223. package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
  224. package/src/prover/smt/solver/euf/q-solver.ts +361 -0
  225. package/src/prover/smt/solver/euf/th-solver.ts +335 -0
  226. package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
  227. package/src/prover/smt/solver/expr-ref.ts +0 -1
  228. package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
  229. package/src/prover/smt/solver/expr2polynomial.ts +146 -0
  230. package/src/prover/smt/solver/factor.ts +141 -0
  231. package/src/prover/smt/solver/fd-solver.ts +265 -0
  232. package/src/prover/smt/solver/fingerprints.ts +15 -15
  233. package/src/prover/smt/solver/fix-dl-var.ts +148 -0
  234. package/src/prover/smt/solver/flat-literals.ts +0 -1
  235. package/src/prover/smt/solver/fm-tactic.ts +884 -0
  236. package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
  237. package/src/prover/smt/solver/fpa-rewriter.ts +640 -0
  238. package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
  239. package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
  240. package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
  241. package/src/prover/smt/solver/goal.ts +175 -15
  242. package/src/prover/smt/solver/goal2nlsat.ts +189 -0
  243. package/src/prover/smt/solver/guard-set.ts +219 -0
  244. package/src/prover/smt/solver/hash.ts +0 -1
  245. package/src/prover/smt/solver/hashtable.ts +30 -16
  246. package/src/prover/smt/solver/inf-eps.ts +63 -0
  247. package/src/prover/smt/solver/inj-axiom.ts +101 -0
  248. package/src/prover/smt/solver/internalizer.ts +110 -38
  249. package/src/prover/smt/solver/lackr.ts +381 -0
  250. package/src/prover/smt/solver/lbool.ts +0 -1
  251. package/src/prover/smt/solver/lia2card.ts +268 -0
  252. package/src/prover/smt/solver/lia2pb.ts +154 -0
  253. package/src/prover/smt/solver/literal.ts +0 -1
  254. package/src/prover/smt/solver/logic-tactics.ts +345 -0
  255. package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
  256. package/src/prover/smt/solver/lp/constraints.ts +0 -1
  257. package/src/prover/smt/solver/lp/containers.ts +0 -1
  258. package/src/prover/smt/solver/lp/core-solver.ts +18 -3
  259. package/src/prover/smt/solver/lp/cross-nested.ts +0 -1
  260. package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
  261. package/src/prover/smt/solver/lp/dependency.ts +0 -2
  262. package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
  263. package/src/prover/smt/solver/lp/explanation.ts +0 -1
  264. package/src/prover/smt/solver/lp/gomory.ts +0 -1
  265. package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
  266. package/src/prover/smt/solver/lp/hnf.ts +0 -3
  267. package/src/prover/smt/solver/lp/int-cube.ts +3 -4
  268. package/src/prover/smt/solver/lp/int-solver.ts +0 -2
  269. package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
  270. package/src/prover/smt/solver/lp/lar-term.ts +0 -1
  271. package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
  272. package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
  273. package/src/prover/smt/solver/lp/nex-creator.ts +0 -1
  274. package/src/prover/smt/solver/lp/nex.ts +0 -1
  275. package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
  276. package/src/prover/smt/solver/lp/nla-basics.ts +0 -2
  277. package/src/prover/smt/solver/lp/nla-core.ts +42 -11
  278. package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
  279. package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
  280. package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
  281. package/src/prover/smt/solver/lp/nla-grobner.ts +9 -4
  282. package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
  283. package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
  284. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
  285. package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
  286. package/src/prover/smt/solver/lp/nla-order.ts +0 -2
  287. package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
  288. package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
  289. package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
  290. package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
  291. package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
  292. package/src/prover/smt/solver/lp/nla-types.ts +0 -2
  293. package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
  294. package/src/prover/smt/solver/lp/nra-solver.ts +25 -4
  295. package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
  296. package/src/prover/smt/solver/lp/pdd-interval.ts +0 -1
  297. package/src/prover/smt/solver/lp/pdd-simplifier.ts +0 -1
  298. package/src/prover/smt/solver/lp/pdd-solver.ts +0 -2
  299. package/src/prover/smt/solver/lp/pdd.ts +2 -2
  300. package/src/prover/smt/solver/lp/random-updater.ts +0 -2
  301. package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
  302. package/src/prover/smt/solver/lp/union-find.ts +7 -2
  303. package/src/prover/smt/solver/macro-finder.ts +530 -0
  304. package/src/prover/smt/solver/mam-compiler.ts +122 -90
  305. package/src/prover/smt/solver/mam-interpreter.ts +0 -1
  306. package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
  307. package/src/prover/smt/solver/max-cliques.ts +105 -0
  308. package/src/prover/smt/solver/maxcore.ts +309 -0
  309. package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
  310. package/src/prover/smt/solver/maxlex.ts +115 -0
  311. package/src/prover/smt/solver/maxsmt-base.ts +105 -0
  312. package/src/prover/smt/solver/maxsmt.ts +92 -0
  313. package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
  314. package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
  315. package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
  316. package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
  317. package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
  318. package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
  319. package/src/prover/smt/solver/model-based-opt.ts +844 -0
  320. package/src/prover/smt/solver/model-checker.ts +18 -27
  321. package/src/prover/smt/solver/model-evaluator.ts +188 -12
  322. package/src/prover/smt/solver/model-finder.ts +12 -18
  323. package/src/prover/smt/solver/model-generator.ts +56 -29
  324. package/src/prover/smt/solver/model-macro-solver.ts +49 -46
  325. package/src/prover/smt/solver/model-printer.ts +214 -0
  326. package/src/prover/smt/solver/mpf.ts +711 -0
  327. package/src/prover/smt/solver/mus.ts +51 -0
  328. package/src/prover/smt/solver/muz/dl-context.ts +404 -0
  329. package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
  330. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
  331. package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
  332. package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
  333. package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
  334. package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
  335. package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
  336. package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
  337. package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
  338. package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
  339. package/src/prover/smt/solver/muz/hnf.ts +201 -0
  340. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
  341. package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
  342. package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
  343. package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
  344. package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
  345. package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
  346. package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
  347. package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
  348. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
  349. package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
  350. package/src/prover/smt/solver/muz/substitution.ts +203 -0
  351. package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
  352. package/src/prover/smt/solver/nlqsat.ts +484 -0
  353. package/src/prover/smt/solver/nlsat/algebraic.ts +125 -12
  354. package/src/prover/smt/solver/nlsat/atoms.ts +20 -6
  355. package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
  356. package/src/prover/smt/solver/nlsat/explain.ts +63 -23
  357. package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
  358. package/src/prover/smt/solver/nlsat/levelwise.ts +3 -9
  359. package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
  360. package/src/prover/smt/solver/nlsat/polynomial.ts +13 -6
  361. package/src/prover/smt/solver/nlsat/solver.ts +234 -36
  362. package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
  363. package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
  364. package/src/prover/smt/solver/nlsat/types.ts +0 -2
  365. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
  366. package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
  367. package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
  368. package/src/prover/smt/solver/nnf.ts +105 -23
  369. package/src/prover/smt/solver/normalize-bounds.ts +53 -0
  370. package/src/prover/smt/solver/occf.ts +97 -0
  371. package/src/prover/smt/solver/opt-context.ts +787 -0
  372. package/src/prover/smt/solver/opt-nlsat.ts +375 -0
  373. package/src/prover/smt/solver/opt-pareto.ts +282 -0
  374. package/src/prover/smt/solver/opt-preprocess.ts +101 -0
  375. package/src/prover/smt/solver/opt-solver.ts +308 -0
  376. package/src/prover/smt/solver/opt-value.ts +55 -0
  377. package/src/prover/smt/solver/optsmt.ts +692 -0
  378. package/src/prover/smt/solver/parallel-tactic.ts +299 -0
  379. package/src/prover/smt/solver/pattern-inference.ts +19 -11
  380. package/src/prover/smt/solver/pb-rewriter.ts +284 -0
  381. package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
  382. package/src/prover/smt/solver/poly-rewriter.ts +202 -57
  383. package/src/prover/smt/solver/probes.ts +512 -0
  384. package/src/prover/smt/solver/propagate-values.ts +37 -21
  385. package/src/prover/smt/solver/proto-model.ts +648 -19
  386. package/src/prover/smt/solver/pull-quant.ts +28 -12
  387. package/src/prover/smt/solver/purify-arith.ts +632 -0
  388. package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
  389. package/src/prover/smt/solver/qe-lite-der.ts +2 -3
  390. package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
  391. package/src/prover/smt/solver/qe-lite.ts +37 -17
  392. package/src/prover/smt/solver/qe-mbp.ts +270 -0
  393. package/src/prover/smt/solver/qe.ts +1498 -0
  394. package/src/prover/smt/solver/qel.ts +25 -0
  395. package/src/prover/smt/solver/qi-queue.ts +0 -1
  396. package/src/prover/smt/solver/qsat.ts +814 -0
  397. package/src/prover/smt/solver/quant-hoist.ts +196 -0
  398. package/src/prover/smt/solver/quant-tactics.ts +16 -56
  399. package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
  400. package/src/prover/smt/solver/quantifier-manager.ts +8 -16
  401. package/src/prover/smt/solver/quasi-macros.ts +243 -0
  402. package/src/prover/smt/solver/random-gen.ts +0 -1
  403. package/src/prover/smt/solver/rational.ts +45 -1
  404. package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
  405. package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
  406. package/src/prover/smt/solver/reduce-args.ts +225 -0
  407. package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
  408. package/src/prover/smt/solver/ref-vector.ts +0 -1
  409. package/src/prover/smt/solver/relevancy.ts +1 -2
  410. package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
  411. package/src/prover/smt/solver/rewriter.ts +475 -36
  412. package/src/prover/smt/solver/rlimit.ts +25 -2
  413. package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
  414. package/src/prover/smt/solver/sat/big.ts +177 -0
  415. package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
  416. package/src/prover/smt/solver/sat/clause.ts +203 -0
  417. package/src/prover/smt/solver/sat/cleaner.ts +94 -0
  418. package/src/prover/smt/solver/sat/config.ts +122 -0
  419. package/src/prover/smt/solver/sat/consequences.ts +203 -0
  420. package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
  421. package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
  422. package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
  423. package/src/prover/smt/solver/sat/model-converter.ts +136 -0
  424. package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
  425. package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
  426. package/src/prover/smt/solver/sat/probing.ts +170 -0
  427. package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
  428. package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
  429. package/src/prover/smt/solver/sat/scc.ts +142 -0
  430. package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
  431. package/src/prover/smt/solver/sat/solver.ts +2127 -0
  432. package/src/prover/smt/solver/sat/var-queue.ts +117 -0
  433. package/src/prover/smt/solver/sat/watch-list.ts +140 -0
  434. package/src/prover/smt/solver/search-tree.ts +284 -0
  435. package/src/prover/smt/solver/seq-axioms.ts +1010 -0
  436. package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
  437. package/src/prover/smt/solver/seq-derive.ts +1301 -0
  438. package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
  439. package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
  440. package/src/prover/smt/solver/seq-factory.ts +89 -0
  441. package/src/prover/smt/solver/seq-monadic.ts +728 -0
  442. package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
  443. package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
  444. package/src/prover/smt/solver/seq-re-util.ts +758 -0
  445. package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
  446. package/src/prover/smt/solver/seq-regex-live.ts +200 -0
  447. package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
  448. package/src/prover/smt/solver/seq-skolem.ts +317 -0
  449. package/src/prover/smt/solver/seq-subset.ts +165 -0
  450. package/src/prover/smt/solver/seq-view-witness.ts +353 -0
  451. package/src/prover/smt/solver/smt-consequences.ts +297 -0
  452. package/src/prover/smt/solver/smt-kernel.ts +83 -0
  453. package/src/prover/smt/solver/smt-logics.ts +66 -0
  454. package/src/prover/smt/solver/smt-setup.ts +496 -0
  455. package/src/prover/smt/solver/smt2-printer.ts +765 -0
  456. package/src/prover/smt/solver/smtlib-parser.ts +3126 -316
  457. package/src/prover/smt/solver/smtlib-script.ts +1631 -0
  458. package/src/prover/smt/solver/solve-eqs.ts +929 -0
  459. package/src/prover/smt/solver/solver.ts +113 -22
  460. package/src/prover/smt/solver/static-features.ts +314 -0
  461. package/src/prover/smt/solver/sticky-generations.ts +0 -1
  462. package/src/prover/smt/solver/tactic.ts +1986 -0
  463. package/src/prover/smt/solver/term-enumeration.ts +205 -0
  464. package/src/prover/smt/solver/theory-array.ts +1240 -0
  465. package/src/prover/smt/solver/theory-bv.ts +1200 -0
  466. package/src/prover/smt/solver/theory-char.ts +355 -0
  467. package/src/prover/smt/solver/theory-datatype.ts +598 -0
  468. package/src/prover/smt/solver/theory-finite-set.ts +30 -0
  469. package/src/prover/smt/solver/theory-fpa.ts +389 -0
  470. package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
  471. package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
  472. package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
  473. package/src/prover/smt/solver/theory-lra-internalize.ts +86 -27
  474. package/src/prover/smt/solver/theory-lra-model.ts +20 -35
  475. package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
  476. package/src/prover/smt/solver/theory-lra-state.ts +6 -22
  477. package/src/prover/smt/solver/theory-lra.ts +188 -1
  478. package/src/prover/smt/solver/theory-pb.ts +934 -0
  479. package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
  480. package/src/prover/smt/solver/theory-recfun.ts +307 -0
  481. package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
  482. package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
  483. package/src/prover/smt/solver/theory-seq-state.ts +871 -0
  484. package/src/prover/smt/solver/theory-seq.ts +961 -0
  485. package/src/prover/smt/solver/theory.ts +189 -0
  486. package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
  487. package/src/prover/smt/solver/var-subst.ts +36 -14
  488. package/src/prover/smt/table.ts +3 -2
  489. package/src/prover/smt/types.ts +146 -0
  490. package/src/prover/tlapm/cache.ts +50 -19
  491. package/src/prover/tlapm/tlapm.ts +15 -9
  492. package/src/prover/tlapm-library.ts +3208 -0
  493. package/src/prover/verdict.ts +9 -0
  494. package/src/prover/zenon/check/check.ts +1 -2
  495. package/src/prover/zenon/check/records.ts +1 -1
  496. package/src/prover/zenon/check/relations.ts +2 -1
  497. package/src/prover/zenon/check/rewrites.ts +2 -15
  498. package/src/prover/zenon/check/sets.ts +40 -58
  499. package/src/prover/zenon/check/terms.ts +1 -2
  500. package/src/prover/zenon/decide.ts +10 -7
  501. package/src/prover/zenon/encode.ts +0 -2
  502. package/src/prover/zenon/eqrel.ts +2 -2
  503. package/src/prover/zenon/equality-rules.ts +0 -2
  504. package/src/prover/zenon/expr.ts +7 -2
  505. package/src/prover/zenon/index-table.ts +9 -21
  506. package/src/prover/zenon/isar-case.ts +0 -2
  507. package/src/prover/zenon/isar.ts +35 -37
  508. package/src/prover/zenon/llproof.ts +2 -13
  509. package/src/prover/zenon/mltoll.ts +12 -30
  510. package/src/prover/zenon/node.ts +20 -5
  511. package/src/prover/zenon/parse.ts +9 -8
  512. package/src/prover/zenon/phrase.ts +0 -2
  513. package/src/prover/zenon/proof.ts +0 -2
  514. package/src/prover/zenon/propositional-rules.ts +0 -2
  515. package/src/prover/zenon/rules.ts +0 -2
  516. package/src/prover/zenon/search.ts +11 -19
  517. package/src/prover/zenon/tla/functions.ts +2 -4
  518. package/src/prover/zenon/tla/llproof.ts +9 -13
  519. package/src/prover/zenon/tla/records.ts +1 -8
  520. package/src/prover/zenon/tla/rewrites.ts +0 -2
  521. package/src/prover/zenon/tla/sets.ts +22 -22
  522. package/src/prover/zenon/tla/terms.ts +0 -2
  523. package/src/prover/zenon/tla/tla.ts +7 -8
  524. package/src/resolve.ts +56 -74
  525. package/src/runtime.ts +4 -0
  526. package/src/sany/generation.ts +394 -0
  527. package/src/sany/generator-def-entries.ts +210 -0
  528. package/src/sany/generator-definitions.ts +686 -0
  529. package/src/sany/generator-expressions.ts +1100 -0
  530. package/src/sany/generator-proofs.ts +662 -0
  531. package/src/sany/generator.ts +155 -2625
  532. package/src/sany/levels.ts +0 -2
  533. package/src/sany/lexer.ts +17 -16
  534. package/src/sany/linter.ts +0 -2
  535. package/src/sany/nodes.ts +2 -3
  536. package/src/sany/report.ts +3 -6
  537. package/src/sany/selectors.ts +35 -38
  538. package/src/sany/xml.ts +23 -55
  539. package/src/search.ts +205 -43
  540. package/src/simulate.ts +157 -133
  541. package/src/spec-description.ts +33 -48
  542. package/src/standard-definitions.ts +4 -0
  543. package/src/standard-modules.ts +16 -32
  544. package/src/state-graph.ts +0 -2
  545. package/src/substitution-levels.ts +5 -4
  546. package/src/successors.ts +6 -8
  547. package/src/symmetry.ts +2 -2
  548. package/src/tableau.ts +2 -2
  549. package/src/tlc/fingerprint.ts +81 -9
  550. package/src/tlc/messages.ts +20 -15
  551. package/src/tlc/random.ts +4 -4
  552. package/src/tlc/replay.ts +8 -15
  553. package/src/tlc/summary.ts +29 -14
  554. package/src/tlc/tlc-operators.ts +2 -3
  555. package/src/tlc/tlcext-operators.ts +44 -12
  556. package/src/tlc/trace-spec.ts +21 -40
  557. package/src/typed-tier.ts +6535 -0
  558. package/src/typescript/actions.ts +2 -4
  559. package/src/typescript/collections.ts +34 -20
  560. package/src/typescript/compile.ts +1 -3
  561. package/src/typescript/formula.ts +5 -3
  562. package/src/typescript/model.ts +4 -5
  563. package/src/typescript/steps.ts +20 -18
  564. package/src/values.ts +62 -152
  565. package/src/prover/isabelle/isar/statement.ts +0 -52
  566. package/src/prover/smt/solver/z3-license.txt +0 -10
  567. package/src/prover/tlaps-module.ts +0 -510
  568. package/src/prover/zenon/LICENSE +0 -32
@@ -27,8 +27,6 @@ import {
27
27
  type ThmOrAssumpDefNode,
28
28
  } from "./nodes";
29
29
 
30
- // A port of the levelCheck methods of SANY's semantic nodes.
31
-
32
30
  type AnyDefNode = OpDefNode | ThmOrAssumpDefNode;
33
31
 
34
32
  interface LevelCheck {
package/src/sany/lexer.ts CHANGED
@@ -290,34 +290,35 @@ const getMatchLength = (pattern: RegExp, source: string, offset: number) => {
290
290
  return pattern.exec(source)?.[0].length ?? 0;
291
291
  };
292
292
 
293
+ interface TokenMatch {
294
+ kind: number;
295
+ length: number;
296
+ }
297
+
298
+ const getLongerMatch = (best: TokenMatch, match: TokenMatch) =>
299
+ match.length > best.length || (match.length === best.length && match.kind < best.kind)
300
+ ? match
301
+ : best;
302
+
293
303
  const matchPatterns = (patterns: [string, RegExp[]][], source: string, offset: number) =>
294
304
  patterns
295
305
  .map(([name, regexes]) => ({
296
306
  kind: getKind(name),
297
307
  length: Math.max(...regexes.map((regex) => getMatchLength(regex, source, offset))),
298
308
  }))
299
- .reduce(
300
- (best, match) =>
301
- match.length > best.length || (match.length === best.length && match.kind < best.kind)
302
- ? match
303
- : best,
304
- { kind: -1, length: 0 },
305
- );
309
+ .reduce(getLongerMatch, { kind: -1, length: 0 });
306
310
 
307
311
  const matchSpecToken = (source: string, offset: number) => {
308
312
  const literalLength = LITERAL_LENGTHS.find((length) =>
309
313
  LITERALS.has(source.slice(offset, offset + length)),
310
314
  );
311
315
  const pattern = matchPatterns(SPEC_PATTERNS, source, offset);
312
- if (literalLength === undefined) return pattern;
313
- const literal = {
314
- kind: LITERALS.get(source.slice(offset, offset + literalLength)) ?? -1,
315
- length: literalLength,
316
- };
317
- return literal.length > pattern.length ||
318
- (literal.length === pattern.length && literal.kind < pattern.kind)
319
- ? literal
320
- : pattern;
316
+ return literalLength === undefined
317
+ ? pattern
318
+ : getLongerMatch(pattern, {
319
+ kind: LITERALS.get(source.slice(offset, offset + literalLength)) ?? -1,
320
+ length: literalLength,
321
+ });
321
322
  };
322
323
 
323
324
  export const getTabStop = (column: number) => column + 8 - (column % 8);
@@ -7,8 +7,6 @@ import {
7
7
  type SemanticNode,
8
8
  } from "./nodes";
9
9
 
10
- // A port of SANY's tla2sany.linter.Linter.
11
-
12
10
  const getChildren = (node: SemanticNode): (SemanticNode | undefined)[] => {
13
11
  switch (node.kind) {
14
12
  case "OpAppl":
package/src/sany/nodes.ts CHANGED
@@ -153,12 +153,11 @@ export interface OpApplNode extends LevelFields {
153
153
  tupleOrs: boolean[] | undefined;
154
154
  ranges: ExprNode[];
155
155
  location: SanyLocation;
156
- isNull?: boolean;
157
- isAbsent?: boolean;
156
+ nullKind?: "null" | "absent";
158
157
  }
159
158
 
160
159
  export const isAbsent = (node: LevelNode | undefined) =>
161
- node?.kind === "OpAppl" && node.isAbsent === true;
160
+ node?.kind === "OpAppl" && node.nullKind === "absent";
162
161
 
163
162
  export interface NumeralNode extends LevelFields {
164
163
  kind: "Numeral";
@@ -109,9 +109,8 @@ export const getSanyReport = (
109
109
  const rootName = basename(rootPath, ".tla");
110
110
  const standardModules = getSanyStandardModules(options.version);
111
111
  const name = options.fileName ?? rootName;
112
- const source = existsSync(rootPath)
113
- ? readFileSync(rootPath, "utf8")
114
- : standardModules.get(rootName);
112
+ const isRootFile = existsSync(rootPath);
113
+ const source = isRootFile ? readFileSync(rootPath, "utf8") : standardModules.get(rootName);
115
114
  const lines: string[] = [];
116
115
  const write = (text: string) => {
117
116
  lines.push(text);
@@ -124,9 +123,7 @@ export const getSanyReport = (
124
123
  if (!options.isXmlExport) log(text);
125
124
  };
126
125
  const describeFile = options.describeFile;
127
- const origins = new Map<string, SanyModuleOrigin>([
128
- [rootName, existsSync(rootPath) ? "file" : "standard"],
129
- ]);
126
+ const origins = new Map<string, SanyModuleOrigin>([[rootName, isRootFile ? "file" : "standard"]]);
130
127
  let isFailed = false;
131
128
  const parseMessages: SanyMessage[] = [];
132
129
  let isParseReported = false;
@@ -176,7 +176,6 @@ export const createSelectorResolver =
176
176
  const substInPrefix: SubstInNode[] = [];
177
177
  const params: FormalParamNode[] = [];
178
178
  const allArgs: ExprOrOpArgNode[] = [];
179
- const getItemLocation = (itemIndex: number) => items[itemIndex].location ?? location;
180
179
  const walk: SelectorWalk = {
181
180
  name: undefined,
182
181
  nameLocation: undefined,
@@ -189,6 +188,7 @@ export const createSelectorResolver =
189
188
  definitionArgs: [],
190
189
  isInSuffices: false,
191
190
  };
191
+ const getItemLocation = () => items[walk.index].location ?? location;
192
192
  const getArgs = (item: SelectorItem) => item.args ?? [];
193
193
 
194
194
  while (walk.index < items.length) {
@@ -198,7 +198,7 @@ export const createSelectorResolver =
198
198
  item.args !== undefined
199
199
  ) {
200
200
  return generator.addError(
201
- getItemLocation(walk.index),
201
+ getItemLocation(),
202
202
  `Selector \`${item.name}' should not have argument(s).`,
203
203
  );
204
204
  }
@@ -217,7 +217,7 @@ export const createSelectorResolver =
217
217
  : undefined;
218
218
  if (walk.name === undefined && current.op !== "Name") {
219
219
  return generator.addError(
220
- getItemLocation(walk.index),
220
+ getItemLocation(),
221
221
  `Need name or step number here, not \`${current.name}'.`,
222
222
  );
223
223
  }
@@ -230,7 +230,7 @@ export const createSelectorResolver =
230
230
  if (symbol === undefined) {
231
231
  if (newName !== undefined) {
232
232
  walk.name = newName;
233
- walk.nameLocation = extendLocation(walk.nameLocation, getItemLocation(walk.index));
233
+ walk.nameLocation = extendLocation(walk.nameLocation, getItemLocation());
234
234
  }
235
235
  collectedArgs.push(...getArgs(current));
236
236
  walk.index++;
@@ -239,7 +239,7 @@ export const createSelectorResolver =
239
239
  if (symbol === undefined && generator.version === "1.7.4") {
240
240
  const lastIndex = items.length - 1;
241
241
  return generator.addError(
242
- getItemLocation(lastIndex),
242
+ items[lastIndex].location ?? location,
243
243
  `Unknown operator: \`${getSelectorItemName(items[lastIndex])}'.`,
244
244
  );
245
245
  }
@@ -251,16 +251,16 @@ export const createSelectorResolver =
251
251
  }
252
252
  if (symbol.kind === "Module") {
253
253
  return generator.addError(
254
- getItemLocation(walk.index),
254
+ getItemLocation(),
255
255
  `Module name (${items[walk.index].name}) not allowed here.`,
256
256
  );
257
257
  }
258
258
  walk.node = symbol;
259
- walk.nameLocation = extendLocation(walk.nameLocation, getItemLocation(walk.index));
259
+ walk.nameLocation = extendLocation(walk.nameLocation, getItemLocation());
260
260
  walk.name = newName;
261
261
  if (isDeclarationLike(symbol) && items.length !== 1) {
262
262
  return generator.addError(
263
- getItemLocation(walk.index),
263
+ getItemLocation(),
264
264
  `Cannot take subexpression of \`${walk.name}'.`,
265
265
  );
266
266
  }
@@ -279,7 +279,7 @@ export const createSelectorResolver =
279
279
  symbol,
280
280
  argumentIndex + walk.definitionArityFound,
281
281
  argument,
282
- getItemLocation(walk.index),
282
+ getItemLocation(),
283
283
  ),
284
284
  ),
285
285
  );
@@ -288,7 +288,7 @@ export const createSelectorResolver =
288
288
  if (symbol.kind === "OpDef" && symbol.defKind === "ModuleInstance") {
289
289
  if (walk.index === items.length - 1 && !(isDef || isFact)) {
290
290
  return generator.addError(
291
- getItemLocation(walk.index),
291
+ getItemLocation(),
292
292
  `Operator name ${walk.name} is incomplete.`,
293
293
  );
294
294
  }
@@ -305,7 +305,7 @@ export const createSelectorResolver =
305
305
  items.length !== 1
306
306
  ) {
307
307
  return generator.addError(
308
- getItemLocation(walk.index),
308
+ getItemLocation(),
309
309
  `Subexpression of \`${walk.name}' used inside the operator's definition.`,
310
310
  );
311
311
  }
@@ -340,21 +340,18 @@ export const createSelectorResolver =
340
340
  ? owner.labels.get(item.name)
341
341
  : undefined;
342
342
  if (label === undefined)
343
- return generator.addError(
344
- getItemLocation(walk.index),
345
- `Cannot find label \`${item.name}'.`,
346
- );
343
+ return generator.addError(getItemLocation(), `Cannot find label \`${item.name}'.`);
347
344
  walk.node = label;
348
345
  if (generator.isOutOfLabelScope(label)) {
349
346
  return generator.addError(
350
- getItemLocation(walk.index),
347
+ getItemLocation(),
351
348
  `Accessing subexpression labeled \`${item.name}' of ASSUME/PROVE clause within the scope of a declaration\n from outside that declaration's scope.`,
352
349
  );
353
350
  }
354
351
  if (expectedArity === 0) {
355
352
  if (label.params.length !== getArgs(item).length) {
356
353
  return generator.addError(
357
- getItemLocation(walk.index),
354
+ getItemLocation(),
358
355
  `Label \`${item.name}' used with wrong number of arguments.`,
359
356
  );
360
357
  }
@@ -371,7 +368,7 @@ export const createSelectorResolver =
371
368
  const node = walk.node;
372
369
  const addNonexistentError = () =>
373
370
  generator.addError(
374
- getItemLocation(walk.index),
371
+ getItemLocation(),
375
372
  `Nonexistent operand specified by \`${getSelectorItemName(item)}'.`,
376
373
  );
377
374
  if (item.op === ":") {
@@ -381,19 +378,19 @@ export const createSelectorResolver =
381
378
  (walk.index < items.length - 1 && items[walk.index + 1].op === "Name"));
382
379
  if (!isAllowed) {
383
380
  return generator.addError(
384
- getItemLocation(walk.index),
381
+ getItemLocation(),
385
382
  "`!:' can be used only after a name and either at the end after an\noperator name or before an operator name.",
386
383
  );
387
384
  }
388
385
  } else if (node === undefined) {
389
386
  return generator.addError(
390
- getItemLocation(walk.index),
387
+ getItemLocation(),
391
388
  "Subexpression selection failed, probably due to an error in the selected expression.",
392
389
  );
393
390
  } else if (node.kind === "LetIn") {
394
391
  if (getArgNumber(item.op, 1) !== 1)
395
392
  return generator.addError(
396
- getItemLocation(walk.index),
393
+ getItemLocation(),
397
394
  "A LET/IN expression has only one operand.",
398
395
  );
399
396
  walk.node = node.body;
@@ -406,7 +403,7 @@ export const createSelectorResolver =
406
403
  (operator.kind === "OpDef" && operator.defKind === "UserDefined");
407
404
  const addNotPairError = () =>
408
405
  generator.addError(
409
- getItemLocation(walk.index),
406
+ getItemLocation(),
410
407
  "Internal error: Expecting $Pair and didn't find it.",
411
408
  );
412
409
  const isPair = (pair: ExprOrOpArgNode | undefined): pair is OpApplNode =>
@@ -425,7 +422,7 @@ export const createSelectorResolver =
425
422
  } else if (operator.name === "$Case") {
426
423
  if (walk.index === items.length - 1) {
427
424
  return generator.addError(
428
- getItemLocation(walk.index),
425
+ getItemLocation(),
429
426
  "Subexpression of CASE must have form !i!j.",
430
427
  );
431
428
  }
@@ -436,20 +433,20 @@ export const createSelectorResolver =
436
433
  const number = getArgNumber(items[walk.index].op, 2);
437
434
  if (number === -1) {
438
435
  return generator.addError(
439
- getItemLocation(walk.index),
436
+ getItemLocation(),
440
437
  "Second selector for CASE subexpression must specify one of two operands.",
441
438
  );
442
439
  }
443
440
  walk.node = pair.operands[number - 1];
444
441
  if (walk.node === undefined)
445
442
  return generator.addError(
446
- getItemLocation(walk.index),
443
+ getItemLocation(),
447
444
  "Selecting OTHER in a CASE statement.",
448
445
  );
449
446
  } else if (operator.name === "$Except") {
450
447
  if (operandNumber > 1) {
451
448
  return generator.addError(
452
- getItemLocation(walk.index),
449
+ getItemLocation(),
453
450
  "Selecting subexpression of an EXCEPT not yet implemented.",
454
451
  );
455
452
  }
@@ -464,7 +461,7 @@ export const createSelectorResolver =
464
461
  if (item.op === "Null") {
465
462
  if (getArgs(item).length !== symbols.length) {
466
463
  return generator.addError(
467
- getItemLocation(walk.index),
464
+ getItemLocation(),
468
465
  `Selector with ${getArgs(item).length} argument(s) used for quantifier with ${symbols.length} bound identifier(s).`,
469
466
  );
470
467
  }
@@ -478,7 +475,7 @@ export const createSelectorResolver =
478
475
  }
479
476
  } else {
480
477
  return generator.addError(
481
- getItemLocation(walk.index),
478
+ getItemLocation(),
482
479
  `Choosing operand \`${item.name}' of subexpression with no operands.`,
483
480
  );
484
481
  }
@@ -486,7 +483,7 @@ export const createSelectorResolver =
486
483
  if (node.isSuffices && !walk.isInSuffices) {
487
484
  if (getArgNumber(item.op, 1) !== 1) {
488
485
  return generator.addError(
489
- getItemLocation(walk.index),
486
+ getItemLocation(),
490
487
  "Accessing non-existent subexpression of a SUFFICES",
491
488
  );
492
489
  }
@@ -497,7 +494,7 @@ export const createSelectorResolver =
497
494
  if (number === -1) return addNonexistentError();
498
495
  if (generator.isOutOfClauseScope(node, number)) {
499
496
  return generator.addError(
500
- getItemLocation(walk.index),
497
+ getItemLocation(),
501
498
  "Accessing ASSUME/PROVE clause within the scope of a declaration\n from outside that declaration's scope.",
502
499
  );
503
500
  }
@@ -505,7 +502,7 @@ export const createSelectorResolver =
505
502
  walk.node = node.assumptions[number - 1];
506
503
  if (walk.node.kind === "NewSymb" && walk.index !== items.length - 1) {
507
504
  return generator.addError(
508
- getItemLocation(walk.index),
505
+ getItemLocation(),
509
506
  "Selected a subexpression of a NEW clause of an ASSUME.",
510
507
  );
511
508
  }
@@ -515,20 +512,20 @@ export const createSelectorResolver =
515
512
  const lambda = node.op;
516
513
  if (lambda.kind !== "OpDef" || lambda.name !== "LAMBDA") {
517
514
  return generator.addError(
518
- getItemLocation(walk.index),
515
+ getItemLocation(),
519
516
  "Trying to select subexpression of an operator argument.",
520
517
  );
521
518
  }
522
519
  if (item.op !== "Null" && item.op !== "@") {
523
520
  return generator.addError(
524
- getItemLocation(walk.index),
521
+ getItemLocation(),
525
522
  `Cannot use !${item.name} to select subexpression of a LAMBDA.`,
526
523
  );
527
524
  }
528
525
  if (item.op === "Null") {
529
526
  if (lambda.arity !== getArgs(item).length) {
530
527
  return generator.addError(
531
- getItemLocation(walk.index),
528
+ getItemLocation(),
532
529
  `Selector with ${getArgs(item).length} arguments used for LAMBDA expression taking ${lambda.arity} arguments.`,
533
530
  );
534
531
  }
@@ -541,13 +538,13 @@ export const createSelectorResolver =
541
538
  walk.index--;
542
539
  } else {
543
540
  return generator.addError(
544
- getItemLocation(walk.index),
541
+ getItemLocation(),
545
542
  "Selecting subexpression of expression that has none.",
546
543
  );
547
544
  }
548
545
  if (walk.node === undefined)
549
546
  return generator.addError(
550
- getItemLocation(walk.index),
547
+ getItemLocation(),
551
548
  `An unexpected null node specified by '${item.name}'.\nThis is probably due to a previous error.`,
552
549
  );
553
550
  if (walk.index !== items.length - 1) {
@@ -556,7 +553,7 @@ export const createSelectorResolver =
556
553
  while (walk.node?.kind === "Label") walk.node = walk.node.body;
557
554
  if (walk.node?.kind !== "LetIn") {
558
555
  return generator.addError(
559
- getItemLocation(walk.index),
556
+ getItemLocation(),
560
557
  "A name selector here must be from a LET clause.",
561
558
  );
562
559
  }
@@ -564,7 +561,7 @@ export const createSelectorResolver =
564
561
  walk.mode = "FindingOpName";
565
562
  } else if (next.op === ":") {
566
563
  return generator.addError(
567
- getItemLocation(walk.index),
564
+ getItemLocation(),
568
565
  "!: should not follow an operand selector.",
569
566
  );
570
567
  }
package/src/sany/xml.ts CHANGED
@@ -367,6 +367,10 @@ export interface XmlExportOptions {
367
367
  isTerse: boolean;
368
368
  }
369
369
 
370
+ interface LocatedLevelFields extends LevelFields {
371
+ location: SanyLocation | undefined;
372
+ }
373
+
370
374
  const exportSpecification = (
371
375
  modules: ModuleNode[],
372
376
  root: ModuleNode,
@@ -424,13 +428,9 @@ const exportSpecification = (
424
428
  return createElement(getReferenceTag(node), [createText("UID", node.id)]);
425
429
  };
426
430
 
427
- const withLevel = (
428
- element: XmlElement,
429
- node: LevelFields,
430
- location: SanyLocation | undefined,
431
- ) => {
431
+ const withLevel = (element: XmlElement, node: LocatedLevelFields) => {
432
432
  const level = node.levelChecked === 0 ? [] : [createText("level", node.level)];
433
- const head = location ? [getLocationElement(location), ...level] : level;
433
+ const head = node.location ? [getLocationElement(node.location), ...level] : level;
434
434
  return { ...element, children: [...head, ...element.children] };
435
435
  };
436
436
 
@@ -467,7 +467,6 @@ const exportSpecification = (
467
467
  createText("arity", node.arity),
468
468
  ]),
469
469
  node,
470
- node.location,
471
470
  );
472
471
  case "OpDecl":
473
472
  return withLevel(
@@ -477,7 +476,6 @@ const exportSpecification = (
477
476
  createText("kind", node.declKind),
478
477
  ]),
479
478
  node,
480
- node.location,
481
479
  );
482
480
  case "OpDef": {
483
481
  if (node.defKind === "NumberedProofStep") {
@@ -495,7 +493,6 @@ const exportSpecification = (
495
493
  ...(node.isLocal && !isTlc174 ? [createElement("local")] : []),
496
494
  ]),
497
495
  node,
498
- node.location,
499
496
  );
500
497
  }
501
498
  const params = node.params ?? [];
@@ -509,7 +506,6 @@ const exportSpecification = (
509
506
  : []),
510
507
  ]),
511
508
  node,
512
- node.location,
513
509
  );
514
510
  }
515
511
  const body = node.body;
@@ -518,38 +514,28 @@ const exportSpecification = (
518
514
  if (body === undefined || module === undefined) {
519
515
  throw new Error(`The definition of ${node.name} has no body`);
520
516
  }
521
- if (isTlc174) {
522
- return withLevel(
523
- createElement("UserDefinedOpKind", [
524
- createText("uniquename", node.name),
525
- createText("arity", node.arity),
526
- createElement("body", [exportExpression(body, JAVA_CALLS.body)]),
527
- ...(node.params
528
- ? [getParamsElement(params, node.isLeibnizArg, JAVA_CALLS.param)]
529
- : []),
530
- ...(node.inRecursive ? [createElement("recursive")] : []),
531
- ]),
532
- node,
533
- node.location,
534
- );
535
- }
536
517
  return withLevel(
537
518
  createElement("UserDefinedOpKind", [
538
519
  createText("uniquename", node.name),
539
520
  createText("arity", node.arity),
540
- createElement("originalOperator", [getReference(node.source ?? node)]),
541
- createElement("originallyDefinedInModule", [getReference(module)]),
521
+ ...(isTlc174
522
+ ? []
523
+ : [
524
+ createElement("originalOperator", [getReference(node.source ?? node)]),
525
+ createElement("originallyDefinedInModule", [getReference(module)]),
526
+ ]),
542
527
  createElement("body", [exportExpression(body, JAVA_CALLS.body)]),
543
- getParamsElement(params, node.isLeibnizArg, JAVA_CALLS.param),
544
- ...getPreCommentsElement(node.preComments),
528
+ ...(node.params || !isTlc174
529
+ ? [getParamsElement(params, node.isLeibnizArg, JAVA_CALLS.param)]
530
+ : []),
531
+ ...(isTlc174 ? [] : getPreCommentsElement(node.preComments)),
545
532
  ...(node.inRecursive ? [createElement("recursive")] : []),
546
- ...(node.recursiveSection >= 0
533
+ ...(node.recursiveSection >= 0 && !isTlc174
547
534
  ? [createText("recursiveSection", node.recursiveSection)]
548
535
  : []),
549
- ...(node.isLocal ? [createElement("local")] : []),
536
+ ...(node.isLocal && !isTlc174 ? [createElement("local")] : []),
550
537
  ]),
551
538
  node,
552
- node.location,
553
539
  );
554
540
  }
555
541
  case "ThmOrAssumpDef":
@@ -559,7 +545,6 @@ const exportSpecification = (
559
545
  exportExpression(node.body, JAVA_CALLS.theoremDefinitionBody),
560
546
  ]),
561
547
  node,
562
- node.location,
563
548
  );
564
549
  case "Module":
565
550
  return createElement("ModuleNode", [
@@ -581,7 +566,6 @@ const exportSpecification = (
581
566
  ...(node.isSuffices ? [createElement("suffices")] : []),
582
567
  ]),
583
568
  node,
584
- node.location,
585
569
  );
586
570
  case "Assume":
587
571
  return createElement("AssumeNode", [
@@ -643,7 +627,7 @@ const exportSpecification = (
643
627
  );
644
628
 
645
629
  const exportApplication = (node: OpApplNode) => {
646
- if (node.isNull && isTlc174) {
630
+ if (node.nullKind !== undefined && isTlc174) {
647
631
  throw getJavaException(getUnsupportedKind(0), [
648
632
  JAVA_CALLS.operator,
649
633
  ...getDefinitionFrames("OpDef", IN_BUILTINS),
@@ -706,7 +690,7 @@ const exportSpecification = (
706
690
  call: JavaFrame | JavaExpressionCall,
707
691
  ): XmlElement => {
708
692
  if (!isTlc174) return exportLevelNode(node);
709
- if (node.kind === "OpAppl" && node.isAbsent && "nullType" in call) {
693
+ if (node.kind === "OpAppl" && node.nullKind === "absent" && "nullType" in call) {
710
694
  throw getNullPointerException(call);
711
695
  }
712
696
  return withFrames(
@@ -722,18 +706,13 @@ const exportSpecification = (
722
706
  const exportLevelNode = (node: ExportedNode): XmlElement => {
723
707
  switch (node.kind) {
724
708
  case "OpAppl":
725
- return withLevel(exportApplication(node), node, node.location);
709
+ return withLevel(exportApplication(node), node);
726
710
  case "Numeral":
727
- return withLevel(
728
- createElement("NumeralNode", [createText("IntValue", node.value)]),
729
- node,
730
- node.location,
731
- );
711
+ return withLevel(createElement("NumeralNode", [createText("IntValue", node.value)]), node);
732
712
  case "String":
733
713
  return withLevel(
734
714
  createElement("StringNode", [createText("StringValue", node.value)]),
735
715
  node,
736
- node.location,
737
716
  );
738
717
  case "Decimal":
739
718
  return withLevel(
@@ -748,7 +727,6 @@ const exportSpecification = (
748
727
  ]),
749
728
  ]),
750
729
  node,
751
- node.location,
752
730
  );
753
731
  case "LetIn": {
754
732
  const body = exportExpression(node.body, JAVA_CALLS.letBody);
@@ -761,7 +739,6 @@ const exportSpecification = (
761
739
  ),
762
740
  ]),
763
741
  node,
764
- node.location,
765
742
  );
766
743
  }
767
744
  case "Label":
@@ -776,7 +753,6 @@ const exportSpecification = (
776
753
  ),
777
754
  ]),
778
755
  node,
779
- node.location,
780
756
  );
781
757
  case "OpArg":
782
758
  return withLevel(
@@ -784,7 +760,6 @@ const exportSpecification = (
784
760
  createElement("argument", [getReference(node.op, JAVA_CALLS.argument)]),
785
761
  ]),
786
762
  node,
787
- node.location,
788
763
  );
789
764
  case "At": {
790
765
  const object = node.except.operands[0];
@@ -798,7 +773,6 @@ const exportSpecification = (
798
773
  exportExpression(components, JAVA_CALLS.exceptComponents),
799
774
  ]),
800
775
  node,
801
- node.location,
802
776
  );
803
777
  }
804
778
  case "SubstIn":
@@ -814,7 +788,6 @@ const exportSpecification = (
814
788
  createElement("instTo", [getReference(node.instantiatedModule, calls.to)]),
815
789
  ]),
816
790
  node,
817
- node.location,
818
791
  );
819
792
  }
820
793
  case "Instance": {
@@ -845,7 +818,6 @@ const exportSpecification = (
845
818
  ...(node.isHide ? [createElement("hide")] : []),
846
819
  ]),
847
820
  node,
848
- node.location,
849
821
  );
850
822
  case "NewSymb":
851
823
  return withLevel(
@@ -856,7 +828,6 @@ const exportSpecification = (
856
828
  : []),
857
829
  ]),
858
830
  node,
859
- node.location,
860
831
  );
861
832
  case "AssumeProve":
862
833
  return withLevel(
@@ -872,7 +843,6 @@ const exportSpecification = (
872
843
  ...(node.isBoxed ? [createElement("boxed")] : []),
873
844
  ]),
874
845
  node,
875
- node.location,
876
846
  );
877
847
  case "LeafProof": {
878
848
  const isObvious = node.facts.length === 0 && node.defs.length === 0;
@@ -891,7 +861,7 @@ const exportSpecification = (
891
861
  ),
892
862
  ...(node.isOnly ? [createElement("only")] : []),
893
863
  ]);
894
- return withLevel(element, node, node.location);
864
+ return withLevel(element, node);
895
865
  }
896
866
  case "NonLeafProof":
897
867
  return withLevel(
@@ -904,7 +874,6 @@ const exportSpecification = (
904
874
  ),
905
875
  ]),
906
876
  node,
907
- node.location,
908
877
  );
909
878
  case "DefStep":
910
879
  return withLevel(
@@ -913,7 +882,6 @@ const exportSpecification = (
913
882
  node.defs.map((definition) => getReference(definition, JAVA_CALLS.defStep)),
914
883
  ),
915
884
  node,
916
- node.location,
917
885
  );
918
886
  }
919
887
  };