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,6 +1,3 @@
1
- // Ported from Z3 (src/sat/smt/q_clause.h, src/sat/smt/q_eval.cpp, src/sat/smt/q_queue.cpp,
2
- // src/sat/smt/q_ematch.cpp, src/smt/smt_quantifier_stat.h, src/util/dlist.h), MIT license, see
3
- // z3-license.txt.
4
1
  import { KIND_VAR, OP_DISTINCT, OP_EQ, QUANTIFIER_EXISTS, QUANTIFIER_FORALL } from "../ast";
5
2
  import { flattenOrVector, mkNot } from "../ast-util";
6
3
  import { PatternInferenceRw } from "../asserted-formulas";
@@ -22,13 +19,6 @@ export interface QLit {
22
19
  readonly sign: boolean;
23
20
  }
24
21
 
25
- // q::quantifier_stat, with the fields the default cost function reads.
26
- interface QuantifierStat {
27
- readonly generation: number;
28
- maxGeneration: number;
29
- maxCost: number;
30
- }
31
-
32
22
  // q::binding: a match of a clause's quantifier, in a circular list of the clause's bindings.
33
23
  export class Binding {
34
24
  next: Binding = this;
@@ -36,10 +26,7 @@ export class Binding {
36
26
 
37
27
  constructor(
38
28
  readonly clause: Clause,
39
- readonly pattern: number,
40
29
  readonly maxGeneration: number,
41
- readonly minTopGeneration: number,
42
- readonly maxTopGeneration: number,
43
30
  readonly nodes: readonly Enode[],
44
31
  ) {}
45
32
  }
@@ -54,15 +41,11 @@ export class Clause {
54
41
  readonly lits: readonly QLit[],
55
42
  readonly q: number,
56
43
  readonly numDecls: number,
57
- readonly stat: QuantifierStat,
58
44
  ) {}
59
45
  }
60
46
 
61
47
  // q::justification: the evidence for a propagation from a binding.
