tla-ts 0.0.9-dev.8298a52 → 0.0.10-dev.06b481ee0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (631) hide show
  1. package/README.md +8 -0
  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 +121 -12
  8. package/dist/index.d.ts +121 -12
  9. package/dist/index.js +1 -1
  10. package/dist/parallel-worker.cjs +1 -1
  11. package/dist/parallel-worker.js +1 -1
  12. package/dist/prove-worker.cjs +1 -1
  13. package/dist/prove-worker.js +1 -1
  14. package/dist/prove.cjs +2746 -410
  15. package/dist/prove.js +2745 -409
  16. package/dist/run.cjs +144 -31
  17. package/dist/run.js +144 -31
  18. package/dist/tlapm.cjs +2 -2
  19. package/dist/tlapm.js +2 -2
  20. package/dist/transfer.cjs +134 -104
  21. package/dist/transfer.js +134 -104
  22. package/dist/worker.cjs +7 -7
  23. package/dist/worker.js +7 -7
  24. package/package.json +1 -1
  25. package/src/ast.ts +56 -60
  26. package/src/bags.ts +128 -110
  27. package/src/builtins.ts +31 -77
  28. package/src/bundled-modules.ts +1 -8
  29. package/src/check-failure.ts +118 -0
  30. package/src/check-trace.ts +320 -0
  31. package/src/check.ts +1155 -900
  32. package/src/cli/options.ts +12 -32
  33. package/src/cli/run.ts +0 -2
  34. package/src/cli/runtime-invariants.ts +100 -0
  35. package/src/cli/shared.ts +19 -12
  36. package/src/cli/tlapm.ts +433 -82
  37. package/src/cli/tlc-arguments.ts +652 -0
  38. package/src/cli/tlc-output.ts +701 -0
  39. package/src/cli/tlc-usage.ts +360 -0
  40. package/src/cli/tlc.ts +318 -656
  41. package/src/cli/typescript.ts +0 -3
  42. package/src/cli/xml-exporter.ts +27 -49
  43. package/src/cli.ts +0 -1
  44. package/src/codegen.ts +217 -82
  45. package/src/config.ts +140 -109
  46. package/src/coverage.ts +1019 -0
  47. package/src/dependencies.ts +101 -66
  48. package/src/dfid.ts +683 -0
  49. package/src/environment-config.ts +315 -0
  50. package/src/environment.ts +260 -371
  51. package/src/errors.ts +93 -58
  52. package/src/evaluate.ts +848 -374
  53. package/src/exit-codes.ts +63 -13
  54. package/src/fingerprints.ts +75 -11
  55. package/src/index.ts +3 -0
  56. package/src/instances.ts +97 -43
  57. package/src/java-hash.ts +21 -0
  58. package/src/java-overrides.ts +6 -21
  59. package/src/json-reader.ts +455 -0
  60. package/src/json.ts +252 -139
  61. package/src/levels.ts +231 -154
  62. package/src/lexer.ts +83 -101
  63. package/src/liveness-checker.ts +743 -325
  64. package/src/liveness.ts +224 -131
  65. package/src/obligations/action.ts +17 -44
  66. package/src/obligations/anonymize.ts +120 -95
  67. package/src/obligations/enabled-axioms.ts +218 -0
  68. package/src/obligations/equality.ts +1 -3
  69. package/src/obligations/expression.ts +37 -26
  70. package/src/obligations/format.ts +0 -10
  71. package/src/obligations/generate.ts +66 -64
  72. package/src/obligations/index.ts +39 -20
  73. package/src/obligations/levels.ts +27 -18
  74. package/src/obligations/module.ts +28 -55
  75. package/src/obligations/normalize.ts +31 -41
  76. package/src/obligations/operators.ts +0 -3
  77. package/src/obligations/pragma.ts +52 -24
  78. package/src/obligations/printer.ts +94 -63
  79. package/src/obligations/proof.ts +3 -6
  80. package/src/obligations/regroup.ts +0 -5
  81. package/src/obligations/simplify.ts +57 -63
  82. package/src/obligations/source.ts +121 -95
  83. package/src/obligations/subexpression.ts +49 -28
  84. package/src/obligations/substitution.ts +1 -5
  85. package/src/obligations/temporal.ts +12 -20
  86. package/src/obligations/tuples.ts +2 -10
  87. package/src/parallel-worker.ts +34 -57
  88. package/src/parallel.ts +62 -72
  89. package/src/parser.ts +1184 -531
  90. package/src/pcal/ast.ts +53 -86
  91. package/src/pcal/parse.ts +144 -219
  92. package/src/pcal/tokenize.ts +91 -131
  93. package/src/pcal/translate.ts +83 -130
  94. package/src/pcal/validate.ts +48 -68
  95. package/src/pretty-print.ts +7 -8
  96. package/src/prover/decide-pool.ts +8 -13
  97. package/src/prover/deciders.ts +12 -13
  98. package/src/prover/first-order.ts +0 -11
  99. package/src/prover/isabelle/decide.ts +3 -31
  100. package/src/prover/isabelle/encode.ts +82 -64
  101. package/src/prover/isabelle/isar/attrib.ts +250 -0
  102. package/src/prover/isabelle/isar/context.ts +335 -0
  103. package/src/prover/isabelle/isar/induct.ts +382 -0
  104. package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
  105. package/src/prover/isabelle/isar/method.ts +510 -226
  106. package/src/prover/isabelle/isar/proof.ts +570 -23
  107. package/src/prover/isabelle/isar/rule-cases.ts +226 -0
  108. package/src/prover/isabelle/isar/theory.ts +488 -88
  109. package/src/prover/isabelle/isar/toplevel.ts +331 -0
  110. package/src/prover/isabelle/isar/type-check.ts +99 -38
  111. package/src/prover/isabelle/provers/blast/blast.ts +16 -105
  112. package/src/prover/isabelle/provers/blast/branch.ts +0 -33
  113. package/src/prover/isabelle/provers/blast/prove.ts +0 -36
  114. package/src/prover/isabelle/provers/blast/rules.ts +5 -45
  115. package/src/prover/isabelle/provers/blast/state.ts +1 -29
  116. package/src/prover/isabelle/provers/blast/term.ts +8 -37
  117. package/src/prover/isabelle/provers/clasimp.ts +1 -15
  118. package/src/prover/isabelle/provers/classical.ts +58 -61
  119. package/src/prover/isabelle/provers/hypsubst.ts +29 -54
  120. package/src/prover/isabelle/pure/bicompose.ts +24 -39
  121. package/src/prover/isabelle/pure/consts.ts +0 -8
  122. package/src/prover/isabelle/pure/conv.ts +2 -18
  123. package/src/prover/isabelle/pure/drule.ts +95 -45
  124. package/src/prover/isabelle/pure/envir.ts +2 -53
  125. package/src/prover/isabelle/pure/goal.ts +1 -9
  126. package/src/prover/isabelle/pure/interrupt.ts +0 -5
  127. package/src/prover/isabelle/pure/list.ts +0 -3
  128. package/src/prover/isabelle/pure/logic.ts +1 -16
  129. package/src/prover/isabelle/pure/name.ts +1 -10
  130. package/src/prover/isabelle/pure/net.ts +2 -60
  131. package/src/prover/isabelle/pure/object-logic.ts +15 -16
  132. package/src/prover/isabelle/pure/pattern.ts +1 -20
  133. package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
  134. package/src/prover/isabelle/pure/rewriter.ts +34 -77
  135. package/src/prover/isabelle/pure/search.ts +2 -11
  136. package/src/prover/isabelle/pure/seq.ts +0 -11
  137. package/src/prover/isabelle/pure/simplifier.ts +27 -16
  138. package/src/prover/isabelle/pure/table.ts +2 -33
  139. package/src/prover/isabelle/pure/tactic.ts +11 -23
  140. package/src/prover/isabelle/pure/tactical.ts +47 -48
  141. package/src/prover/isabelle/pure/term-ord.ts +1 -7
  142. package/src/prover/isabelle/pure/term.ts +4 -47
  143. package/src/prover/isabelle/pure/thm.ts +26 -48
  144. package/src/prover/isabelle/pure/type.ts +1 -16
  145. package/src/prover/isabelle/pure/unify.ts +19 -31
  146. package/src/prover/isabelle/pure/variable.ts +2 -8
  147. package/src/prover/isabelle/tla/classical-setup.ts +17 -25
  148. package/src/prover/isabelle/tla/context.ts +65 -26
  149. package/src/prover/isabelle/tla/logic-data.ts +1 -1
  150. package/src/prover/isabelle/tla/logic.ts +53 -32
  151. package/src/prover/isabelle/tla/simpdata.ts +45 -44
  152. package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
  153. package/src/prover/ocaml.ts +4 -7
  154. package/src/prover/prep/action.ts +33 -66
  155. package/src/prover/prep/enabled-axioms.ts +22 -20
  156. package/src/prover/prep/fingerprint.ts +2 -21
  157. package/src/prover/prep/level-comparison.ts +8 -12
  158. package/src/prover/prep/md5.ts +26 -31
  159. package/src/prover/prep/methods.ts +189 -86
  160. package/src/prover/prep/normalize.ts +42 -37
  161. package/src/prover/prove-worker.ts +0 -2
  162. package/src/prover/prove.ts +398 -133
  163. package/src/prover/ptl/decide.ts +96 -56
  164. package/src/prover/ptl/encode.ts +15 -38
  165. package/src/prover/ptl/sat.ts +24 -32
  166. package/src/prover/ptl/tableau.ts +40 -28
  167. package/src/prover/smt/arithmetic.ts +310 -0
  168. package/src/prover/smt/axioms.ts +12 -15
  169. package/src/prover/smt/context.ts +60 -32
  170. package/src/prover/smt/data.ts +517 -401
  171. package/src/prover/smt/encode.ts +155 -85
  172. package/src/prover/smt/extensionality.ts +5 -13
  173. package/src/prover/smt/flatten.ts +7 -28
  174. package/src/prover/smt/format.ts +33 -14
  175. package/src/prover/smt/instances.ts +7 -11
  176. package/src/prover/smt/layout.ts +91 -0
  177. package/src/prover/smt/rewrite.ts +1021 -658
  178. package/src/prover/smt/simplify.ts +441 -0
  179. package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
  180. package/src/prover/smt/solver/ackr-helper.ts +179 -0
  181. package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
  182. package/src/prover/smt/solver/act-cache.ts +0 -16
  183. package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
  184. package/src/prover/smt/solver/aig-tactic.ts +52 -0
  185. package/src/prover/smt/solver/aig.ts +889 -0
  186. package/src/prover/smt/solver/arith-rewriter.ts +626 -56
  187. package/src/prover/smt/solver/arith-terms.ts +121 -0
  188. package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
  189. package/src/prover/smt/solver/array-rewriter.ts +319 -0
  190. package/src/prover/smt/solver/array.ts +1 -3
  191. package/src/prover/smt/solver/asserted-formulas.ts +241 -99
  192. package/src/prover/smt/solver/ast-lt.ts +165 -21
  193. package/src/prover/smt/solver/ast-util.ts +160 -7
  194. package/src/prover/smt/solver/ast.ts +1480 -184
  195. package/src/prover/smt/solver/auf-solver.ts +30 -56
  196. package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
  197. package/src/prover/smt/solver/bit-blaster.ts +871 -0
  198. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  199. package/src/prover/smt/solver/bound-manager.ts +196 -0
  200. package/src/prover/smt/solver/bound-simplifier.ts +598 -0
  201. package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
  202. package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
  203. package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
  204. package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
  205. package/src/prover/smt/solver/bv1-blast.ts +214 -0
  206. package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
  207. package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
  208. package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
  209. package/src/prover/smt/solver/card2bv.ts +127 -0
  210. package/src/prover/smt/solver/case-split-queue.ts +0 -10
  211. package/src/prover/smt/solver/cg-table.ts +39 -42
  212. package/src/prover/smt/solver/check-logic.ts +330 -0
  213. package/src/prover/smt/solver/clause.ts +0 -27
  214. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
  215. package/src/prover/smt/solver/conflict-resolution.ts +78 -11
  216. package/src/prover/smt/solver/context.ts +600 -187
  217. package/src/prover/smt/solver/ctx-simplify.ts +34 -52
  218. package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
  219. package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
  220. package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
  221. package/src/prover/smt/solver/demodulator.ts +786 -0
  222. package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
  223. package/src/prover/smt/solver/der.ts +39 -30
  224. package/src/prover/smt/solver/diff-neq.ts +205 -0
  225. package/src/prover/smt/solver/distribute-forall.ts +57 -0
  226. package/src/prover/smt/solver/dom-simplify.ts +511 -0
  227. package/src/prover/smt/solver/dt2bv-tactic.ts +296 -0
  228. package/src/prover/smt/solver/dyn-ack.ts +0 -11
  229. package/src/prover/smt/solver/e-matching.ts +9 -41
  230. package/src/prover/smt/solver/elim-bounds.ts +89 -0
  231. package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
  232. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  233. package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
  234. package/src/prover/smt/solver/enode.ts +100 -23
  235. package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
  236. package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
  237. package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
  238. package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
  239. package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
  240. package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
  241. package/src/prover/smt/solver/euf/array-solver.ts +306 -0
  242. package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
  243. package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
  244. package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
  245. package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
  246. package/src/prover/smt/solver/euf/egraph.ts +901 -0
  247. package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
  248. package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
  249. package/src/prover/smt/solver/euf/mam.ts +1046 -0
  250. package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
  251. package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
  252. package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
  253. package/src/prover/smt/solver/euf/q-solver.ts +361 -0
  254. package/src/prover/smt/solver/euf/th-solver.ts +328 -0
  255. package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
  256. package/src/prover/smt/solver/expr-ref.ts +0 -5
  257. package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
  258. package/src/prover/smt/solver/expr2polynomial.ts +271 -0
  259. package/src/prover/smt/solver/factor.ts +163 -0
  260. package/src/prover/smt/solver/fd-solver.ts +734 -0
  261. package/src/prover/smt/solver/fingerprints.ts +15 -26
  262. package/src/prover/smt/solver/fix-dl-var.ts +147 -0
  263. package/src/prover/smt/solver/flat-literals.ts +0 -9
  264. package/src/prover/smt/solver/fm-tactic.ts +884 -0
  265. package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
  266. package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
  267. package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
  268. package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
  269. package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
  270. package/src/prover/smt/solver/goal.ts +179 -28
  271. package/src/prover/smt/solver/goal2nlsat.ts +216 -0
  272. package/src/prover/smt/solver/guard-set.ts +219 -0
  273. package/src/prover/smt/solver/hash.ts +0 -9
  274. package/src/prover/smt/solver/hashtable.ts +30 -23
  275. package/src/prover/smt/solver/inf-eps.ts +63 -0
  276. package/src/prover/smt/solver/inj-axiom.ts +101 -0
  277. package/src/prover/smt/solver/internalizer.ts +113 -133
  278. package/src/prover/smt/solver/lackr.ts +381 -0
  279. package/src/prover/smt/solver/lbool.ts +0 -2
  280. package/src/prover/smt/solver/lia2card.ts +268 -0
  281. package/src/prover/smt/solver/lia2pb.ts +154 -0
  282. package/src/prover/smt/solver/literal.ts +0 -4
  283. package/src/prover/smt/solver/logic-tactics.ts +355 -0
  284. package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
  285. package/src/prover/smt/solver/lp/constraints.ts +1 -8
  286. package/src/prover/smt/solver/lp/containers.ts +18 -31
  287. package/src/prover/smt/solver/lp/core-solver.ts +35 -37
  288. package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
  289. package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
  290. package/src/prover/smt/solver/lp/dependency.ts +0 -5
  291. package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
  292. package/src/prover/smt/solver/lp/explanation.ts +0 -6
  293. package/src/prover/smt/solver/lp/gomory.ts +8 -22
  294. package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
  295. package/src/prover/smt/solver/lp/hnf.ts +10 -28
  296. package/src/prover/smt/solver/lp/int-cube.ts +17 -39
  297. package/src/prover/smt/solver/lp/int-solver.ts +3 -35
  298. package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
  299. package/src/prover/smt/solver/lp/lar-term.ts +0 -5
  300. package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
  301. package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
  302. package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
  303. package/src/prover/smt/solver/lp/nex.ts +2 -7
  304. package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
  305. package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
  306. package/src/prover/smt/solver/lp/nla-core.ts +92 -136
  307. package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
  308. package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
  309. package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
  310. package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
  311. package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
  312. package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
  313. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
  314. package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
  315. package/src/prover/smt/solver/lp/nla-order.ts +0 -13
  316. package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
  317. package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
  318. package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
  319. package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
  320. package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
  321. package/src/prover/smt/solver/lp/nla-types.ts +0 -12
  322. package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
  323. package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
  324. package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
  325. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
  326. package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
  327. package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
  328. package/src/prover/smt/solver/lp/pdd.ts +730 -358
  329. package/src/prover/smt/solver/lp/random-updater.ts +0 -9
  330. package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
  331. package/src/prover/smt/solver/lp/union-find.ts +5 -5
  332. package/src/prover/smt/solver/macro-finder.ts +530 -0
  333. package/src/prover/smt/solver/mam-compiler.ts +129 -139
  334. package/src/prover/smt/solver/mam-interpreter.ts +0 -21
  335. package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
  336. package/src/prover/smt/solver/max-cliques.ts +105 -0
  337. package/src/prover/smt/solver/maxcore.ts +310 -0
  338. package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
  339. package/src/prover/smt/solver/maxlex.ts +115 -0
  340. package/src/prover/smt/solver/maxsmt-base.ts +106 -0
  341. package/src/prover/smt/solver/maxsmt.ts +92 -0
  342. package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
  343. package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
  344. package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
  345. package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
  346. package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
  347. package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
  348. package/src/prover/smt/solver/model-based-opt.ts +844 -0
  349. package/src/prover/smt/solver/model-checker.ts +20 -63
  350. package/src/prover/smt/solver/model-evaluator.ts +192 -40
  351. package/src/prover/smt/solver/model-finder.ts +14 -32
  352. package/src/prover/smt/solver/model-generator.ts +104 -46
  353. package/src/prover/smt/solver/model-macro-solver.ts +60 -114
  354. package/src/prover/smt/solver/model-printer.ts +214 -0
  355. package/src/prover/smt/solver/mpf.ts +709 -0
  356. package/src/prover/smt/solver/mus.ts +50 -0
  357. package/src/prover/smt/solver/muz/dl-context.ts +382 -0
  358. package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
  359. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
  360. package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
  361. package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
  362. package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
  363. package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
  364. package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
  365. package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
  366. package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
  367. package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
  368. package/src/prover/smt/solver/muz/hnf.ts +201 -0
  369. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
  370. package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
  371. package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
  372. package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
  373. package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
  374. package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
  375. package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
  376. package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
  377. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
  378. package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
  379. package/src/prover/smt/solver/muz/substitution.ts +203 -0
  380. package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
  381. package/src/prover/smt/solver/nlqsat.ts +484 -0
  382. package/src/prover/smt/solver/nlsat/algebraic.ts +357 -236
  383. package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
  384. package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
  385. package/src/prover/smt/solver/nlsat/explain.ts +429 -275
  386. package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
  387. package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
  388. package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
  389. package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
  390. package/src/prover/smt/solver/nlsat/solver.ts +297 -156
  391. package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
  392. package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
  393. package/src/prover/smt/solver/nlsat/types.ts +0 -9
  394. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
  395. package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
  396. package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
  397. package/src/prover/smt/solver/nnf.ts +112 -61
  398. package/src/prover/smt/solver/normalize-bounds.ts +53 -0
  399. package/src/prover/smt/solver/occf.ts +97 -0
  400. package/src/prover/smt/solver/opt-context.ts +801 -0
  401. package/src/prover/smt/solver/opt-nlsat.ts +386 -0
  402. package/src/prover/smt/solver/opt-pareto.ts +301 -0
  403. package/src/prover/smt/solver/opt-preprocess.ts +101 -0
  404. package/src/prover/smt/solver/opt-solver.ts +312 -0
  405. package/src/prover/smt/solver/opt-value.ts +55 -0
  406. package/src/prover/smt/solver/optsmt.ts +692 -0
  407. package/src/prover/smt/solver/parallel-tactic.ts +299 -0
  408. package/src/prover/smt/solver/pattern-inference.ts +21 -26
  409. package/src/prover/smt/solver/pb-rewriter.ts +281 -0
  410. package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
  411. package/src/prover/smt/solver/poly-rewriter.ts +261 -79
  412. package/src/prover/smt/solver/probes.ts +577 -0
  413. package/src/prover/smt/solver/propagate-values.ts +37 -30
  414. package/src/prover/smt/solver/proto-model.ts +650 -66
  415. package/src/prover/smt/solver/pull-quant.ts +28 -23
  416. package/src/prover/smt/solver/purify-arith.ts +632 -0
  417. package/src/prover/smt/solver/push-app-ite.ts +37 -0
  418. package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
  419. package/src/prover/smt/solver/qe-lite-der.ts +2 -31
  420. package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
  421. package/src/prover/smt/solver/qe-lite.ts +41 -51
  422. package/src/prover/smt/solver/qe-mbp.ts +270 -0
  423. package/src/prover/smt/solver/qe.ts +1499 -0
  424. package/src/prover/smt/solver/qel.ts +25 -0
  425. package/src/prover/smt/solver/qi-queue.ts +0 -16
  426. package/src/prover/smt/solver/qsat.ts +829 -0
  427. package/src/prover/smt/solver/quant-hoist.ts +196 -0
  428. package/src/prover/smt/solver/quant-tactics.ts +17 -74
  429. package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
  430. package/src/prover/smt/solver/quantifier-manager.ts +22 -32
  431. package/src/prover/smt/solver/quasi-macros.ts +243 -0
  432. package/src/prover/smt/solver/random-gen.ts +0 -2
  433. package/src/prover/smt/solver/rational.ts +45 -8
  434. package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
  435. package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
  436. package/src/prover/smt/solver/reduce-args.ts +225 -0
  437. package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
  438. package/src/prover/smt/solver/ref-vector.ts +0 -6
  439. package/src/prover/smt/solver/relevancy.ts +2 -16
  440. package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
  441. package/src/prover/smt/solver/rewriter.ts +507 -144
  442. package/src/prover/smt/solver/rlimit.ts +46 -24
  443. package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
  444. package/src/prover/smt/solver/sat/big.ts +177 -0
  445. package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
  446. package/src/prover/smt/solver/sat/clause.ts +203 -0
  447. package/src/prover/smt/solver/sat/cleaner.ts +94 -0
  448. package/src/prover/smt/solver/sat/config.ts +122 -0
  449. package/src/prover/smt/solver/sat/consequences.ts +203 -0
  450. package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
  451. package/src/prover/smt/solver/sat/goal2sat.ts +579 -0
  452. package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
  453. package/src/prover/smt/solver/sat/model-converter.ts +136 -0
  454. package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
  455. package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
  456. package/src/prover/smt/solver/sat/probing.ts +170 -0
  457. package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
  458. package/src/prover/smt/solver/sat/sat2goal.ts +189 -0
  459. package/src/prover/smt/solver/sat/scc.ts +142 -0
  460. package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
  461. package/src/prover/smt/solver/sat/solver.ts +2107 -0
  462. package/src/prover/smt/solver/sat/var-queue.ts +117 -0
  463. package/src/prover/smt/solver/sat/watch-list.ts +140 -0
  464. package/src/prover/smt/solver/search-tree.ts +284 -0
  465. package/src/prover/smt/solver/seq-axioms.ts +995 -0
  466. package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
  467. package/src/prover/smt/solver/seq-derive.ts +1298 -0
  468. package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
  469. package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
  470. package/src/prover/smt/solver/seq-factory.ts +89 -0
  471. package/src/prover/smt/solver/seq-monadic.ts +730 -0
  472. package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
  473. package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
  474. package/src/prover/smt/solver/seq-re-util.ts +758 -0
  475. package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
  476. package/src/prover/smt/solver/seq-regex-live.ts +200 -0
  477. package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
  478. package/src/prover/smt/solver/seq-skolem.ts +294 -0
  479. package/src/prover/smt/solver/seq-subset.ts +165 -0
  480. package/src/prover/smt/solver/seq-view-witness.ts +353 -0
  481. package/src/prover/smt/solver/smt-consequences.ts +297 -0
  482. package/src/prover/smt/solver/smt-kernel.ts +124 -0
  483. package/src/prover/smt/solver/smt-logics.ts +66 -0
  484. package/src/prover/smt/solver/smt-setup.ts +589 -0
  485. package/src/prover/smt/solver/smt2-printer.ts +765 -0
  486. package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
  487. package/src/prover/smt/solver/smtlib-script.ts +2134 -0
  488. package/src/prover/smt/solver/solve-eqs.ts +928 -0
  489. package/src/prover/smt/solver/solver.ts +129 -38
  490. package/src/prover/smt/solver/sort.ts +1 -5
  491. package/src/prover/smt/solver/static-features.ts +314 -0
  492. package/src/prover/smt/solver/sticky-generations.ts +0 -6
  493. package/src/prover/smt/solver/tactic.ts +2141 -0
  494. package/src/prover/smt/solver/term-enumeration.ts +205 -0
  495. package/src/prover/smt/solver/theory-array.ts +1240 -0
  496. package/src/prover/smt/solver/theory-bv.ts +1210 -0
  497. package/src/prover/smt/solver/theory-char.ts +355 -0
  498. package/src/prover/smt/solver/theory-datatype.ts +598 -0
  499. package/src/prover/smt/solver/theory-finite-set.ts +30 -0
  500. package/src/prover/smt/solver/theory-fpa.ts +389 -0
  501. package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
  502. package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
  503. package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
  504. package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
  505. package/src/prover/smt/solver/theory-lra-model.ts +23 -53
  506. package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
  507. package/src/prover/smt/solver/theory-lra-state.ts +7 -28
  508. package/src/prover/smt/solver/theory-lra.ts +189 -9
  509. package/src/prover/smt/solver/theory-pb.ts +951 -0
  510. package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
  511. package/src/prover/smt/solver/theory-recfun.ts +307 -0
  512. package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
  513. package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
  514. package/src/prover/smt/solver/theory-seq-state.ts +852 -0
  515. package/src/prover/smt/solver/theory-seq.ts +961 -0
  516. package/src/prover/smt/solver/theory-without-terms.ts +24 -0
  517. package/src/prover/smt/solver/theory.ts +189 -0
  518. package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
  519. package/src/prover/smt/solver/var-subst.ts +37 -39
  520. package/src/prover/smt/table.ts +3 -10
  521. package/src/prover/smt/types.ts +146 -0
  522. package/src/prover/tlapm/cache.ts +74 -48
  523. package/src/prover/tlapm/ocaml-marshal.ts +19 -21
  524. package/src/prover/tlapm/tlapm.ts +21 -20
  525. package/src/prover/tlapm-library.ts +3208 -0
  526. package/src/prover/verdict.ts +9 -2
  527. package/src/prover/zenon/check/check.ts +1 -11
  528. package/src/prover/zenon/check/definitions.ts +5 -15
  529. package/src/prover/zenon/check/equality.ts +0 -8
  530. package/src/prover/zenon/check/functions.ts +0 -4
  531. package/src/prover/zenon/check/keys.ts +0 -7
  532. package/src/prover/zenon/check/propositional.ts +0 -3
  533. package/src/prover/zenon/check/records.ts +1 -6
  534. package/src/prover/zenon/check/relations.ts +2 -14
  535. package/src/prover/zenon/check/rewrites.ts +2 -21
  536. package/src/prover/zenon/check/sets.ts +40 -61
  537. package/src/prover/zenon/check/terms.ts +1 -19
  538. package/src/prover/zenon/check/tla.ts +0 -6
  539. package/src/prover/zenon/decide.ts +10 -19
  540. package/src/prover/zenon/encode.ts +0 -9
  541. package/src/prover/zenon/eqrel.ts +2 -15
  542. package/src/prover/zenon/equality-rules.ts +24 -6
  543. package/src/prover/zenon/expr.ts +29 -28
  544. package/src/prover/zenon/index-table.ts +33 -61
  545. package/src/prover/zenon/isar-case.ts +9 -21
  546. package/src/prover/zenon/isar.ts +37 -67
  547. package/src/prover/zenon/limits.ts +0 -4
  548. package/src/prover/zenon/llproof.ts +2 -22
  549. package/src/prover/zenon/mltoll.ts +66 -106
  550. package/src/prover/zenon/node.ts +20 -15
  551. package/src/prover/zenon/ocaml.ts +1 -17
  552. package/src/prover/zenon/parse.ts +9 -13
  553. package/src/prover/zenon/phrase.ts +2 -14
  554. package/src/prover/zenon/proof.ts +0 -11
  555. package/src/prover/zenon/propositional-rules.ts +0 -7
  556. package/src/prover/zenon/rules.ts +3 -8
  557. package/src/prover/zenon/search.ts +11 -35
  558. package/src/prover/zenon/tla/functions.ts +59 -33
  559. package/src/prover/zenon/tla/llproof.ts +67 -78
  560. package/src/prover/zenon/tla/records.ts +57 -35
  561. package/src/prover/zenon/tla/rewrites.ts +12 -21
  562. package/src/prover/zenon/tla/sets.ts +88 -59
  563. package/src/prover/zenon/tla/terms.ts +0 -8
  564. package/src/prover/zenon/tla/tla.ts +66 -66
  565. package/src/randomization.ts +81 -35
  566. package/src/resolve.ts +1132 -430
  567. package/src/runtime.ts +33 -23
  568. package/src/sany/builtins.ts +11 -14
  569. package/src/sany/generation.ts +383 -0
  570. package/src/sany/generator-def-entries.ts +210 -0
  571. package/src/sany/generator-definitions.ts +688 -0
  572. package/src/sany/generator-expressions.ts +1108 -0
  573. package/src/sany/generator-proofs.ts +665 -0
  574. package/src/sany/generator.ts +192 -2764
  575. package/src/sany/levels.ts +5 -35
  576. package/src/sany/lexer.ts +61 -80
  577. package/src/sany/linter.ts +0 -10
  578. package/src/sany/modules.ts +5 -7
  579. package/src/sany/nodes.ts +6 -44
  580. package/src/sany/parse-error.ts +39 -117
  581. package/src/sany/report.ts +32 -69
  582. package/src/sany/selectors.ts +60 -82
  583. package/src/sany/source.ts +1 -17
  584. package/src/sany/xml.ts +37 -120
  585. package/src/search.ts +913 -227
  586. package/src/simulate.ts +765 -0
  587. package/src/spec-description.ts +198 -104
  588. package/src/standard-definitions.ts +4 -4
  589. package/src/standard-modules.ts +302 -99
  590. package/src/state-graph.ts +52 -33
  591. package/src/subexpressions.ts +578 -166
  592. package/src/substitution-levels.ts +7 -7
  593. package/src/successors.ts +296 -105
  594. package/src/symmetry.ts +37 -28
  595. package/src/tableau.ts +29 -26
  596. package/src/tlc/fingerprint.ts +267 -79
  597. package/src/tlc/jar-data.ts +122 -6
  598. package/src/tlc/messages.ts +127 -56
  599. package/src/tlc/order.ts +53 -72
  600. package/src/tlc/random.ts +38 -49
  601. package/src/tlc/replay.ts +579 -230
  602. package/src/tlc/summary.ts +64 -60
  603. package/src/tlc/tlc-operators.ts +83 -47
  604. package/src/tlc/tlcext-operators.ts +205 -127
  605. package/src/tlc/trace-spec.ts +235 -0
  606. package/src/tlc/value-stream.ts +139 -0
  607. package/src/tlc/version.ts +1 -4
  608. package/src/trace-liveness.ts +529 -0
  609. package/src/transfer.ts +22 -25
  610. package/src/typed-tier.ts +6556 -0
  611. package/src/typescript/actions.ts +10 -25
  612. package/src/typescript/collections.ts +34 -35
  613. package/src/typescript/compile.ts +1 -8
  614. package/src/typescript/context.ts +0 -12
  615. package/src/typescript/emit.ts +0 -1
  616. package/src/typescript/expressions.ts +0 -12
  617. package/src/typescript/formula.ts +9 -15
  618. package/src/typescript/functions.ts +6 -17
  619. package/src/typescript/model.ts +14 -16
  620. package/src/typescript/names.ts +0 -2
  621. package/src/typescript/program.ts +0 -3
  622. package/src/typescript/properties.ts +6 -8
  623. package/src/typescript/scope.ts +0 -5
  624. package/src/typescript/steps.ts +20 -28
  625. package/src/typescript/types.ts +3 -10
  626. package/src/values.ts +917 -522
  627. package/src/worker.ts +7 -8
  628. package/src/prover/isabelle/isar/statement.ts +0 -57
  629. package/src/prover/smt/solver/z3-license.txt +0 -10
  630. package/src/prover/tlaps-module.ts +0 -510
  631. package/src/prover/zenon/LICENSE +0 -32
