tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.1ebc153bd

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 (530) hide show
  1. package/dist/compile.cjs +3 -3
  2. package/dist/compile.js +1 -1
  3. package/dist/deciders.cjs +37 -36
  4. package/dist/deciders.js +38 -37
  5. package/dist/index.cjs +1 -1
  6. package/dist/index.d.cts +5 -1
  7. package/dist/index.d.ts +5 -1
  8. package/dist/index.js +1 -1
  9. package/dist/parallel-worker.cjs +1 -1
  10. package/dist/parallel-worker.js +1 -1
  11. package/dist/prove-worker.cjs +1 -1
  12. package/dist/prove-worker.js +1 -1
  13. package/dist/prove.cjs +146 -58
  14. package/dist/prove.js +145 -57
  15. package/dist/run.cjs +43 -43
  16. package/dist/run.js +45 -45
  17. package/dist/tlapm.cjs +1 -1
  18. package/dist/tlapm.js +2 -2
  19. package/dist/transfer.cjs +40 -37
  20. package/dist/transfer.js +38 -35
  21. package/dist/worker.cjs +6 -6
  22. package/dist/worker.js +6 -6
  23. package/package.json +1 -1
  24. package/src/ast.ts +4 -3
  25. package/src/bags.ts +46 -28
  26. package/src/check-trace.ts +2 -16
  27. package/src/check.ts +349 -91
  28. package/src/cli/runtime-invariants.ts +20 -56
  29. package/src/cli/tlapm.ts +268 -71
  30. package/src/cli/tlc-arguments.ts +2 -2
  31. package/src/cli/tlc-output.ts +4 -5
  32. package/src/cli/tlc-usage.ts +0 -1
  33. package/src/cli/tlc.ts +26 -7
  34. package/src/cli/xml-exporter.ts +1 -1
  35. package/src/codegen.ts +9 -5
  36. package/src/dependencies.ts +72 -11
  37. package/src/dfid.ts +9 -2
  38. package/src/environment.ts +65 -36
  39. package/src/errors.ts +8 -1
  40. package/src/evaluate.ts +92 -32
  41. package/src/exit-codes.ts +5 -2
  42. package/src/instances.ts +5 -5
  43. package/src/java-overrides.ts +2 -2
  44. package/src/levels.ts +138 -90
  45. package/src/liveness-checker.ts +572 -204
  46. package/src/liveness.ts +47 -32
  47. package/src/obligations/action.ts +0 -2
  48. package/src/obligations/anonymize.ts +2 -6
  49. package/src/obligations/equality.ts +0 -2
  50. package/src/obligations/expression.ts +0 -2
  51. package/src/obligations/format.ts +0 -2
  52. package/src/obligations/generate.ts +0 -2
  53. package/src/obligations/index.ts +9 -8
  54. package/src/obligations/levels.ts +0 -2
  55. package/src/obligations/module.ts +0 -2
  56. package/src/obligations/normalize.ts +1 -6
  57. package/src/obligations/operators.ts +0 -2
  58. package/src/obligations/pragma.ts +2 -2
  59. package/src/obligations/printer.ts +5 -7
  60. package/src/obligations/proof.ts +0 -2
  61. package/src/obligations/regroup.ts +0 -2
  62. package/src/obligations/simplify.ts +0 -2
  63. package/src/obligations/subexpression.ts +1 -4
  64. package/src/obligations/substitution.ts +0 -2
  65. package/src/obligations/temporal.ts +0 -2
  66. package/src/obligations/tuples.ts +0 -2
  67. package/src/parallel-worker.ts +8 -2
  68. package/src/parallel.ts +7 -2
  69. package/src/parser.ts +256 -185
  70. package/src/pretty-print.ts +1 -1
  71. package/src/prover/deciders.ts +1 -8
  72. package/src/prover/isabelle/encode.ts +0 -2
  73. package/src/prover/isabelle/isar/attrib.ts +86 -55
  74. package/src/prover/isabelle/isar/context.ts +25 -26
  75. package/src/prover/isabelle/isar/induct.ts +2 -12
  76. package/src/prover/isabelle/isar/method.ts +6 -10
  77. package/src/prover/isabelle/isar/proof.ts +40 -39
  78. package/src/prover/isabelle/isar/rule-cases.ts +14 -22
  79. package/src/prover/isabelle/isar/theory.ts +16 -17
  80. package/src/prover/isabelle/isar/toplevel.ts +46 -56
  81. package/src/prover/isabelle/isar/type-check.ts +0 -2
  82. package/src/prover/isabelle/provers/blast/blast.ts +0 -2
  83. package/src/prover/isabelle/provers/blast/branch.ts +0 -2
  84. package/src/prover/isabelle/provers/blast/prove.ts +0 -2
  85. package/src/prover/isabelle/provers/blast/rules.ts +0 -2
  86. package/src/prover/isabelle/provers/blast/state.ts +0 -2
  87. package/src/prover/isabelle/provers/blast/term.ts +0 -2
  88. package/src/prover/isabelle/provers/clasimp.ts +1 -3
  89. package/src/prover/isabelle/provers/classical.ts +1 -3
  90. package/src/prover/isabelle/provers/hypsubst.ts +2 -4
  91. package/src/prover/isabelle/pure/bicompose.ts +0 -2
  92. package/src/prover/isabelle/pure/consts.ts +0 -2
  93. package/src/prover/isabelle/pure/conv.ts +0 -2
  94. package/src/prover/isabelle/pure/drule.ts +0 -2
  95. package/src/prover/isabelle/pure/envir.ts +0 -2
  96. package/src/prover/isabelle/pure/goal.ts +0 -2
  97. package/src/prover/isabelle/pure/logic.ts +0 -2
  98. package/src/prover/isabelle/pure/name.ts +0 -2
  99. package/src/prover/isabelle/pure/net.ts +0 -2
  100. package/src/prover/isabelle/pure/object-logic.ts +0 -2
  101. package/src/prover/isabelle/pure/pattern.ts +0 -2
  102. package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
  103. package/src/prover/isabelle/pure/rewriter.ts +3 -5
  104. package/src/prover/isabelle/pure/search.ts +0 -2
  105. package/src/prover/isabelle/pure/seq.ts +0 -2
  106. package/src/prover/isabelle/pure/simplifier.ts +0 -2
  107. package/src/prover/isabelle/pure/table.ts +0 -2
  108. package/src/prover/isabelle/pure/tactic.ts +0 -2
  109. package/src/prover/isabelle/pure/tactical.ts +0 -2
  110. package/src/prover/isabelle/pure/term-ord.ts +0 -2
  111. package/src/prover/isabelle/pure/term.ts +3 -5
  112. package/src/prover/isabelle/pure/thm.ts +0 -2
  113. package/src/prover/isabelle/pure/type.ts +0 -2
  114. package/src/prover/isabelle/pure/unify.ts +0 -2
  115. package/src/prover/isabelle/pure/variable.ts +0 -2
  116. package/src/prover/isabelle/tla/classical-setup.ts +0 -2
  117. package/src/prover/isabelle/tla/simpdata.ts +0 -2
  118. package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
  119. package/src/prover/ocaml.ts +4 -1
  120. package/src/prover/prep/action.ts +1 -0
  121. package/src/prover/prep/md5.ts +26 -29
  122. package/src/prover/prep/methods.ts +55 -6
  123. package/src/prover/prep/normalize.ts +4 -1
  124. package/src/prover/prove.ts +58 -32
  125. package/src/prover/ptl/decide.ts +43 -63
  126. package/src/prover/smt/context.ts +10 -14
  127. package/src/prover/smt/data.ts +51 -45
  128. package/src/prover/smt/encode.ts +1 -2
  129. package/src/prover/smt/rewrite.ts +3 -7
  130. package/src/prover/smt/simplify.ts +1 -1
  131. package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
  132. package/src/prover/smt/solver/ackr-helper.ts +0 -3
  133. package/src/prover/smt/solver/ackr-model-converter.ts +1 -8
  134. package/src/prover/smt/solver/act-cache.ts +0 -1
  135. package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
  136. package/src/prover/smt/solver/aig-tactic.ts +25 -16
  137. package/src/prover/smt/solver/aig.ts +2 -3
  138. package/src/prover/smt/solver/arith-rewriter.ts +4 -7
  139. package/src/prover/smt/solver/arith-terms.ts +0 -2
  140. package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
  141. package/src/prover/smt/solver/array-rewriter.ts +1 -4
  142. package/src/prover/smt/solver/asserted-formulas.ts +67 -3
  143. package/src/prover/smt/solver/ast-lt.ts +2 -3
  144. package/src/prover/smt/solver/ast-util.ts +4 -5
  145. package/src/prover/smt/solver/ast.ts +171 -168
  146. package/src/prover/smt/solver/auf-solver.ts +0 -1
  147. package/src/prover/smt/solver/bit-blast-tactic.ts +2 -11
  148. package/src/prover/smt/solver/bit-blaster.ts +0 -3
  149. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  150. package/src/prover/smt/solver/bound-manager.ts +39 -29
  151. package/src/prover/smt/solver/bound-simplifier.ts +2 -5
  152. package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
  153. package/src/prover/smt/solver/bv-decl-plugin.ts +13 -11
  154. package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
  155. package/src/prover/smt/solver/bv-rewriter.ts +15 -19
  156. package/src/prover/smt/solver/bv1-blast.ts +1 -11
  157. package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
  158. package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
  159. package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
  160. package/src/prover/smt/solver/card2bv.ts +3 -7
  161. package/src/prover/smt/solver/case-split-queue.ts +0 -2
  162. package/src/prover/smt/solver/cg-table.ts +19 -16
  163. package/src/prover/smt/solver/check-logic.ts +6 -2
  164. package/src/prover/smt/solver/clause.ts +0 -1
  165. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +2 -5
  166. package/src/prover/smt/solver/conflict-resolution.ts +8 -8
  167. package/src/prover/smt/solver/context.ts +45 -15
  168. package/src/prover/smt/solver/ctx-simplify.ts +1 -3
  169. package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
  170. package/src/prover/smt/solver/datatype-decl-plugin.ts +22 -17
  171. package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
  172. package/src/prover/smt/solver/demodulator.ts +2 -5
  173. package/src/prover/smt/solver/dependent-expr-state.ts +25 -7
  174. package/src/prover/smt/solver/der.ts +0 -1
  175. package/src/prover/smt/solver/diff-neq.ts +1 -3
  176. package/src/prover/smt/solver/distribute-forall.ts +1 -11
  177. package/src/prover/smt/solver/dom-simplify.ts +1 -3
  178. package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
  179. package/src/prover/smt/solver/dyn-ack.ts +0 -1
  180. package/src/prover/smt/solver/e-matching.ts +6 -7
  181. package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
  182. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  183. package/src/prover/smt/solver/elim-uncnstr.ts +7 -23
  184. package/src/prover/smt/solver/enode.ts +16 -10
  185. package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
  186. package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
  187. package/src/prover/smt/solver/euf/arith-internalize.ts +2 -8
  188. package/src/prover/smt/solver/euf/arith-solver.ts +0 -6
  189. package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
  190. package/src/prover/smt/solver/euf/array-internalize.ts +21 -12
  191. package/src/prover/smt/solver/euf/array-solver.ts +0 -2
  192. package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
  193. package/src/prover/smt/solver/euf/bv-internalize.ts +1 -3
  194. package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
  195. package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
  196. package/src/prover/smt/solver/euf/egraph.ts +69 -53
  197. package/src/prover/smt/solver/euf/euf-solver.ts +38 -37
  198. package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
  199. package/src/prover/smt/solver/euf/mam.ts +7 -55
  200. package/src/prover/smt/solver/euf/q-ematch.ts +27 -98
  201. package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
  202. package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
  203. package/src/prover/smt/solver/euf/q-solver.ts +3 -3
  204. package/src/prover/smt/solver/euf/th-solver.ts +1 -16
  205. package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
  206. package/src/prover/smt/solver/expr-ref.ts +0 -1
  207. package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
  208. package/src/prover/smt/solver/expr2polynomial.ts +204 -80
  209. package/src/prover/smt/solver/factor.ts +37 -26
  210. package/src/prover/smt/solver/fd-solver.ts +3 -5
  211. package/src/prover/smt/solver/fingerprints.ts +0 -1
  212. package/src/prover/smt/solver/fix-dl-var.ts +2 -4
  213. package/src/prover/smt/solver/flat-literals.ts +0 -1
  214. package/src/prover/smt/solver/fm-tactic.ts +25 -14
  215. package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
  216. package/src/prover/smt/solver/fpa-rewriter.ts +12 -14
  217. package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
  218. package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -1
  219. package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
  220. package/src/prover/smt/solver/goal.ts +6 -4
  221. package/src/prover/smt/solver/goal2nlsat.ts +57 -32
  222. package/src/prover/smt/solver/guard-set.ts +0 -1
  223. package/src/prover/smt/solver/hash.ts +0 -1
  224. package/src/prover/smt/solver/hashtable.ts +4 -1
  225. package/src/prover/smt/solver/inf-eps.ts +1 -2
  226. package/src/prover/smt/solver/inj-axiom.ts +0 -1
  227. package/src/prover/smt/solver/internalizer.ts +41 -3
  228. package/src/prover/smt/solver/lackr.ts +0 -2
  229. package/src/prover/smt/solver/lbool.ts +0 -1
  230. package/src/prover/smt/solver/lia2card.ts +1 -2
  231. package/src/prover/smt/solver/lia2pb.ts +18 -5
  232. package/src/prover/smt/solver/literal.ts +0 -1
  233. package/src/prover/smt/solver/logic-tactics.ts +9 -6
  234. package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
  235. package/src/prover/smt/solver/lp/constraints.ts +0 -1
  236. package/src/prover/smt/solver/lp/containers.ts +7 -2
  237. package/src/prover/smt/solver/lp/core-solver.ts +0 -3
  238. package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
  239. package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
  240. package/src/prover/smt/solver/lp/dependency.ts +0 -2
  241. package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
  242. package/src/prover/smt/solver/lp/explanation.ts +0 -1
  243. package/src/prover/smt/solver/lp/gomory.ts +0 -1
  244. package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
  245. package/src/prover/smt/solver/lp/hnf.ts +0 -3
  246. package/src/prover/smt/solver/lp/int-cube.ts +0 -1
  247. package/src/prover/smt/solver/lp/int-solver.ts +0 -2
  248. package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
  249. package/src/prover/smt/solver/lp/lar-term.ts +0 -1
  250. package/src/prover/smt/solver/lp/lp-settings.ts +1 -2
  251. package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
  252. package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
  253. package/src/prover/smt/solver/lp/nex.ts +2 -2
  254. package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
  255. package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
  256. package/src/prover/smt/solver/lp/nla-core.ts +26 -7
  257. package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
  258. package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
  259. package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
  260. package/src/prover/smt/solver/lp/nla-grobner.ts +158 -82
  261. package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
  262. package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
  263. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
  264. package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
  265. package/src/prover/smt/solver/lp/nla-order.ts +0 -2
  266. package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
  267. package/src/prover/smt/solver/lp/nla-powers.ts +144 -108
  268. package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
  269. package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
  270. package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -19
  271. package/src/prover/smt/solver/lp/nla-types.ts +0 -2
  272. package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
  273. package/src/prover/smt/solver/lp/nra-solver.ts +138 -97
  274. package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
  275. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
  276. package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
  277. package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
  278. package/src/prover/smt/solver/lp/pdd.ts +725 -290
  279. package/src/prover/smt/solver/lp/random-updater.ts +0 -2
  280. package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
  281. package/src/prover/smt/solver/lp/union-find.ts +1 -2
  282. package/src/prover/smt/solver/macro-finder.ts +1 -4
  283. package/src/prover/smt/solver/mam-compiler.ts +14 -15
  284. package/src/prover/smt/solver/mam-interpreter.ts +0 -1
  285. package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
  286. package/src/prover/smt/solver/max-cliques.ts +0 -2
  287. package/src/prover/smt/solver/maxcore.ts +6 -15
  288. package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -2
  289. package/src/prover/smt/solver/maxlex.ts +0 -8
  290. package/src/prover/smt/solver/maxsmt-base.ts +7 -1
  291. package/src/prover/smt/solver/maxsmt.ts +0 -1
  292. package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
  293. package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
  294. package/src/prover/smt/solver/mbp/mbp-plugin.ts +10 -3
  295. package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
  296. package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
  297. package/src/prover/smt/solver/mbp/mbp-term-graph.ts +1 -19
  298. package/src/prover/smt/solver/model-based-opt.ts +1 -2
  299. package/src/prover/smt/solver/model-checker.ts +2 -3
  300. package/src/prover/smt/solver/model-evaluator.ts +9 -6
  301. package/src/prover/smt/solver/model-finder.ts +0 -1
  302. package/src/prover/smt/solver/model-generator.ts +3 -2
  303. package/src/prover/smt/solver/model-macro-solver.ts +3 -4
  304. package/src/prover/smt/solver/model-printer.ts +0 -1
  305. package/src/prover/smt/solver/mpf.ts +2 -5
  306. package/src/prover/smt/solver/mus.ts +2 -4
  307. package/src/prover/smt/solver/muz/dl-context.ts +67 -19
  308. package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
  309. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
  310. package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
  311. package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -6
  312. package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
  313. package/src/prover/smt/solver/muz/dl-mk-slice.ts +78 -16
  314. package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
  315. package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -30
  316. package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
  317. package/src/prover/smt/solver/muz/dl-rule.ts +93 -57
  318. package/src/prover/smt/solver/muz/hnf.ts +6 -6
  319. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
  320. package/src/prover/smt/solver/muz/horn-tactic.ts +15 -6
  321. package/src/prover/smt/solver/muz/rule-properties.ts +195 -37
  322. package/src/prover/smt/solver/muz/spacer-context.ts +111 -102
  323. package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -4
  324. package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
  325. package/src/prover/smt/solver/muz/spacer-manager.ts +0 -6
  326. package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
  327. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +4 -15
  328. package/src/prover/smt/solver/muz/spacer-util.ts +2 -29
  329. package/src/prover/smt/solver/muz/substitution.ts +88 -39
  330. package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
  331. package/src/prover/smt/solver/nlqsat.ts +5 -5
  332. package/src/prover/smt/solver/nlsat/algebraic.ts +197 -96
  333. package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
  334. package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
  335. package/src/prover/smt/solver/nlsat/explain.ts +379 -217
  336. package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
  337. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
  338. package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
  339. package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
  340. package/src/prover/smt/solver/nlsat/solver.ts +118 -105
  341. package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
  342. package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
  343. package/src/prover/smt/solver/nlsat/types.ts +0 -2
  344. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
  345. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
  346. package/src/prover/smt/solver/nlsat-tactic.ts +1 -2
  347. package/src/prover/smt/solver/nnf.ts +6 -3
  348. package/src/prover/smt/solver/normalize-bounds.ts +0 -1
  349. package/src/prover/smt/solver/occf.ts +0 -1
  350. package/src/prover/smt/solver/opt-context.ts +19 -13
  351. package/src/prover/smt/solver/opt-nlsat.ts +97 -77
  352. package/src/prover/smt/solver/opt-pareto.ts +0 -2
  353. package/src/prover/smt/solver/opt-preprocess.ts +1 -2
  354. package/src/prover/smt/solver/opt-solver.ts +22 -11
  355. package/src/prover/smt/solver/opt-value.ts +0 -1
  356. package/src/prover/smt/solver/optsmt.ts +13 -12
  357. package/src/prover/smt/solver/parallel-tactic.ts +0 -2
  358. package/src/prover/smt/solver/pattern-inference.ts +2 -3
  359. package/src/prover/smt/solver/pb-rewriter.ts +15 -30
  360. package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
  361. package/src/prover/smt/solver/poly-rewriter.ts +76 -21
  362. package/src/prover/smt/solver/probes.ts +91 -28
  363. package/src/prover/smt/solver/propagate-values.ts +4 -1
  364. package/src/prover/smt/solver/proto-model.ts +9 -12
  365. package/src/prover/smt/solver/pull-quant.ts +0 -1
  366. package/src/prover/smt/solver/purify-arith.ts +50 -16
  367. package/src/prover/smt/solver/qe-arith-plugin.ts +4 -7
  368. package/src/prover/smt/solver/qe-lite-der.ts +0 -1
  369. package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
  370. package/src/prover/smt/solver/qe-lite.ts +2 -3
  371. package/src/prover/smt/solver/qe-mbp.ts +13 -24
  372. package/src/prover/smt/solver/qe.ts +48 -57
  373. package/src/prover/smt/solver/qel.ts +0 -1
  374. package/src/prover/smt/solver/qi-queue.ts +0 -1
  375. package/src/prover/smt/solver/qsat.ts +71 -97
  376. package/src/prover/smt/solver/quant-hoist.ts +2 -1
  377. package/src/prover/smt/solver/quant-tactics.ts +0 -1
  378. package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
  379. package/src/prover/smt/solver/quantifier-manager.ts +14 -10
  380. package/src/prover/smt/solver/quasi-macros.ts +9 -20
  381. package/src/prover/smt/solver/random-gen.ts +0 -1
  382. package/src/prover/smt/solver/rational.ts +17 -1
  383. package/src/prover/smt/solver/recfun-decl-plugin.ts +35 -21
  384. package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
  385. package/src/prover/smt/solver/reduce-args.ts +0 -1
  386. package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
  387. package/src/prover/smt/solver/ref-vector.ts +0 -1
  388. package/src/prover/smt/solver/relevancy.ts +0 -1
  389. package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
  390. package/src/prover/smt/solver/rewriter.ts +1 -2
  391. package/src/prover/smt/solver/rlimit.ts +17 -1
  392. package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
  393. package/src/prover/smt/solver/sat/big.ts +0 -1
  394. package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
  395. package/src/prover/smt/solver/sat/clause.ts +2 -20
  396. package/src/prover/smt/solver/sat/cleaner.ts +0 -2
  397. package/src/prover/smt/solver/sat/config.ts +6 -9
  398. package/src/prover/smt/solver/sat/consequences.ts +1 -2
  399. package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
  400. package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
  401. package/src/prover/smt/solver/sat/inc-sat-solver.ts +30 -15
  402. package/src/prover/smt/solver/sat/model-converter.ts +2 -22
  403. package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
  404. package/src/prover/smt/solver/sat/pb-solver.ts +50 -26
  405. package/src/prover/smt/solver/sat/probing.ts +22 -21
  406. package/src/prover/smt/solver/sat/sat-tactic.ts +4 -4
  407. package/src/prover/smt/solver/sat/sat2goal.ts +9 -15
  408. package/src/prover/smt/solver/sat/scc.ts +1 -2
  409. package/src/prover/smt/solver/sat/simplifier.ts +16 -60
  410. package/src/prover/smt/solver/sat/solver.ts +47 -70
  411. package/src/prover/smt/solver/sat/var-queue.ts +0 -2
  412. package/src/prover/smt/solver/sat/watch-list.ts +7 -3
  413. package/src/prover/smt/solver/search-tree.ts +0 -1
  414. package/src/prover/smt/solver/seq-axioms.ts +21 -39
  415. package/src/prover/smt/solver/seq-decl-plugin.ts +10 -14
  416. package/src/prover/smt/solver/seq-derive.ts +11 -16
  417. package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
  418. package/src/prover/smt/solver/seq-eq-solver.ts +9 -10
  419. package/src/prover/smt/solver/seq-factory.ts +2 -4
  420. package/src/prover/smt/solver/seq-monadic.ts +7 -7
  421. package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
  422. package/src/prover/smt/solver/seq-re-rewriter.ts +5 -130
  423. package/src/prover/smt/solver/seq-re-util.ts +8 -27
  424. package/src/prover/smt/solver/seq-regex-bisim.ts +2 -3
  425. package/src/prover/smt/solver/seq-regex-live.ts +6 -8
  426. package/src/prover/smt/solver/seq-rewriter.ts +32 -35
  427. package/src/prover/smt/solver/seq-skolem.ts +0 -24
  428. package/src/prover/smt/solver/seq-subset.ts +0 -1
  429. package/src/prover/smt/solver/seq-view-witness.ts +4 -6
  430. package/src/prover/smt/solver/smt-consequences.ts +0 -2
  431. package/src/prover/smt/solver/smt-kernel.ts +9 -5
  432. package/src/prover/smt/solver/smt-logics.ts +0 -1
  433. package/src/prover/smt/solver/smt-setup.ts +86 -20
  434. package/src/prover/smt/solver/smt2-printer.ts +0 -2
  435. package/src/prover/smt/solver/smtlib-parser.ts +1681 -721
  436. package/src/prover/smt/solver/smtlib-script.ts +1273 -793
  437. package/src/prover/smt/solver/solve-eqs.ts +13 -23
  438. package/src/prover/smt/solver/solver.ts +1 -2
  439. package/src/prover/smt/solver/static-features.ts +0 -5
  440. package/src/prover/smt/solver/sticky-generations.ts +0 -1
  441. package/src/prover/smt/solver/tactic.ts +269 -130
  442. package/src/prover/smt/solver/term-enumeration.ts +0 -1
  443. package/src/prover/smt/solver/theory-array.ts +25 -60
  444. package/src/prover/smt/solver/theory-bv.ts +15 -54
  445. package/src/prover/smt/solver/theory-char.ts +0 -1
  446. package/src/prover/smt/solver/theory-datatype.ts +0 -1
  447. package/src/prover/smt/solver/theory-finite-set.ts +2 -2
  448. package/src/prover/smt/solver/theory-fpa.ts +46 -79
  449. package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
  450. package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
  451. package/src/prover/smt/solver/theory-lra-final-check.ts +1 -2
  452. package/src/prover/smt/solver/theory-lra-internalize.ts +9 -1
  453. package/src/prover/smt/solver/theory-lra-model.ts +0 -1
  454. package/src/prover/smt/solver/theory-lra-propagate.ts +6 -5
  455. package/src/prover/smt/solver/theory-lra-state.ts +0 -1
  456. package/src/prover/smt/solver/theory-lra.ts +0 -7
  457. package/src/prover/smt/solver/theory-pb.ts +34 -15
  458. package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
  459. package/src/prover/smt/solver/theory-recfun.ts +2 -3
  460. package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
  461. package/src/prover/smt/solver/theory-seq-solve.ts +6 -8
  462. package/src/prover/smt/solver/theory-seq-state.ts +8 -36
  463. package/src/prover/smt/solver/theory-seq.ts +32 -55
  464. package/src/prover/smt/solver/theory.ts +16 -2
  465. package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
  466. package/src/prover/smt/solver/var-subst.ts +6 -6
  467. package/src/prover/smt/table.ts +3 -2
  468. package/src/prover/tlapm/cache.ts +8 -8
  469. package/src/prover/zenon/decide.ts +9 -13
  470. package/src/prover/zenon/encode.ts +0 -2
  471. package/src/prover/zenon/eqrel.ts +0 -2
  472. package/src/prover/zenon/equality-rules.ts +24 -2
  473. package/src/prover/zenon/expr.ts +21 -2
  474. package/src/prover/zenon/index-table.ts +7 -4
  475. package/src/prover/zenon/isar-case.ts +1 -3
  476. package/src/prover/zenon/isar.ts +2 -4
  477. package/src/prover/zenon/llproof.ts +0 -2
  478. package/src/prover/zenon/mltoll.ts +0 -2
  479. package/src/prover/zenon/node.ts +12 -13
  480. package/src/prover/zenon/parse.ts +0 -2
  481. package/src/prover/zenon/phrase.ts +1 -3
  482. package/src/prover/zenon/proof.ts +0 -2
  483. package/src/prover/zenon/propositional-rules.ts +0 -2
  484. package/src/prover/zenon/rules.ts +2 -3
  485. package/src/prover/zenon/search.ts +0 -2
  486. package/src/prover/zenon/tla/functions.ts +0 -2
  487. package/src/prover/zenon/tla/llproof.ts +0 -2
  488. package/src/prover/zenon/tla/records.ts +0 -2
  489. package/src/prover/zenon/tla/rewrites.ts +0 -2
  490. package/src/prover/zenon/tla/sets.ts +1 -3
  491. package/src/prover/zenon/tla/terms.ts +0 -2
  492. package/src/prover/zenon/tla/tla.ts +0 -2
  493. package/src/resolve.ts +625 -189
  494. package/src/runtime.ts +7 -1
  495. package/src/sany/builtins.ts +10 -10
  496. package/src/sany/generation.ts +2 -13
  497. package/src/sany/generator-definitions.ts +3 -1
  498. package/src/sany/generator-expressions.ts +36 -30
  499. package/src/sany/generator-proofs.ts +5 -3
  500. package/src/sany/generator.ts +2 -1
  501. package/src/sany/levels.ts +0 -2
  502. package/src/sany/lexer.ts +3 -3
  503. package/src/sany/linter.ts +0 -2
  504. package/src/sany/modules.ts +4 -2
  505. package/src/sany/nodes.ts +1 -1
  506. package/src/sany/selectors.ts +11 -6
  507. package/src/sany/xml.ts +2 -3
  508. package/src/search.ts +209 -56
  509. package/src/simulate.ts +3 -0
  510. package/src/spec-description.ts +2 -2
  511. package/src/standard-definitions.ts +4 -0
  512. package/src/state-graph.ts +0 -2
  513. package/src/subexpressions.ts +265 -94
  514. package/src/successors.ts +2 -1
  515. package/src/symmetry.ts +3 -3
  516. package/src/tableau.ts +2 -2
  517. package/src/tlc/fingerprint.ts +81 -9
  518. package/src/tlc/jar-data.ts +10 -0
  519. package/src/tlc/messages.ts +3 -3
  520. package/src/tlc/order.ts +14 -3
  521. package/src/tlc/summary.ts +29 -14
  522. package/src/tlc/tlc-operators.ts +3 -1
  523. package/src/tlc/tlcext-operators.ts +61 -16
  524. package/src/tlc/trace-spec.ts +5 -5
  525. package/src/typed-tier.ts +6541 -0
  526. package/src/typescript/types.ts +2 -2
  527. package/src/values.ts +46 -27
  528. package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
  529. package/src/prover/smt/solver/z3-license.txt +0 -10
  530. package/src/prover/zenon/LICENSE +0 -32