62
48
  interface Justification {
63
- readonly lhs: number;
64
- readonly rhs: number;
65
- readonly sign: boolean;
66
49
  readonly generation: number;
67
50
  readonly explain: readonly number[];
68
51
  readonly clause: Clause;
@@ -217,7 +200,13 @@ class Eval {
217
200
  evidence: EnodePair[],
218
201
  ) {
219
202
  const manager = this.ctx.manager;
220
- if (s === t) return L_TRUE;
203
+ if (
204
+ s === t ||
205
+ (manager.isAlgebraicNumeral(s) &&
206
+ manager.isAlgebraicNumeral(t) &&
207
+ manager.compareArithValues(s, t) === 0)
208
+ )
209
+ return L_TRUE;
221
210
  if (manager.areDistinct(s, t)) return L_FALSE;
222
211
  if (!manager.isApp(s) || !manager.isApp(t)) return L_UNDEF;
223
212
  if (manager.decls[s] !== manager.decls[t]) return L_UNDEF;
@@ -236,7 +225,12 @@ class Eval {
236
225
  return L_TRUE;
237
226
  }
238
227
 
239
- evalExpr(numDecls: number, binding: readonly Enode[], expr: number, evidence: EnodePair[]) {
228
+ private evalExpr(
229
+ numDecls: number,
230
+ binding: readonly Enode[],
231
+ expr: number,
232
+ evidence: EnodePair[],
233
+ ) {
240
234
  const ctx = this.ctx;
241
235
  const manager = ctx.manager;
242
236
  const evals = this.evals;
@@ -275,11 +269,7 @@ class Eval {
275
269
  else todo.push(arg);
276
270
  }
277
271
  if (args.length !== manager.getNumArgs(term)) continue;
278
- const node = ctx.egraph.findCongruent(
279
- manager.decls[term],
280
- args,
281
- args.length === 2 && manager.getOp(term) === OP_EQ,
282
- );
272
+ const node = ctx.egraph.findCongruent(manager.decls[term], args);
283
273
  if (node === undefined) return null;
284
274
  for (let index = args.length; index-- > 0;) {
285
275
  const first = args[index];
@@ -318,14 +308,8 @@ class Queue {
318
308
  this.subst = new VarSubst(ctx.manager, true);
319
309
  }
320
310
 
321
- private getCost(binding: Binding) {
322
- const cost = this.ctx.manager.getQuantifier(binding.clause.q).weight + binding.maxGeneration;
323
- binding.clause.stat.maxCost = Math.max(binding.clause.stat.maxCost, cost);
324
- return cost;
325
- }
326
-
327
311
  insert(binding: Binding) {
328
- const cost = this.getCost(binding);
312
+ const cost = this.ctx.manager.getQuantifier(binding.clause.q).weight + binding.maxGeneration;
329
313
  if (this.newEntries.length === 0) this.ctx.trail.push(() => (this.newEntries = []));
330
314
  this.newEntries.push({ binding, cost, isInstantiated: false });
331
315
  }
@@ -387,19 +371,13 @@ class Queue {
387
371
  }
388
372
  }
389
373
 
390
- interface Prop {
391
- readonly isConflict: boolean;
392
- readonly idx: number;
393
- readonly justification: number;
394
- }
395
-
396
374
  const GENERATION_PROPAGATION_THRESHOLD = 3;
397
375
 
398
376
  export class Ematch {
399
377
  private eval: Eval;
400
378
  private bindings = new Set<string>();
401
379
  private queue: Queue;
402
- private props: Prop[] = [];
380
+ private props: number[] = [];
403
381
  private inferPatterns: PatternInferenceRw;
404
382
  private mam: Mam;
405
383
  private lazyMam: Mam | null = null;
@@ -414,7 +392,6 @@ export class Ematch {
414
392
  private evidence: EnodePair[] = [];
415
393
  private names: DefinedNames;
416
394
  private nnf: Nnf;
417
- private numInstantiations = 0;
418
395
  private subst: VarSubst;
419
396
 
420
397
  constructor(
@@ -448,14 +425,8 @@ export class Ematch {
448
425
  }
449
426
 
450
427
  // mk_justification: the explanation of the evidence, taken while it is created.
451
- private mkJustification(
452
- idx: number,
453
- generation: number,
454
- clause: Clause,
455
- binding: readonly Enode[],
456
- ) {
428
+ private mkJustification(generation: number, clause: Clause, binding: readonly Enode[]) {
457
429
  const ctx = this.ctx;
458
- const lit = idx === -1 ? null : clause.lits[idx];
459
430
  const explain: number[] = [];
460
431
  ctx.egraph.beginExplain();
461
432
  for (const pair of this.evidence) {
@@ -464,9 +435,6 @@ export class Ematch {
464
435
  }
465
436
  ctx.egraph.endExplain();
466
437
  const justification: Justification = {
467
- lhs: lit === null ? -1 : lit.lhs,
468
- rhs: lit === null ? -1 : lit.rhs,
469
- sign: lit === null ? false : lit.sign,
470
438
  generation,
471
439
  explain,
472
440
  clause,
@@ -525,8 +493,7 @@ export class Ematch {
525
493
  const manager = this.ctx.manager;
526
494
  const todo = [expr];
527
495
  const marked = new Set<number>();
528
- while (todo.length > 0) {
529
- const term = todo.pop() as number;
496
+ for (let term = todo.pop(); term !== undefined; term = todo.pop()) {
530
497
  if (marked.has(term)) continue;
531
498
  marked.add(term);
532
499
  if (manager.isGroundApp(term)) {
@@ -550,14 +517,7 @@ export class Ematch {
550
517
  return `${clause.q}:${nodes.map((node) => node.owner).join(",")}`;
551
518
  }
552
519
 
553
- private allocBinding(
554
- clause: Clause,
555
- pattern: number,
556
- nodes: readonly Enode[],
557
- maxGeneration: number,
558
- minTopGeneration: number,
559
- maxTopGeneration: number,
560
- ) {
520
+ private allocBinding(clause: Clause, nodes: readonly Enode[], maxGeneration: number) {
561
521
  if (this.bindings.has(this.getBindingKey(clause, nodes))) return null;
562
522
  if (
563
523
  this.bindings.has(
@@ -568,14 +528,7 @@ export class Ematch {
568
528
  )
569
529
  )
570
530
  return null;
571
- const binding = new Binding(
572
- clause,
573
- pattern,
574
- maxGeneration,
575
- minTopGeneration,
576
- maxTopGeneration,
577
- [...nodes],
578
- );
531
+ const binding = new Binding(clause, maxGeneration, [...nodes]);
579
532
  const key = this.getBindingKey(clause, binding.nodes);
580
533
  this.bindings.add(key);
581
534
  this.ctx.trail.push(() => this.bindings.delete(key));
@@ -584,21 +537,12 @@ export class Ematch {
584
537
 
585
538
  private onBinding = (
586
539
  quantifier: number,
587
- pattern: number,
540
+ _pattern: number,
588
541
  nodes: readonly Enode[],
589
542
  maxGeneration: number,
590
- minTopGeneration: number,
591
- maxTopGeneration: number,
592
543
  ) => {
593
544
  const clause = this.clauses[this.q2clauses.get(quantifier) as number];
594
- const binding = this.allocBinding(
595
- clause,
596
- pattern,
597
- nodes,
598
- maxGeneration,
599
- minTopGeneration,
600
- maxTopGeneration,
601
- );
545
+ const binding = this.allocBinding(clause, nodes, maxGeneration);
602
546
  if (binding === null) return;
603
547
  if (this.propagate(false, nodes, maxGeneration, clause).isDone) return;
604
548
  pushToFront(clause, binding);
@@ -624,14 +568,9 @@ export class Ematch {
624
568
  if (evaluated.value === L_UNDEF && maxGeneration > GENERATION_PROPAGATION_THRESHOLD)
625
569
  return { isDone: false, isPropagated: false };
626
570
  const owned = isOwned ? binding : [...binding];
627
- const justification = this.mkJustification(evaluated.idx, maxGeneration, clause, owned);
571
+ const justification = this.mkJustification(maxGeneration, clause, owned);
628
572
  if (isOwned) this.propagateJustification(justification);
629
- else
630
- this.props.push({
631
- isConflict: evaluated.value === L_FALSE,
632
- idx: evaluated.idx,
633
- justification,
634
- });
573
+ else this.props.push(justification);
635
574
  return { isDone: true, isPropagated: true };
636
575
  }
637
576
 
@@ -647,21 +586,14 @@ export class Ematch {
647
586
  private flushPropQueue() {
648
587
  if (this.props.length === 0) return false;
649
588
  for (let index = 0; index < this.props.length; index++)
650
- this.propagateJustification(this.props[index].justification);
589
+ this.propagateJustification(this.props[index]);
651
590
  this.props = [];
652
591
  return true;
653
592
  }
654
593
 
655
- private instantiateBinding(binding: Binding) {
656
- const stat = binding.clause.stat;
657
- stat.maxGeneration = Math.max(stat.maxGeneration, binding.maxGeneration, stat.generation);
658
- this.numInstantiations++;
659
- this.queue.insert(binding);
660
- }
661
-
662
594
  addInstantiation(clause: Clause, binding: Binding, lit: number) {
663
595
  this.evidence = [];
664
- this.ctx.propagate(lit, this.mkJustification(-1, binding.maxGeneration, clause, binding.nodes));
596
+ this.ctx.propagate(lit, this.mkJustification(binding.maxGeneration, clause, binding.nodes));
665
597
  }
666
598
 
667
599
  private instantiateLit(generation: number, binding: readonly Enode[], lit: QLit) {
@@ -745,15 +677,12 @@ export class Ematch {
745
677
  manager.decRef(q);
746
678
  q = inferred;
747
679
  }
748
- const node = ctx.egraph.find(quantifier);
749
- const generation = node === undefined ? ctx.generation : node.generation;
750
680
  return new Clause(
751
681
  this.clauses.length,
752
682
  isExists ? literal ^ 1 : literal,
753
683
  lits,
754
684
  q,
755
685
  manager.getQuantifier(q).sorts.length,
756
- { generation, maxGeneration: 0, maxCost: 0 },
757
686
  );
758
687
  }
759
688
 
@@ -847,7 +776,7 @@ export class Ematch {
847
776
  isPropagated ||= result.isPropagated;
848
777
  if (result.isDone) toRemove.push(binding);
849
778
  else if (isFlushing) {
850
- this.instantiateBinding(binding);
779
+ this.queue.insert(binding);
851
780
  toRemove.push(binding);
852
781
  isPropagated = true;
853
782
  }
@@ -1,5 +1,3 @@
1
- // Ported from Z3 (src/sat/smt/q_mbi.h, src/sat/smt/q_mbi.cpp,
2
- // src/ast/for_each_expr.cpp), MIT license, see z3-license.txt.
3
1
  import { SmtInvariantError } from "../../../../errors";
4
2
  import {
5
3
  type AstManager,
@@ -410,13 +408,15 @@ export class Mbqi {
410
408
  )
411
409
  continue;
412
410
  visited.add(value);
411
+ const replaced = this.replaceModelValue(value);
413
412
  veqs.push(this.pin(manager.mkEq(sk, expr)));
414
- meqs.push(this.pin(manager.mkEq(sk, this.replaceModelValue(value))));
413
+ meqs.push(this.pin(manager.mkEq(sk, replaced)));
415
414
  bound--;
416
415
  }
417
416
  if (veqs.length === 0) continue;
418
- this.assertExpr(manager.mkOr(meqs));
417
+ const meq = manager.mkOr(meqs);
419
418
  qb.domainEqs.push(manager.mkOr(veqs));
419
+ this.assertExpr(meq);
420
420
  }
421
421
  }
422
422
 
@@ -1,6 +1,3 @@
1
- // Ported from Z3 (src/sat/smt/q_model_fixer.h, src/sat/smt/q_model_fixer.cpp,
2
- // src/model/arith_value_order.h, src/ast/macros/quantifier_macro_info.cpp), MIT license, see
3
- // z3-license.txt.
4
1
  import { SmtInvariantError } from "../../../../errors";
5
2
  import {
6
3
  type AstManager,
@@ -237,7 +234,7 @@ export class ModelFixer {
237
234
  isLess: (first, second) =>
238
235
  manager.isBvNumeral(first) && manager.isBvNumeral(second)
239
236
  ? manager.getBvNumeralValue(first) < manager.getBvNumeralValue(second)
240
- : first < second,
237
+ : manager.ids[first] < manager.ids[second],
241
238
  mkLt: (first, second) =>
242
239
  manager.mkApp(OP_NOT, [mkBvApp(manager, OP_ULEQ, [second, first])], SORT_BOOL),
243
240
  };
@@ -1,5 +1,3 @@
1
- // Ported from Z3 (src/sat/smt/q_solver.h, src/sat/smt/q_solver.cpp), MIT license, see
2
- // z3-license.txt.
3
1
  import {
4
2
  KIND_QUANTIFIER,
5
3
  OP_AND,
@@ -28,7 +26,7 @@ import { Mbqi } from "./q-mbi";
28
26
  import { ThSolver } from "./th-solver";
29
27
 
30
28
  // The family id Z3 gives "quant" when the q solver registers it.
31
- export const FAMILY_QUANT = 15;
29
+ const FAMILY_QUANT = 15;
32
30
 
33
31
  export class QSolver extends ThSolver {
34
32
  private flats = new Map<number, number>();
@@ -124,6 +122,8 @@ export class QSolver extends ThSolver {
124
122
  ...data,
125
123
  kind: data.kind === QUANTIFIER_FORALL ? QUANTIFIER_EXISTS : QUANTIFIER_FORALL,
126
124
  body: manager.mkNot(data.body),
125
+ patterns: [],
126
+ noPatterns: [],
127
127
  }),
128
128
  )
129
129
  : quantifier;
@@ -1,5 +1,3 @@
1
- // Ported from Z3 (src/sat/smt/sat_th.h, src/sat/smt/sat_th.cpp, src/util/trail.h), MIT license,
2
- // see z3-license.txt.
3
1
  import { SmtCanceledError } from "../../../../errors";
4
2
  import { mkNot } from "../ast-util";
5
3
  import type { ProtoModel } from "../proto-model";
@@ -27,10 +25,6 @@ export class TrailStack {
27
25
  this.scopes.length -= numScopes;
28
26
  while (this.undos.length > lim) (this.undos.pop() as () => void)();
29
27
  }
30
-
31
- get numScopes() {
32
- return this.scopes.length;
33
- }
34
28
  }
35
29
 
36
30
  // A th_explain: the literals and equalities that explain a propagation or a conflict.
@@ -111,12 +105,9 @@ export abstract class ThSolver {
111
105
  isBetaRedex(_parent: Enode, _node: Enode) {
112
106
  return false;
113
107
  }
114
- isFixed(_thVar: number, _lits: number[]): number {
115
- return -1;
116
- }
117
108
  addValue(_node: Enode, _model: ProtoModel, _values: (number | undefined)[]) {}
118
109
  addDep(node: Enode, deps: Dependencies) {
119
- deps.set(node, deps.get(node) ?? null);
110
+ deps.set(node, null);
120
111
  return true;
121
112
  }
122
113
  includeFuncInterp(_decl: number) {
@@ -127,7 +118,6 @@ export abstract class ThSolver {
127
118
  hasUnhandled() {
128
119
  return false;
129
120
  }
130
- collectStatistics(_stats: Map<string, number>) {}
131
121
 
132
122
  protected visit(_expr: number) {
133
123
  return false;
@@ -189,11 +179,6 @@ export abstract class ThSolver {
189
179
  return node.getThVar(this.id);
190
180
  }
191
181
 
192
- getThVarOf(expr: number) {
193
- const node = this.ctx.getEnode(expr);
194
- return node === undefined ? NULL_THEORY_VAR : node.getThVar(this.id);
195
- }
196
-
197
182
  getRepresentative(thVar: number) {
198
183
  return this.getThVar(this.var2enode[thVar].root);
199
184
  }
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/sat/smt/euf_solver.cpp), MIT license, see z3-license.txt.
2
1
  import { SmtUnsupportedError } from "../../../../errors";
3
2
  import {
4
3
  FAMILY_ARITH,
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/ast/ast.h), MIT license, see z3-license.txt.
2
1
  import type { AstManager } from "./ast";
3
2
 
4
3
  export const assign = (manager: AstManager, old: number, value: number) => {
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/ast/rewriter/expr_safe_replace.cpp), MIT license, see z3-license.txt.
2
1
  import { SmtInvariantError } from "../../../errors";
3
2
  import { KIND_APP, KIND_VAR, type AstManager } from "./ast";
4
3
  import { RefVector } from "./ref-vector";