@@ -1,8 +1,3 @@
1
- // Ported from Z3 (src/math/lp/random_updater_def.h, and shift_var and
2
- // get_freedom_interval_for_column in src/math/lp/int_solver.cpp), MIT license, see
3
- // z3-license.txt. Moves non-basic columns to random values inside the interval that keeps every
4
- // row feasible, so that columns with equal values, which theory combination would assume equal,
5
- // become different.
6
1
  import { getLcm, Rational } from "../rational";
7
2
  import { IndexedUintSet } from "./containers";
8
3
  import type { LarSolver } from "./lar-solver";
@@ -16,8 +11,6 @@ interface FreedomInterval {
16
11
  multiple: Rational;
17
12
  }
18
13
 
19
- // get_freedom_interval_for_column: the values of a non-basic column that keep the basic columns
20
- // that depend on it within their bounds.
21
14
  const getFreedomInterval = (solver: LarSolver, column: number): FreedomInterval | undefined => {
22
15
  const core = solver.core;
23
16
  if (core.isBase(column) || solver.isFixed(column)) return undefined;
@@ -68,7 +61,6 @@ const getFreedomInterval = (solver: LarSolver, column: number): FreedomInterval
68
61
  return { lower: shiftedLower, upper: shiftedUpper, multiple: Rational.of(multiple) };
69
62
  };