@@ -1,44 +1,52 @@
1
- // Ported from Z3 (src/ast/euf/euf_egraph.h, src/ast/euf/euf_egraph.cpp, src/ast/euf/euf_enode.h,
2
- // src/ast/euf/euf_enode.cpp, src/ast/euf/euf_justification.h), MIT license, see z3-license.txt.
3
- import { type AstManager, OP_EQ } from "../ast";
1
+ import {
2
+ type AstManager,
3
+ OP_ADD,
4
+ OP_AND,
5
+ OP_ARRAY_EXT,
6
+ OP_ARRAY_MAP,
7
+ OP_BADD,
8
+ OP_BAND,
9
+ OP_BCOMP,
10
+ OP_BMUL,
11
+ OP_BOR,
12
+ OP_BXNOR,
13
+ OP_BXOR,
14
+ OP_EQ,
15
+ OP_MUL,
16
+ OP_OR,
17
+ OP_XOR,
18
+ } from "../ast";
4
19
  import { CgTable } from "../cg-table";
5
20
  import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
6
21
 
7
22
  export const NULL_THEORY_VAR = -1;
8
23
  export const NULL_BOOL_VAR = -1;
9
24
 
10
- export const J_AXIOM = 0;
11
- export const J_CONGRUENCE = 1;
12
- export const J_EXTERNAL = 2;
13
- export const J_EQUALITY = 3;
25
+ const J_AXIOM = 0;
26
+ const J_CONGRUENCE = 1;
27
+ const J_EXTERNAL = 2;
14
28
 
15
29
  export interface Justification {
16
30
  readonly kind: number;
17
31
  readonly isCommutative: boolean;
18
32
  readonly external: number;
19
- readonly lhs: Enode | null;
20
- readonly rhs: Enode | null;
21
33
  }
22
34
 
23
- export const AXIOM: Justification = {
35
+ const AXIOM: Justification = {
24
36
  kind: J_AXIOM,
25
37
  isCommutative: false,
26
38
  external: 0,
27
- lhs: null,
28
- rhs: null,
29
39
  };
30
40
 
31
41
  const CONGRUENCES: readonly Justification[] = [
32
- { kind: J_CONGRUENCE, isCommutative: false, external: 0, lhs: null, rhs: null },
33
- { kind: J_CONGRUENCE, isCommutative: true, external: 0, lhs: null, rhs: null },
42
+ { kind: J_CONGRUENCE, isCommutative: false, external: 0 },
43
+ { kind: J_CONGRUENCE, isCommutative: true, external: 0 },
34
44
  ];
35
45
 
36
46
  export const mkExternal = (external: number): Justification => ({
37
47
  kind: J_EXTERNAL,
38
48
  isCommutative: false,
39
49
  external,
40
- lhs: null,
41
- rhs: null,
42
50
  });
43
51
 
44
52
  interface ThVar {
@@ -78,13 +86,17 @@ export class Enode {
78
86
  readonly decl: number,
79
87
  readonly args: readonly Enode[],
80
88
  readonly generation: number,
81
- readonly isEq: boolean,
89
+ readonly isCommutative: boolean,
82
90
  ) {}
83
91
 
84
92
  get numArgs() {
85
93
  return this.args.length;
86
94
  }
87
95
 
96
+ get isCommutativeTable() {
97
+ return this.isCommutative;
98
+ }
99
+
88
100
  getArg(index: number) {
89
101
  return this.args[index];
90
102
  }
@@ -135,7 +147,7 @@ export class Enode {
135
147
  congruent(other: Enode) {
136
148
  if (this.decl !== other.decl || this.args.length !== other.args.length) return false;
137
149
  if (
138
- this.isEq &&
150
+ this.isCommutative &&
139
151
  this.args[0].root === other.args[1].root &&
140
152
  this.args[1].root === other.args[0].root
141
153
  )
@@ -213,16 +225,40 @@ interface UpdateRecord {
213
225
 
214
226
  const TO_MERGE_PLAIN = 0;
215
227
  const TO_MERGE_COMM = 1;
216
- const TO_JUSTIFIED = 2;
217
- const TO_ADD_LITERAL = 3;
228
+ const TO_ADD_LITERAL = 2;
218
229
 
219
230
  interface ToMerge {
220
231
  a: Enode;
221
232
  b: Enode | null;
222
233
  kind: number;
223
- justification: Justification;
224
234
  }
225
235
 
236
+ // func_decl_info::is_commutative, which the decl plugins set by family and kind.
237
+ export const isCommutativeDecl = (manager: AstManager, decl: number): boolean => {
238
+ const funcDecl = manager.funcDecls[decl];
239
+ switch (funcDecl.op) {
240
+ case OP_EQ:
241
+ case OP_AND:
242
+ case OP_OR:
243
+ case OP_XOR:
244
+ case OP_ADD:
245
+ case OP_MUL:
246
+ case OP_BADD:
247
+ case OP_BMUL:
248
+ case OP_BAND:
249
+ case OP_BOR:
250
+ case OP_BXOR:
251
+ case OP_BXNOR:
252
+ case OP_BCOMP:
253
+ case OP_ARRAY_EXT:
254
+ return true;
255
+ case OP_ARRAY_MAP:
256
+ return isCommutativeDecl(manager, funcDecl.parameters[0]);
257
+ default:
258
+ return false;
259
+ }
260
+ };
261
+
226
262
  export class Egraph {
227
263
  readonly nodes: Enode[] = [];
228
264
  private toMerge: ToMerge[] = [];
@@ -264,8 +300,12 @@ export class Egraph {
264
300
  return this.expr2enode[expr];
265
301
  }
266
302
 
267
- findCongruent(decl: number, args: readonly Enode[], isEq: boolean) {
268
- return this.table.findFor(decl, args, isEq);
303
+ findCongruent(decl: number, args: readonly Enode[]) {
304
+ return this.table.findFor(
305
+ decl,
306
+ args,
307
+ args.length === 2 && isCommutativeDecl(this.manager, decl),
308
+ );
269
309
  }
270
310
 
271
311
  enodesOf(decl: number) {
@@ -292,7 +332,7 @@ export class Egraph {
292
332
  decl,
293
333
  args,
294
334
  generation,
295
- args.length === 2 && isApp && manager.getOp(expr) === OP_EQ,
335
+ args.length === 2 && isApp && isCommutativeDecl(manager, decl),
296
336
  );
297
337
  if (this.isDefaultRelevant) node.isRelevant = true;
298
338
  this.nodes.push(node);
@@ -330,7 +370,7 @@ export class Egraph {
330
370
  }
331
371
 
332
372
  private isComm(node: Enode, other: Enode) {
333
- return node.isEq && node.args[0].root !== other.args[0].root;
373
+ return node.isCommutative && node.args[0].root !== other.args[0].root;
334
374
  }
335
375
 
336
376
  private insertTable(node: Enode) {
@@ -349,7 +389,7 @@ export class Egraph {
349
389
 
350
390
  private queueLiteral(node: Enode, ante: Enode | null) {
351
391
  if (this.onPropagateLiteral !== null)
352
- this.toMerge.push({ a: node, b: ante, kind: TO_ADD_LITERAL, justification: AXIOM });
392
+ this.toMerge.push({ a: node, b: ante, kind: TO_ADD_LITERAL });
353
393
  }
354
394
 
355
395
  private updateChildren(node: Enode) {
@@ -358,12 +398,7 @@ export class Egraph {
358
398
  }
359
399
 
360
400
  private pushMerge(a: Enode, b: Enode, isComm: boolean) {
361
- this.toMerge.push({
362
- a,
363
- b,
364
- kind: isComm ? TO_MERGE_COMM : TO_MERGE_PLAIN,
365
- justification: AXIOM,
366
- });
401
+ this.toMerge.push({ a, b, kind: isComm ? TO_MERGE_COMM : TO_MERGE_PLAIN });
367
402
  }
368
403
 
369
404
  pushScope() {
@@ -400,15 +435,6 @@ export class Egraph {
400
435
  for (const other of getClass(node)) if (other.value !== ante.value) onPropagate(other, ante);
401
436
  }
402
437
 
403
- newDiseqWithReason(node: Enode, reason: number) {
404
- this.forcePush();
405
- const justification = mkExternal(reason);
406
- const a = node.args[0];
407
- const b = node.args[1];
408
- if (a.root === b.root) this.setConflict(a, b, justification);
409
- else this.setValue(node, L_FALSE, justification);
410
- }
411
-
412
438
  newDiseq(node: Enode) {
413
439
  const arg1 = node.args[0];
414
440
  const arg2 = node.args[1];
@@ -464,6 +490,7 @@ export class Egraph {
464
490
  }
465
491
  const rootVar = root.getThVar(id);
466
492
  node.replaceThVar(thVar, id);
493
+ // Deviation from Z3: the undo gives the node back its own variable, where Z3 gives it the root's and later equates the wrong terms.
467
494
  this.updates.push({
468
495
  tag: U_REPLACE_TH_VAR,
469
496
  r1: node,
@@ -495,12 +522,6 @@ export class Egraph {
495
522
  this.push(U_TOGGLE_CGC, node);
496
523
  }
497
524
 
498
- setRelevant(node: Enode) {
499
- if (node.isRelevant) return;
500
- node.isRelevant = true;
501
- this.push(U_SET_RELEVANT, node);
502
- }
503
-
504
525
  private toggleCgcEnabled(node: Enode, isBacktracking: boolean) {
505
526
  const isEnabled = !node.isCgcEnabled;
506
527
  node.isCgcEnabled = isEnabled;
@@ -559,7 +580,7 @@ export class Egraph {
559
580
  this.toggleCgcEnabled(r1, true);
560
581
  break;
561
582
  case U_TOGGLE_MERGE_TF:
562
- r1.isMergeTfEnabled = !r1.isMergeTfEnabled;
583
+ r1.isMergeTfEnabled = !r1.mergeTf;
563
584
  break;
564
585
  case U_SET_PARENT:
565
586
  this.undoEq(r1, record.n1 as Enode, record.num);
@@ -725,9 +746,6 @@ export class Egraph {
725
746
  case TO_MERGE_COMM:
726
747
  this.mergeWith(item.a, item.b as Enode, CONGRUENCES[item.kind]);
727
748
  break;
728
- case TO_JUSTIFIED:
729
- this.mergeWith(item.a, item.b as Enode, item.justification);
730
- break;
731
749
  case TO_ADD_LITERAL:
732
750
  this.addLiteral(item.a, item.b);
733
751
  break;
@@ -842,8 +860,6 @@ export class Egraph {
842
860
  if (justification.kind === J_EXTERNAL) justifications.push(justification.external);
843
861
  else if (justification.kind === J_CONGRUENCE)
844
862
  this.pushCongruence(a, b, justification.isCommutative);
845
- else if (justification.kind === J_EQUALITY)
846
- this.explainEq(justifications, justification.lhs as Enode, justification.rhs as Enode);
847
863
  }
848
864
 
849
865
  explainEq(justifications: number[], a: Enode, b: Enode) {
@@ -1,6 +1,3 @@
1
- // Ported from Z3 (src/sat/smt/euf_solver.h, src/sat/smt/euf_solver.cpp,
2
- // src/sat/smt/euf_internalize.cpp, src/sat/smt/euf_model.cpp, src/util/top_sort.h), MIT license,
3
- // see z3-license.txt.
4
1
  import { SmtInvariantError, SmtUnsupportedError } from "../../../../errors";
5
2
  import {
6
3
  type AstManager,
@@ -30,7 +27,7 @@ import {
30
27
  type SatExtension,
31
28
  type Solver,
32
29
  } from "../sat/solver";
33
- import { Egraph, type Enode, getClass, mkExternal, NULL_BOOL_VAR } from "./egraph";
30
+ import { Egraph, type Enode, getClass, mkExternal, NULL_BOOL_VAR, type ThEq } from "./egraph";
34
31
  import {
35
32
  addDependency,
36
33
  type Dependencies,
@@ -468,8 +465,7 @@ export class EufSolver implements SatExtension {
468
465
  let generation = 0;
469
466
  const visited = new Set<number>();
470
467
  const todo = [expr];
471
- while (todo.length > 0) {
472
- const current = todo.pop() as number;
468
+ for (let current = todo.pop(); current !== undefined; current = todo.pop()) {
473
469
  if (visited.has(current)) continue;
474
470
  visited.add(current);
475
471
  const node = this.egraph.find(current);
@@ -574,21 +570,15 @@ export class EufSolver implements SatExtension {
574
570
  }
575
571
  }
576
572
 
577
- getEqAntecedents(first: Enode, second: Enode, antecedents: number[]) {
578
- this.egraph.beginExplain();
579
- this.explanation = [];
580
- this.egraph.explainEq(this.explanation, first, second);
581
- this.explainQueue(antecedents);
582
- this.egraph.endExplain();
583
- }
584
-
585
573
  addEqAntecedent(first: Enode, second: Enode) {
586
574
  this.egraph.explainEq(this.explanation, first, second);
587
575
  }
588
576
 
589
577
  getThAntecedents(explain: ThExplain, antecedents: number[]) {
590
578
  for (const lit of explain.lits) antecedents.push(lit);
591
- for (const eq of explain.eqs) this.egraph.explainEq(this.explanation, eq[0], eq[1]);
579
+ for (const eq of explain.eqs)
580
+ if (eq[0].owner > eq[1].owner) this.egraph.explainEq(this.explanation, eq[1], eq[0]);
581
+ else this.egraph.explainEq(this.explanation, eq[0], eq[1]);
592
582
  }
593
583
 
594
584
  explainDiseq(justifications: number[], first: Enode, second: Enode) {
@@ -702,11 +692,7 @@ export class EufSolver implements SatExtension {
702
692
  this.egraph.merge(node, ante ?? this.mkTrue(), literalPayload(lit));
703
693
  }
704
694
 
705
- private isSelfPropagated(eq: {
706
- readonly id: number;
707
- readonly child: Enode;
708
- readonly root: Enode | null;
709
- }) {
695
+ private isSelfPropagated(eq: ThEq) {
710
696
  if (eq.root === null) return false;
711
697
  const egraph = this.egraph;
712
698
  egraph.beginExplain();
@@ -865,23 +851,31 @@ export class EufSolver implements SatExtension {
865
851
  const replay = new Map<number, number>();
866
852
  for (const reinit of this.reinits) replay.set(reinit.expr, reinit.boolVar);
867
853
  si.setExpr2VarReplay(replay);
868
- for (const reinit of this.reinits) {
869
- const expr = reinit.expr;
870
- const oldGeneration = this.generation;
871
- this.generation = reinit.generation;
872
- const lit = si.isBoolOp(expr) ? 2 * (replay.get(expr) as number) : si.internalize(expr);
873
- const isConnective =
874
- manager.getFamily(expr) === FAMILY_BASIC &&
875
- (si.isBoolOp(expr) ||
876
- (manager.getOp(expr) === OP_EQ && manager.isBool(manager.getArg(expr, 0))));
877
- if (this.egraph.find(expr) === undefined && !isConnective) {
878
- const args = manager.isApp(expr)
879
- ? manager.getArgs(expr).map((arg) => this.eInternalize(arg))
880
- : [];
881
- this.internalizeTerm(expr);
882
- if (this.egraph.find(expr) === undefined) this.mkEnode(expr, args);
883
- } else this.attachLit(lit, expr);
884
- this.generation = oldGeneration;
854
+ // scoped_suspend_rlimit: the replay runs to its end even when the limit is spent.
855
+ const limit = manager.limit;
856
+ const wasSuspended = limit.isSuspended;
857
+ limit.isSuspended = true;
858
+ try {
859
+ for (const reinit of this.reinits) {
860
+ const expr = reinit.expr;
861
+ const oldGeneration = this.generation;
862
+ this.generation = reinit.generation;
863
+ const lit = si.isBoolOp(expr) ? 2 * (replay.get(expr) as number) : si.internalize(expr);
864
+ const isConnective =
865
+ manager.getFamily(expr) === FAMILY_BASIC &&
866
+ (si.isBoolOp(expr) ||
867
+ (manager.getOp(expr) === OP_EQ && manager.isBool(manager.getArg(expr, 0))));
868
+ if (this.egraph.find(expr) === undefined && !isConnective) {
869
+ const args = manager.isApp(expr)
870
+ ? manager.getArgs(expr).map((arg) => this.eInternalize(arg))
871
+ : [];
872
+ this.internalizeTerm(expr);
873
+ if (this.egraph.find(expr) === undefined) this.mkEnode(expr, args);
874
+ } else this.attachLit(lit, expr);
875
+ this.generation = oldGeneration;
876
+ }
877
+ } finally {
878
+ limit.isSuspended = wasSuspended;
885
879
  }
886
880
  for (const entry of replay)
887
881
  if (si.isBoolOp(entry[0]) && !si.isCached(entry[0], 2 * entry[1]))
@@ -931,6 +925,13 @@ export class EufSolver implements SatExtension {
931
925
 
932
926
  findMutexes() {}
933
927
 
928
+ // Every theory solver but pb's returns false from to_formulas, which ends the walk.
929
+ toFormulas(_lit2expr: (lit: number) => number, formulas: number[]) {
930
+ if (this.solvers.length > 0) return;
931
+ for (const node of this.egraph.nodes)
932
+ if (node.root !== node) formulas.push(this.manager.mkEq(node.owner, node.root.owner));
933
+ }
934
+
934
935
  saveModel(model: ProtoModel | null) {
935
936
  model?.incRef();
936
937
  this.qmodel?.decRef();
@@ -1,5 +1,3 @@
1
- // Ported from Z3 (src/sat/smt/fpa_solver.h, src/sat/smt/fpa_solver.cpp), MIT license, see
2
- // z3-license.txt.
3
1
  import {
4
2
  type AstManager,
5
3
  OP_CONCAT,
@@ -152,18 +150,13 @@ export class FpaSolver extends ThSolver {
152
150
  const owner = node.owner;
153
151
  if (this.isOp(owner, OP_ITE)) return;
154
152
  this.attachNewThVar(node);
155
- manager.withTemporaries(
156
- () => {
157
- if (this.isRm(owner) && !this.isOp(owner, OP_FPA_BV2RM)) {
158
- const limit = manager.mkBvNumeral(4n, 3);
159
- this.addUnit(
160
- this.mkLiteral(mkBvApp(manager, OP_ULEQ, [this.converter.wrap(owner), limit])),
161
- );
162
- }
163
- this.activate(owner);
164
- },
165
- () => [],
166
- );
153
+ const outer = manager.beginTemporaries();
154
+ if (this.isRm(owner) && !this.isOp(owner, OP_FPA_BV2RM)) {
155
+ const limit = manager.mkBvNumeral(4n, 3);
156
+ this.addUnit(this.mkLiteral(mkBvApp(manager, OP_ULEQ, [this.converter.wrap(owner), limit])));
157
+ }
158
+ this.activate(owner);
159
+ manager.endTemporaries(outer);
167
160
  }
168
161
 
169
162
  override unitPropagate() {
@@ -172,11 +165,11 @@ export class FpaSolver extends ThSolver {
172
165
  this.ctx.trail.push(() => {
173
166
  this.nodesQhead = qhead;
174
167
  });
175
- for (; this.nodesQhead < this.nodes.length; this.nodesQhead++)
176
- this.manager.withTemporaries(
177
- () => this.propagateNode(this.nodes[this.nodesQhead]),
178
- () => [],
179
- );
168
+ for (; this.nodesQhead < this.nodes.length; this.nodesQhead++) {
169
+ const outer = this.manager.beginTemporaries();
170
+ this.propagateNode(this.nodes[this.nodesQhead]);
171
+ this.manager.endTemporaries(outer);
172
+ }
180
173
  return true;
181
174
  }
182
175
 
@@ -227,23 +220,20 @@ export class FpaSolver extends ThSolver {
227
220
  const firstExpr = this.var2expr(first);
228
221
  const secondExpr = this.var2expr(second);
229
222
  if (this.isOp(firstExpr, OP_FPA_BVWRAP) || this.isOp(secondExpr, OP_FPA_BVWRAP)) return;
230
- manager.withTemporaries(
231
- () => {
232
- const firstConverted = this.convert(firstExpr);
233
- const secondConverted = this.convert(secondExpr);
234
- const isFloatPair =
235
- (this.isFloat(firstExpr) && this.isFloat(secondExpr)) ||
236
- (this.isRm(firstExpr) && this.isRm(secondExpr));
237
- const eq = isFloatPair
238
- ? this.converter.mkEq(firstConverted, secondConverted)
239
- : manager.mkEq(firstConverted, secondConverted);
240
- const condition = this.theoryRewriter.rewrite(eq);
241
- manager.releaseLater(condition);
242
- this.addEquiv(this.eqInternalize(firstExpr, secondExpr), this.mkLiteral(condition));
243
- this.addUnits(this.mkSideConditions());
244
- },
245
- () => [],
246
- );
223
+ const outer = manager.beginTemporaries();
224
+ const firstConverted = this.convert(firstExpr);
225
+ const secondConverted = this.convert(secondExpr);
226
+ const isFloatPair =
227
+ (this.isFloat(firstExpr) && this.isFloat(secondExpr)) ||
228
+ (this.isRm(firstExpr) && this.isRm(secondExpr));
229
+ const eq = isFloatPair
230
+ ? this.converter.mkEq(firstConverted, secondConverted)
231
+ : manager.mkEq(firstConverted, secondConverted);
232
+ const condition = this.theoryRewriter.rewrite(eq);
233
+ manager.releaseLater(condition);
234
+ this.addEquiv(this.eqInternalize(firstExpr, secondExpr), this.mkLiteral(condition));
235
+ this.addUnits(this.mkSideConditions());
236
+ manager.endTemporaries(outer);
247
237
  }
248
238
 
249
239
  override newEqEh(eq: ThEq) {
@@ -259,26 +249,20 @@ export class FpaSolver extends ThSolver {
259
249
  }
260
250
 
261
251
  override asserted(lit: number) {
262
- this.manager.withTemporaries(
263
- () => {
264
- const converted = this.mkLiteral(this.convert(this.boolVar2expr(lit >> 1) as number));
265
- const conds = this.mkSideConditions();
266
- conds.push(converted);
267
- if ((lit & 1) === 1) {
268
- for (const cond of conds) this.addClause([lit, cond]);
269
- return;
270
- }
271
- this.addClause([...conds.map((cond) => cond ^ 1), lit]);
272
- },
273
- () => [],
274
- );
252
+ const outer = this.manager.beginTemporaries();
253
+ const converted = this.mkLiteral(this.convert(this.boolVar2expr(lit >> 1) as number));
254
+ const conds = this.mkSideConditions();
255
+ conds.push(converted);
256
+ if ((lit & 1) === 1) for (const cond of conds) this.addClause([lit, cond]);
257
+ else this.addClause([...conds.map((cond) => cond ^ 1), lit]);
258
+ this.manager.endTemporaries(outer);
275
259
  }
276
260
 
277
261
  private getWrappedNode(expr: number) {
278
- return this.manager.withTemporaries(
279
- () => this.expr2enode(this.converter.wrap(expr)),
280
- () => [],
281
- );
262
+ const outer = this.manager.beginTemporaries();
263
+ const wrapped = this.expr2enode(this.converter.wrap(expr));
264
+ this.manager.endTemporaries(outer);
265
+ return wrapped;
282
266
  }
283
267
 
284
268
  override addValue(node: Enode, _model: ProtoModel, values: (number | undefined)[]) {
@@ -1,5 +1,3 @@
1
- // Ported from Z3 (src/ast/euf/euf_mam.h, src/ast/euf/euf_mam.cpp), MIT license, see
2
- // z3-license.txt.
3
1
  import {
4
2
  type AstManager,
5
3
  FAMILY_ARITH,
@@ -44,7 +42,7 @@ import { type Egraph, type Enode, getClass } from "./egraph";
44
42
  import type { TrailStack } from "./th-solver";
45
43
 
46
44
  // euf::mam_solver: the solver whose trail undoes the matcher.
47
- export interface MamSolver {
45
+ interface MamSolver {
48
46
  readonly manager: AstManager;
49
47
  readonly egraph: Egraph;
50
48
  readonly trail: TrailStack;
@@ -55,8 +53,6 @@ export type OnBinding = (
55
53
  pattern: number,
56
54
  bindings: readonly Enode[],
57
55
  maxGeneration: number,
58
- minTopGeneration: number,
59
- maxTopGeneration: number,
60
56
  ) => void;
61
57
 
62
58
  const isAcDecl = (manager: AstManager, decl: number) => {
@@ -85,9 +81,6 @@ class Interpreter {
85
81
  private top = 0;
86
82
  private maxGeneration = 0;
87
83
  private currMaxGeneration = 0;
88
- private patternInstances: Enode[] = [];
89
- private minTopGeneration: number[] = [];
90
- private maxTopGeneration: number[] = [];
91
84
  private acArgs: Enode[] = [];
92
85
  private acBitset: boolean[] = [];
93
86
  private acPatArg: number[] = [];
@@ -97,25 +90,6 @@ class Interpreter {
97
90
  private onBinding: OnBinding,
98
91
  ) {}
99
92
 
100
- private getMinMaxTopGeneration() {
101
- const minTop = this.minTopGeneration;
102
- const maxTop = this.maxTopGeneration;
103
- const instances = this.patternInstances;
104
- if (minTop.length === 0) {
105
- minTop.push(instances[0].generation);
106
- maxTop.push(instances[0].generation);
107
- }
108
- let min = minTop[minTop.length - 1];
109
- let max = maxTop[maxTop.length - 1];
110
- for (let index = minTop.length; index < instances.length; index++) {
111
- min = Math.min(min, instances[index].generation);
112
- minTop.push(min);
113
- max = Math.max(max, instances[index].generation);
114
- maxTop.push(max);
115
- }
116
- return [min, max];
117
- }
118
-
119
93
  private pushPoint(instr: Instruction<Enode>, oldMaxGeneration: number) {
120
94
  let point = this.backtrackStack[this.top];
121
95
  if (point === undefined) {
@@ -353,12 +327,6 @@ class Interpreter {
353
327
  for (point.index++; point.index < point.candidates.length; point.index++) {
354
328
  const node = point.candidates[point.index];
355
329
  if (node.numArgs === instr.numArgs && node.isRelevant) {
356
- const instances = this.patternInstances;
357
- if (instances.length === this.maxTopGeneration.length) {
358
- this.maxTopGeneration.pop();
359
- this.minTopGeneration.pop();
360
- }
361
- instances[instances.length - 1] = node;
362
330
  this.updateMaxGeneration(node);
363
331
  this.setArgs(instr.oreg, node, instr.numArgs);
364
332
  return instr.next;
@@ -374,9 +342,6 @@ class Interpreter {
374
342
  const egraph = this.ctx.egraph;
375
343
  const registers = this.registers;
376
344
  if (!node.isRelevant) return false;
377
- this.patternInstances = [node];
378
- this.minTopGeneration = [];
379
- this.maxTopGeneration = [];
380
345
  this.maxGeneration = node.generation;
381
346
  registers[0] = node;
382
347
  this.top = 0;
@@ -445,15 +410,7 @@ class Interpreter {
445
410
  for (const binding of bindings)
446
411
  this.maxGeneration = Math.max(this.maxGeneration, binding.generation);
447
412
  if (!manager.limit.inc()) return false;
448
- const topGenerations = this.getMinMaxTopGeneration();
449
- this.onBinding(
450
- instr.quantifier,
451
- instr.pattern,
452
- bindings,
453
- this.maxGeneration,
454
- topGenerations[0],
455
- topGenerations[1],
456
- );
413
+ this.onBinding(instr.quantifier, instr.pattern, bindings, this.maxGeneration);
457
414
  break;
458
415
  }
459
416
  case OP_GET_ENODE:
@@ -470,7 +427,7 @@ class Interpreter {
470
427
  )
471
428
  )
472
429
  break;
473
- const found = egraph.findCongruent(instr.label, args, false);
430
+ const found = egraph.findCongruent(instr.label, args);
474
431
  if (found === undefined || !found.isRelevant) break;
475
432
  this.updateMaxGeneration(found);
476
433
  registers[instr.oreg] = found;
@@ -483,7 +440,6 @@ class Interpreter {
483
440
  case OP_CONTINUE: {
484
441
  const found = this.initContinue(instr);
485
442
  if (found === null) break;
486
- this.patternInstances.push(found);
487
443
  this.setArgs(instr.oreg, found, instr.numArgs);
488
444
  pc = instr.next;
489
445
  break;
@@ -634,10 +590,6 @@ export class Mam implements LabelHasher<Enode> {
634
590
  return this.ctx.egraph.find(expr) ?? null;
635
591
  }
636
592
 
637
- canPropagate() {
638
- return this.toMatch.length > 0 || this.newPatterns.length > 0;
639
- }
640
-
641
593
  private setLbls(root: Enode, isParent: boolean, hash: number) {
642
594
  const low = isParent ? root.plbls : root.lbls;
643
595
  const high = isParent ? root.plblsHigh : root.lblsHigh;
@@ -828,7 +780,7 @@ export class Mam implements LabelHasher<Enode> {
828
780
  let groundArgIndex = 0;
829
781
  let groundArg: Enode | null = null;
830
782
  for (let index = 0; index < numArgs; index++)
831
- if (manager.isGround(manager.getArg(pattern, index))) {
783
+ if (manager.isGroundApp(manager.getArg(pattern, index))) {
832
784
  groundArgIndex = index;
833
785
  groundArg = this.getGroundEnode(manager.getArg(pattern, index));
834
786
  break;
@@ -864,7 +816,7 @@ export class Mam implements LabelHasher<Enode> {
864
816
  if (!isFound) paths.push(path);
865
817
  continue;
866
818
  }
867
- if (manager.isGround(child)) {
819
+ if (manager.isGroundApp(child)) {
868
820
  const node = this.getGroundEnode(child);
869
821
  if (node === null) continue;
870
822
  this.updatePlbls(label);
@@ -882,7 +834,7 @@ export class Mam implements LabelHasher<Enode> {
882
834
  addPattern(quantifier: number, pattern: number) {
883
835
  const manager = this.manager;
884
836
  const patterns = manager.getArgs(pattern);
885
- if (patterns.every((arg) => manager.isGround(arg))) return;
837
+ if (patterns.every((arg) => manager.isGroundApp(arg))) return;
886
838
  if (patterns.some((arg) => manager.hasQuantifierFlags[arg])) return;
887
839
  const mp: MultiPattern = { quantifier, pattern, patterns };
888
840
  const numDecls = manager.getQuantifier(quantifier).sorts.length;
@@ -891,7 +843,7 @@ export class Mam implements LabelHasher<Enode> {
891
843
  this.newPatterns.push(mp);
892
844
  this.pushTrail(() => this.newPatterns.pop());
893
845
  patterns.forEach((arg, firstIndex) => {
894
- if (manager.isGround(arg)) return;
846
+ if (manager.isGroundApp(arg)) return;
895
847
  const label = manager.decls[arg];
896
848
  const tree = this.trees.get(label);
897
849
  if (tree !== undefined) {