70
63
 
71
- // int_solver::shift_var.
72
64
  const shiftVar = (solver: LarSolver, column: number) => {
73
65
  if (solver.isFixed(column) || solver.isBase(column) || solver.settings.isCanceled()) return false;
74
66
  const interval = getFreedomInterval(solver, column);
@@ -114,7 +106,6 @@ const shiftVar = (solver: LarSolver, column: number) => {
114
106
  return true;
115
107
  };
116
108
 
117
- // random_updater::update over the given columns.
118
109
  export const randomUpdate = (solver: LarSolver, columns: number[]) => {
119
110
  const varSet = new IndexedUintSet();
120
111
  for (const column of columns) varSet.add(column);
@@ -1,7 +1,3 @@
1
- // Ported from Z3 (src/math/lp/static_matrix.h, src/math/lp/static_matrix_def.h), MIT license, see
2
- // z3-license.txt. The sparse tableau: every row cell knows the offset of its column cell and back,
3
- // and cells are removed by moving the last cell of the strip into their place, so the order of
4
- // the cells is Z3's.
5
1
  import { Rational } from "../rational";
6
2
  import type { LarTerm } from "./lar-term";
7
3
 
@@ -14,6 +10,11 @@ export interface RowCell {
14
10
  coeff: Rational;
15
11
  }
16
12
 
13
+ interface CoeffCell {
14
+ column: number;
15
+ coeff: Rational;
16
+ }
17
+
17
18
  interface ColumnCell {
18
19
  row: number;
19
20
  offset: number;
@@ -60,8 +61,7 @@ export class StaticMatrix {
60
61
  this.rowOffsets = [];
61
62
  }
62
63
 
63
- // set: appends a nonzero cell to the row and to the column.
64
- set(row: number, column: number, coeff: Rational) {
64
+ private set(row: number, column: number, coeff: Rational) {
65
65
  if (coeff.isZero()) return;
66
66
  this.addNewElement(row, column, coeff);
67
67
  }
@@ -96,8 +96,6 @@ export class StaticMatrix {
96
96
  this.rowOffsets[rowCells[index].column] = index;
97
97
  }
98
98
 
99
- // pivot_row_to_row_given_cell: eliminates the pivot column from the row of the cell by adding a
100
- // multiple of the pivot row.
101
99
  pivotRowToRowGivenCell(pivotRow: number, cell: ColumnCell, pivotColumn: number) {
102
100
  const target = cell.row;
103
101
  const targetCells = this.rows[target];
@@ -135,13 +133,10 @@ export class StaticMatrix {
135
133
  for (const cell of this.rows[row]) cell.coeff = cell.coeff.div(alpha);
136
134
  }
137
135
 
138
- // add_rows: adds row from multiplied by alpha to row to.
139
136
  addRows(alpha: Rational, from: number, to: number) {
140
137
  this.addCellsToRow(to, this.rows[from], alpha, -1);
141
138
  }
142
139
 
143
- // pivot_row_to_row_given_cell_with_sign: eliminates the pivot column from the row of the cell by
144
- // adding the pivot row times the sign.
145
140
  pivotRowToRowGivenCellWithSign(
146
141
  pivotRow: number,
147
142
  cell: ColumnCell,
@@ -151,19 +146,17 @@ export class StaticMatrix {
151
146
  this.pivotCellsToRow(this.rows[pivotRow], cell, pivotColumn, sign);
152
147
  }
153
148
 
154
- // pivot_term_to_row_given_cell: the same with the cells of a term in place of the pivot row.
155
149
  pivotTermToRowGivenCell(term: LarTerm, cell: ColumnCell, pivotColumn: number, sign: number) {
156
150
  this.pivotCellsToRow(getTermCells(term), cell, pivotColumn, sign);
157
151
  }
158
152
 
159
- // add_term_to_row: adds the term multiplied by alpha to the row.
160
153
  addTermToRow(alpha: Rational, term: LarTerm, row: number) {
161
154
  for (const entry of term.coeffs) this.addColumnsUpTo(entry[0]);
162
155
  this.addCellsToRow(row, getTermCells(term), alpha, -1);
163
156
  }
164
157
 
165
158
  private pivotCellsToRow(
166
- cells: readonly { column: number; coeff: Rational }[],
159
+ cells: readonly CoeffCell[],
167
160
  cell: ColumnCell,
168
161
  pivotColumn: number,
169
162
  sign: number,
@@ -175,11 +168,9 @@ export class StaticMatrix {
175
168
  this.addCellsToRow(target, cells, alpha, pivotColumn);
176
169
  }
177
170
 
178
- // The cells times alpha added to the row, skipping a column, and the cells that cancel removed
179
- // from the end.
180
171
  private addCellsToRow(
181
172
  row: number,
182
- cells: readonly { column: number; coeff: Rational }[],
173
+ cells: readonly CoeffCell[],
183
174
  alpha: Rational,
184
175
  skippedColumn: number,
185
176
  ) {
@@ -206,8 +197,6 @@ export class StaticMatrix {
206
197
  for (const cell of this.rows[second]) this.columns[cell.column][cell.offset].row = second;
207
198
  }
208
199
 
209
- // fill_last_row_with_pivoting: the row of a new basic column for a term, with the basic columns
210
- // of the term substituted by their rows.
211
200
  fillLastRowWithPivoting(term: LarTerm, basic: number, basisHeading: number[]) {
212
201
  const work: Rational[] = [];
213
202
  const index: number[] = [];
@@ -1,6 +1,3 @@
1
- // Ported from Z3 (src/util/trail.h, src/util/union_find.h), MIT license, see z3-license.txt. A
2
- // scoped undo trail, and the union-find over it whose merges a pop undoes, which nla's variable
3
- // equivalences and monomial congruence classes use.
4
1
  import { shrink } from "../array";
5
2
 
6
3
  export class TrailStack {
@@ -23,7 +20,10 @@ export class TrailStack {
23
20
  }
24
21
  }
25
22
 
26
- // The handlers of union_find's context: r2 becomes the root of r1's class.
23
+ interface UnionFindTrail {
24
+ push(undo: () => void): void;
25
+ }
26
+
27
27
  export interface UnionFindHandler {
28
28
  mergeEh?: (r2: number, r1: number, v2: number, v1: number) => void;
29
29
  afterMergeEh?: (r2: number, r1: number, v2: number, v1: number) => void;
@@ -37,7 +37,7 @@ export class UnionFind {
37
37
 
38
38
  handler: UnionFindHandler = {};
39
39
 
40
- constructor(private trail: TrailStack) {}
40
+ constructor(private trail: UnionFindTrail) {}
41
41
 
42
42
  get numVars() {
43
43
  return this.finds.length;
@@ -0,0 +1,530 @@
1
+ import {
2
+ FAMILY_USER,
3
+ KIND_APP,
4
+ KIND_QUANTIFIER,
5
+ OP_ADD,
6
+ OP_ARRAY_MAP,
7
+ OP_AS_ARRAY,
8
+ OP_EQ,
9
+ OP_GE,
10
+ OP_ITE,
11
+ OP_LE,
12
+ OP_NOT,
13
+ SORT_BOOL,
14
+ type AstManager,
15
+ QUANTIFIER_FORALL,
16
+ } from "./ast";
17
+ import { isAppOf } from "./ast-util";
18
+ import { getSubterms } from "./recfun-decl-plugin";
19
+ import { type Dependency, type Goal, joinDependencies } from "./goal";
20
+ import { isMacroHead, normalizeMacroDef, setElseInterp } from "./model-macro-solver";
21
+ import type { ProtoModel } from "./proto-model";
22
+ import { Rational } from "./rational";
23
+ import { RefVector } from "./ref-vector";
24
+ import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
25
+ import { RewriterTpl } from "./rewriter-tpl";
26
+ import { VarSubst } from "./var-subst";
27
+
28
+ interface MacroScope {
29
+ numDecls: number;
30
+ numForbidden: number;
31
+ }
32
+
33
+ interface HeadDef {
34
+ head: number;
35
+ def: number;
36
+ }
37
+
38
+ interface JustifiedForms {
39
+ forms: RefVector;
40
+ dependencies: (Dependency | undefined)[];
41
+ }
42
+
43
+ interface PseudoHead {
44
+ head: number;
45
+ value: number;
46
+ }
47
+
48
+ const isForall = (manager: AstManager, expr: number) =>
49
+ manager.kinds[expr] === KIND_QUANTIFIER && manager.getQuantifier(expr).kind === QUANTIFIER_FORALL;
50
+
51
+ const collectUserDecls = (manager: AstManager, expr: number, decls: Set<number>) => {
52
+ const visited = new Set<number>();
53
+ const todo = [expr];
54
+ for (let current = todo.pop(); current !== undefined; current = todo.pop()) {
55
+ if (visited.has(current)) continue;
56
+ visited.add(current);
57
+ if (manager.kinds[current] === KIND_QUANTIFIER) {
58
+ const data = manager.getQuantifier(current);
59
+ todo.push(data.body, ...data.patterns, ...data.noPatterns);
60
+ continue;
61
+ }
62
+ if (manager.kinds[current] !== KIND_APP || manager.getNumArgs(current) === 0) continue;
63
+ const decl = manager.decls[current];
64
+ if (manager.funcDecls[decl].family === FAMILY_USER) decls.add(decl);
65
+ todo.push(...manager.getArgs(current));
66
+ }
67
+ };
68
+
69
+ // The definition comes with a reference, which the caller releases.
70
+ const getHeadDef = (manager: AstManager, quantifier: number, decl: number): HeadDef => {
71
+ const body = manager.getQuantifier(quantifier).body;
72
+ const isNegated = isAppOf(manager, body, OP_NOT);
73
+ const eq = isNegated ? manager.getArg(body, 0) : body;
74
+ const lhs = manager.getArg(eq, 0);
75
+ const rhs = manager.getArg(eq, 1);
76
+ const isLeft = manager.kinds[lhs] === KIND_APP && manager.decls[lhs] === decl;
77
+ const side = isLeft ? rhs : lhs;
78
+ const def = isNegated ? manager.mkApp(OP_NOT, [side], SORT_BOOL) : side;
79
+ manager.incRef(def);
80
+ return { head: isLeft ? lhs : rhs, def };
81
+ };
82
+
83
+ class MacroExpander extends RewriterTpl {
84
+ readonly trail: RefVector;
85
+ private subst: VarSubst;
86
+ usedDependencies: Dependency | undefined;
87
+
88
+ constructor(
89
+ manager: AstManager,
90
+ private macros: MacroManager,
91
+ ) {
92
+ super(manager);
93
+ this.trail = new RefVector(manager);
94
+ this.subst = new VarSubst(manager, true);
95
+ }
96
+
97
+ isRewritingPatterns() {
98
+ return false;
99
+ }
100
+
101
+ getSubst(expr: number) {
102
+ const manager = this.manager;
103
+ if (manager.kinds[expr] !== KIND_APP) return undefined;
104
+ const decl = manager.decls[expr];
105
+ const quantifier = this.macros.getMacro(decl);
106
+ if (quantifier === undefined) {
107
+ const op = manager.getOp(expr);
108
+ if (op !== OP_AS_ARRAY && op !== OP_ARRAY_MAP) return undefined;
109
+ const target = manager.funcDecls[decl].parameters[0];
110
+ if (this.macros.getMacro(target) !== undefined) this.macros.unsafe.add(target);
111
+ return undefined;
112
+ }
113
+ const headDef = getHeadDef(manager, quantifier, decl);
114
+ const numArgs = manager.getNumArgs(expr);
115
+ const args = Array.from({ length: numArgs }, () => -1);
116
+ for (let index = 0; index < numArgs; index++)
117
+ args[numArgs - manager.values[manager.getArg(headDef.head, index)] - 1] = manager.getArg(
118
+ expr,
119
+ index,
120
+ );
121
+ const result = this.subst.apply(headDef.def, args);
122
+ this.trail.pushOwned(result);
123
+ manager.decRef(headDef.def);
124
+ this.usedDependencies = joinDependencies(
125
+ this.usedDependencies,
126
+ this.macros.getMacroDependency(decl),
127
+ );
128
+ return result;
129
+ }
130
+
131
+ release() {
132
+ super.release();
133
+ this.subst.release();
134
+ this.trail.reset();
135
+ }
136
+ }
137
+
138
+ export class MacroManager {
139
+ private decls: number[] = [];
140
+ private macros: number[] = [];
141
+ private decl2macro = new Map<number, number>();
142
+ private decl2dependency = new Map<number, Dependency | undefined>();
143
+ private deps = new Map<number, Set<number>>();
144
+ private forbidden = new Set<number>();
145
+ private forbiddenTrail: number[] = [];
146
+ private scopes: MacroScope[] = [];
147
+ readonly unsafe = new Set<number>();
148
+
149
+ constructor(private manager: AstManager) {}
150
+
151
+ hasMacros() {
152
+ return this.decls.length > 0;
153
+ }
154
+
155
+ getMacro(decl: number) {
156
+ return this.decl2macro.get(decl);
157
+ }
158
+
159
+ getMacroDependency(decl: number) {
160
+ return this.decl2dependency.get(decl);
161
+ }
162
+
163
+ pushScope() {
164
+ this.scopes.push({ numDecls: this.decls.length, numForbidden: this.forbiddenTrail.length });
165
+ }
166
+
167
+ popScope() {
168
+ const scope = this.scopes.pop();
169
+ if (scope === undefined) return;
170
+ for (const decl of this.decls.splice(scope.numDecls)) {
171
+ this.deps.delete(decl);
172
+ this.decl2macro.delete(decl);
173
+ this.decl2dependency.delete(decl);
174
+ }
175
+ for (const quantifier of this.macros.splice(scope.numDecls)) this.manager.decRef(quantifier);
176
+ for (const decl of this.forbiddenTrail.splice(scope.numForbidden)) this.forbidden.delete(decl);
177
+ }
178
+
179
+ markForbidden(formulas: number[]) {
180
+ const decls = new Set<number>();
181
+ for (const formula of formulas) collectUserDecls(this.manager, formula, decls);
182
+ for (const decl of decls) {
183
+ if (this.forbidden.has(decl)) continue;
184
+ this.forbidden.add(decl);
185
+ this.forbiddenTrail.push(decl);
186
+ }
187
+ }
188
+
189
+ release() {
190
+ for (const quantifier of this.macros) this.manager.decRef(quantifier);
191
+ }
192
+
193
+ registerInterpretations(model: ProtoModel) {
194
+ for (const [index, decl] of this.decls.entries()) {
195
+ const def = this.getInterpretation(index);
196
+ setElseInterp(this.manager, model, decl, def);
197
+ this.manager.decRef(def);
198
+ }
199
+ }
200
+
201
+ find(formulas: number[]) {
202
+ this.unsafe.clear();
203
+ const current = this.expandRounds(formulas, [], Infinity).forms;
204
+ for (const [index, decl] of this.decls.entries())
205
+ if (this.unsafe.has(decl)) current.push(this.macros[index]);
206
+ this.unsafe.clear();
207
+ return current;
208
+ }
209
+
210
+ // The tactic stops after one round per formula, and keeps unsafe macros out of the result.
211
+ findInGoal(formulas: number[], dependencies: (Dependency | undefined)[]) {
212
+ return this.expandRounds(formulas, dependencies, formulas.length);
213
+ }
214
+
215
+ // The definitions come with a reference, which the caller releases.
216
+ getInterpretations() {
217
+ return this.decls.map((decl, index) => ({ decl, def: this.getInterpretation(index) }));
218
+ }
219
+
220
+ private getInterpretation(index: number) {
221
+ const manager = this.manager;
222
+ return manager.withTemporaries(
223
+ () => {
224
+ const headDef = getHeadDef(manager, this.macros[index], this.decls[index]);
225
+ const def = normalizeMacroDef(manager, headDef.head, headDef.def);
226
+ manager.incRef(def);
227
+ manager.decRef(headDef.def);
228
+ return def;
229
+ },
230
+ () => [],
231
+ );
232
+ }
233
+
234
+ private expandRounds(
235
+ formulas: number[],
236
+ dependencies: (Dependency | undefined)[],
237
+ maxRounds: number,
238
+ ) {
239
+ let current: JustifiedForms = { forms: new RefVector(this.manager), dependencies: [] };
240
+ let isFound = this.expandFormulas(formulas, dependencies, current);
241
+ for (let round = 0; isFound && round < maxRounds; round++) {
242
+ const next = { forms: new RefVector(this.manager), dependencies: [] };
243
+ isFound = this.expandFormulas(current.forms.items, current.dependencies, next);
244
+ current.forms.reset();
245
+ current = next;
246
+ }
247
+ return current;
248
+ }
249
+
250
+ private expandFormulas(
251
+ formulas: number[],
252
+ dependencies: (Dependency | undefined)[],
253
+ result: JustifiedForms,
254
+ ) {
255
+ const manager = this.manager;
256
+ let isFound = false;
257
+ for (const [index, formula] of formulas.entries()) {
258
+ const expanded = this.expandJustified(formula, dependencies[index]);
259
+ if (
260
+ this.insertSimpleMacro(expanded.expr, expanded.dependency) ||
261
+ this.findArithMacro(expanded.expr, expanded.dependency, result) ||
262
+ this.findPseudoPredicateMacro(expanded.expr, expanded.dependency, result)
263
+ )
264
+ isFound = true;
265
+ else {
266
+ result.forms.push(expanded.expr);
267
+ result.dependencies.push(expanded.dependency);
268
+ }
269
+ manager.decRef(expanded.expr);
270
+ }
271
+ return isFound;
272
+ }
273
+
274
+ // The result comes with a reference, which the caller releases.
275
+ expand(expr: number) {
276
+ return this.expandJustified(expr, undefined).expr;
277
+ }
278
+
279
+ private expandJustified(expr: number, dependency: Dependency | undefined) {
280
+ const manager = this.manager;
281
+ manager.incRef(expr);
282
+ if (!this.hasMacros()) return { expr, dependency };
283
+ let current = expr;
284
+ let currentDependency = dependency;
285
+ for (;;) {
286
+ const expander = new MacroExpander(manager, this);
287
+ const result = expander.rewrite(current);
288
+ currentDependency = joinDependencies(currentDependency, expander.usedDependencies);
289
+ const isChanged = result !== current;
290
+ manager.decRef(current);
291
+ current = result;
292
+ expander.release();
293
+ if (!isChanged)
294
+ return {
295
+ expr: current === expr ? current : this.simplify(current),
296
+ dependency: currentDependency,
297
+ };
298
+ }
299
+ }
300
+
301
+ private simplify(expr: number) {
302
+ const rewriter = new Rewriter(this.manager, TACTIC_REWRITER_OPTIONS);
303
+ const result = rewriter.rewrite(expr);
304
+ this.manager.decRef(expr);
305
+ rewriter.release();
306
+ return result;
307
+ }
308
+
309
+ insert(decl: number, quantifier: number, dependency?: Dependency) {
310
+ const manager = this.manager;
311
+ if (this.decl2macro.has(decl)) return false;
312
+ // The recfun theory unfolds a recursive definition, which the expansion of the macro does not
313
+ // reach.
314
+ for (const def of manager.recFunDefs.values())
315
+ if (
316
+ !def.isMacro &&
317
+ def.rhs !== -1 &&
318
+ getSubterms(manager, def.rhs).some(
319
+ (term) => manager.kinds[term] === KIND_APP && manager.decls[term] === decl,
320
+ )
321
+ )
322
+ return false;
323
+ const headDef = getHeadDef(manager, quantifier, decl);
324
+ const deps = new Set<number>();
325
+ collectUserDecls(manager, headDef.def, deps);
326
+ manager.decRef(headDef.def);
327
+ if (this.isReaching(deps, decl)) return false;
328
+ this.deps.set(decl, deps);
329
+ manager.incRef(quantifier);
330
+ this.decl2macro.set(decl, quantifier);
331
+ this.decl2dependency.set(decl, dependency);
332
+ this.decls.push(decl);
333
+ this.macros.push(quantifier);
334
+ return true;
335
+ }
336
+
337
+ private isReaching(deps: Set<number>, target: number) {
338
+ const visited = new Set<number>();
339
+ const todo = [...deps];
340
+ for (let decl = todo.pop(); decl !== undefined; decl = todo.pop()) {
341
+ if (decl === target) return true;
342
+ if (visited.has(decl)) continue;
343
+ visited.add(decl);
344
+ todo.push(...(this.deps.get(decl) ?? []));
345
+ }
346
+ return false;
347
+ }
348
+
349
+ private isHead(expr: number, numDecls: number, other: number) {
350
+ const manager = this.manager;
351
+ return (
352
+ isMacroHead(manager, expr, numDecls) &&
353
+ !this.forbidden.has(manager.decls[expr]) &&
354
+ !manager.isOccurring(manager.decls[expr], other)
355
+ );
356
+ }
357
+
358
+ private insertSimpleMacro(expr: number, dependency: Dependency | undefined) {
359
+ const manager = this.manager;
360
+ if (!isForall(manager, expr)) return false;
361
+ const data = manager.getQuantifier(expr);
362
+ const numDecls = data.sorts.length;
363
+ const isNegatedBoolEq =
364
+ isAppOf(manager, data.body, OP_NOT) &&
365
+ isAppOf(manager, manager.getArg(data.body, 0), OP_EQ) &&
366
+ manager.isBool(manager.getArg(manager.getArg(data.body, 0), 0));
367
+ const eq = isNegatedBoolEq ? manager.getArg(data.body, 0) : data.body;
368
+ if (!isAppOf(manager, eq, OP_EQ)) return false;
369
+ const lhs = manager.getArg(eq, 0);
370
+ const rhs = manager.getArg(eq, 1);
371
+ const head = this.isHead(lhs, numDecls, rhs)
372
+ ? lhs
373
+ : this.isHead(rhs, numDecls, lhs)
374
+ ? rhs
375
+ : undefined;
376
+ return head !== undefined && this.insert(manager.decls[head], expr, dependency);
377
+ }
378
+
379
+ private isArithHead(expr: number, numDecls: number, poly: number, exception: number) {
380
+ const manager = this.manager;
381
+ if (!isMacroHead(manager, expr, numDecls) || this.forbidden.has(manager.decls[expr]))
382
+ return false;
383
+ const decl = manager.decls[expr];
384
+ return manager
385
+ .getArgs(poly)
386
+ .every((arg) => arg === exception || !manager.isOccurring(decl, arg));
387
+ }
388
+
389
+ private findArithMacro(expr: number, dependency: Dependency | undefined, result: JustifiedForms) {
390
+ const manager = this.manager;
391
+ if (!isForall(manager, expr)) return false;
392
+ const data = manager.getQuantifier(expr);
393
+ const body = data.body;
394
+ const op = manager.kinds[body] === KIND_APP ? manager.getOp(body) : -1;
395
+ if (op !== OP_LE && op !== OP_GE && op !== OP_EQ) return false;
396
+ const lhs = manager.getArg(body, 0);
397
+ const rhs = manager.getArg(body, 1);
398
+ if (!isAppOf(manager, lhs, OP_ADD) || !manager.isNumeral(rhs)) return false;
399
+ const numDecls = data.sorts.length;
400
+ let head: number | undefined;
401
+ let isInverted = false;
402
+ const rest: number[] = [];
403
+ for (const arg of manager.getArgs(lhs)) {
404
+ const negated = manager.getTimesMinusOneArg(arg);
405
+ if (head === undefined && this.isArithHead(arg, numDecls, lhs, arg)) head = arg;
406
+ else if (
407
+ head === undefined &&
408
+ negated !== undefined &&
409
+ this.isArithHead(negated, numDecls, lhs, arg)
410
+ ) {
411
+ head = negated;
412
+ isInverted = true;
413
+ } else rest.push(arg);
414
+ }
415
+ if (head === undefined) return false;
416
+ const macroHead = head;
417
+ return manager.withTemporaries(
418
+ () => {
419
+ const sort = manager.sorts[lhs];
420
+ const sum = rest.length === 1 ? rest[0] : manager.mkApp(OP_ADD, rest, sort);
421
+ const rewriter = new Rewriter(manager, TACTIC_REWRITER_OPTIONS);
422
+ const def = isInverted ? rewriter.mkSub(sum, rhs) : rewriter.mkSub(rhs, sum);
423
+ rewriter.release();
424
+ const decl = manager.decls[macroHead];
425
+ const funcDecl = manager.funcDecls[decl];
426
+ if (this.decl2macro.has(decl) || funcDecl.isSkolem) return false;
427
+ const newOp = !isInverted || op === OP_EQ ? op : op === OP_LE ? OP_GE : OP_LE;
428
+ const macro = manager.mkQuantifier({
429
+ ...data,
430
+ body: manager.mkApp(newOp, [macroHead, def], SORT_BOOL),
431
+ });
432
+ if (op === OP_EQ) return this.insert(decl, macro, dependency);
433
+ const fresh = manager.mkFreshFuncDecl(funcDecl.name, funcDecl.domain, funcDecl.range);
434
+ const freshApp = manager.mkApp(fresh, manager.getArgs(macroHead), funcDecl.range);
435
+ const macroData = manager.getQuantifier(macro);
436
+ result.forms.push(
437
+ manager.mkQuantifier({
438
+ ...macroData,
439
+ body: manager.mkEq(macroHead, manager.mkApp(OP_ADD, [def, freshApp], sort)),
440
+ }),
441
+ );
442
+ result.forms.push(
443
+ manager.mkQuantifier({
444
+ ...macroData,
445
+ body: manager.mkApp(
446
+ newOp,
447
+ [freshApp, manager.mkNumeralOfSort(Rational.zero, funcDecl.range)],
448
+ SORT_BOOL,
449
+ ),
450
+ patterns: [manager.mkPattern([freshApp])],
451
+ }),
452
+ );
453
+ result.dependencies.push(dependency, dependency);
454
+ return true;
455
+ },
456
+ () => [],
457
+ );
458
+ }
459
+
460
+ private getPseudoHead(expr: number, numDecls: number): PseudoHead | undefined {
461
+ const manager = this.manager;
462
+ if (!isAppOf(manager, expr, OP_EQ)) return undefined;
463
+ const lhs = manager.getArg(expr, 0);
464
+ const rhs = manager.getArg(expr, 1);
465
+ if (!manager.isGroundApp(lhs) && !manager.isGroundApp(rhs)) return undefined;
466
+ const sort = manager.sorts[lhs];
467
+ if (manager.isUninterpretedSort(sort) || manager.getSortSize(sort) === 1n) return undefined;
468
+ if (isMacroHead(manager, lhs, numDecls)) return { head: lhs, value: rhs };
469
+ if (isMacroHead(manager, rhs, numDecls)) return { head: rhs, value: lhs };
470
+ return undefined;
471
+ }
472
+
473
+ private findPseudoPredicateMacro(
474
+ expr: number,
475
+ dependency: Dependency | undefined,
476
+ result: JustifiedForms,
477
+ ) {
478
+ const manager = this.manager;
479
+ if (!isForall(manager, expr)) return false;
480
+ const data = manager.getQuantifier(expr);
481
+ const body = data.body;
482
+ if (!isAppOf(manager, body, OP_EQ) || !manager.isBool(manager.getArg(body, 0))) return false;
483
+ const numDecls = data.sorts.length;
484
+ const getMacro = (side: number, other: number) => {
485
+ const pseudo = this.getPseudoHead(side, numDecls);
486
+ if (pseudo === undefined) return undefined;
487
+ const decl = manager.decls[pseudo.head];
488
+ return this.forbidden.has(decl) || manager.isOccurring(decl, other) ? undefined : pseudo;
489
+ };
490
+ const lhs = manager.getArg(body, 0);
491
+ const rhs = manager.getArg(body, 1);
492
+ const fromLhs = getMacro(lhs, rhs);
493
+ const pseudo = fromLhs ?? getMacro(rhs, lhs);
494
+ if (pseudo === undefined) return false;
495
+ const def = fromLhs === undefined ? lhs : rhs;
496
+ manager.withTemporaries(
497
+ () => {
498
+ const funcDecl = manager.funcDecls[manager.decls[pseudo.head]];
499
+ const fresh = manager.mkFreshFuncDecl(funcDecl.name, funcDecl.domain, funcDecl.range);
500
+ const freshApp = manager.mkApp(fresh, manager.getArgs(pseudo.head), funcDecl.range);
501
+ const ite = manager.mkApp(OP_ITE, [def, pseudo.value, freshApp], funcDecl.range);
502
+ result.forms.push(manager.mkQuantifier({ ...data, body: manager.mkEq(pseudo.head, ite) }));
503
+ result.forms.push(
504
+ manager.mkQuantifier({
505
+ ...data,
506
+ body: manager.mkApp(OP_NOT, [manager.mkEq(freshApp, pseudo.value)], SORT_BOOL),
507
+ patterns: [manager.mkPattern([freshApp])],
508
+ }),
509
+ );
510
+ result.dependencies.push(dependency, dependency);
511
+ },
512
+ () => [],
513
+ );
514
+ return true;
515
+ }
516
+ }
517
+
518
+ export const findGoalMacros = (manager: AstManager, goal: Goal) => {
519
+ const macros = new MacroManager(manager);
520
+ const found = macros.findInGoal([...goal.forms.items], goal.dependencies);
521
+ goal.reset();
522
+ for (const [index, form] of found.forms.items.entries())
523
+ goal.assert(form, found.dependencies[index]);
524
+ found.forms.reset();
525
+ const definitions = macros.getInterpretations();
526
+ goal.addDefinitions(definitions);
527
+ for (const definition of definitions) manager.decRef(definition.def);
528
+ macros.release();
529
+ goal.depth++;
530
+ };