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,6 @@
1
- // Ported from Z3 (src/sat/sat_solver/inc_sat_solver.cpp), MIT license, see z3-license.txt.
2
1
  import { SmtTacticError, SmtUnsupportedError } from "../../../../errors";
3
2
  import { type AstManager, OP_AND, OP_EQ, OP_IMPLIES, OP_NOT, OP_OR, SORT_BOOL } from "../ast";
3
+ import { mkNot } from "../ast-util";
4
4
  import { BitBlasterRewriter } from "../bit-blast-tactic";
5
5
  import { Goal } from "../goal";
6
6
  import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
@@ -11,7 +11,7 @@ import { convertModel, mkIncSatEufPreprocess, mkIncSatPreprocess } from "../tact
11
11
  import type { SatParams } from "./config";
12
12
  import { Goal2Sat } from "./goal2sat";
13
13
  import { getConsequences } from "./consequences";
14
- import { sat2goal } from "./sat2goal";
14
+ import { isLiteral, sat2goal } from "./sat2goal";
15
15
  import { Solver } from "./solver";
16
16
 
17
17
  const BIT_BLAST_PARAMS = {
@@ -25,6 +25,7 @@ interface Scope {
25
25
  readonly converters: Goal["converters"];
26
26
  readonly fmlsSize: number;
27
27
  readonly fmlsHead: number;
28
+ readonly namesSize: number;
28
29
  }
29
30
 
30
31
  export class IncSatSolver {
@@ -32,6 +33,7 @@ export class IncSatSolver {
32
33
  private readonly goal2sat: Goal2Sat;
33
34
  private readonly fmls: RefVector;
34
35
  private fmlsHead = 0;
36
+ private readonly names: RefVector;
35
37
  private isCnf = true;
36
38
  private readonly core: RefVector;
37
39
  private dep2asm = new Map<number, number>();
@@ -63,23 +65,16 @@ export class IncSatSolver {
63
65
  );
64
66
  if (mkThSolver !== null) this.goal2sat.ensureEuf();
65
67
  this.fmls = new RefVector(manager);
68
+ this.names = new RefVector(manager);
66
69
  this.core = new RefVector(manager);
67
70
  this.converters = new Goal(manager);
68
71
  this.internalized = new RefVector(manager);
69
72
  }
70
73
 
71
- private isLiteral(expr: number) {
72
- const manager = this.manager;
73
- return (
74
- manager.isUninterpretedConst(expr) ||
75
- (manager.isNot(expr) && manager.isUninterpretedConst(manager.getArg(expr, 0)))
76
- );
77
- }
78
-
79
74
  private isClause(expr: number): boolean {
80
75
  const manager = this.manager;
81
76
  if (manager.depths[expr] > 4) return false;
82
- if (this.isLiteral(expr)) return true;
77
+ if (isLiteral(manager, expr)) return true;
83
78
  if (!manager.isApp(expr)) return false;
84
79
  const op = manager.getOp(expr);
85
80
  const isConnective =
@@ -96,6 +91,24 @@ export class IncSatSolver {
96
91
  this.fmls.push(expr);
97
92
  }
98
93
 
94
+ assertNamed(expr: number, name: number) {
95
+ const manager = this.manager;
96
+ this.names.push(name);
97
+ if (this.isCnf && isLiteral(manager, expr) && isLiteral(manager, name))
98
+ return this.assertExpr(manager.mkApp(OP_OR, [mkNot(manager, name), expr], SORT_BOOL));
99
+ if (
100
+ this.isCnf &&
101
+ manager.getOp(expr) === OP_OR &&
102
+ this.isClause(expr) &&
103
+ isLiteral(manager, name)
104
+ )
105
+ return this.assertExpr(
106
+ manager.mkApp(OP_OR, [mkNot(manager, name), ...manager.getArgs(expr)], SORT_BOOL),
107
+ );
108
+ this.isCnf = false;
109
+ this.assertExpr(manager.mkApp(OP_IMPLIES, [name, expr], SORT_BOOL));
110
+ }
111
+
99
112
  // Outside sat.euf, a scope would also need the scopes of the bit-blaster.
100
113
  push() {
101
114
  if (this.goal2sat.euf === null) throw new SmtUnsupportedError("push on the SAT solver");
@@ -106,6 +119,7 @@ export class IncSatSolver {
106
119
  converters: this.converters.converters,
107
120
  fmlsSize: this.fmls.size,
108
121
  fmlsHead: this.fmlsHead,
122
+ namesSize: this.names.size,
109
123
  });
110
124
  }
111
125
 
@@ -118,6 +132,7 @@ export class IncSatSolver {
118
132
  this.converters.converters = scope.converters;
119
133
  this.fmlsHead = scope.fmlsHead;
120
134
  this.fmls.shrink(scope.fmlsSize);
135
+ this.names.shrink(scope.namesSize);
121
136
  }
122
137
  }
123
138
 
@@ -189,7 +204,6 @@ export class IncSatSolver {
189
204
  seen.add(lit);
190
205
  this.asms.push(lit);
191
206
  }
192
- return L_TRUE;
193
207
  }
194
208
 
195
209
  check(assumptions: readonly number[] = []) {
@@ -200,7 +214,7 @@ export class IncSatSolver {
200
214
  const literals: number[] = [];
201
215
  const asm2fml = new Map<number, number>();
202
216
  for (const assumption of assumptions) {
203
- if (this.isLiteral(assumption)) {
217
+ if (isLiteral(this.manager, assumption)) {
204
218
  literals.push(assumption);
205
219
  asm2fml.set(assumption, assumption);
206
220
  continue;
@@ -213,7 +227,7 @@ export class IncSatSolver {
213
227
  this.dep2asm = new Map();
214
228
  const internalized = this.internalizeFormulas();
215
229
  if (internalized !== L_TRUE) return internalized;
216
- this.internalizeAssumptions(literals);
230
+ this.internalizeAssumptions([...literals, ...this.names.items]);
217
231
  this.reasonUnknown = "no reason given";
218
232
  this.isInternalizedConverted = false;
219
233
  const result = this.solver.check(this.asms);
@@ -255,7 +269,7 @@ export class IncSatSolver {
255
269
  const consequences: number[] = [];
256
270
  const internalized = this.internalizeFormulas();
257
271
  if (internalized !== L_TRUE) return { result: internalized, consequences };
258
- if (!assumptions.every((assumption) => this.isLiteral(assumption)))
272
+ if (!assumptions.every((assumption) => isLiteral(this.manager, assumption)))
259
273
  throw new SmtUnsupportedError("get-consequences assumptions that are not literals");
260
274
  this.internalizeAssumptions(assumptions);
261
275
  const found = getConsequences(
@@ -375,6 +389,7 @@ export class IncSatSolver {
375
389
  for (const model of this.models) model.decRef();
376
390
  this.models = [];
377
391
  this.fmls.reset();
392
+ this.names.reset();
378
393
  this.core.reset();
379
394
  this.internalized.reset();
380
395
  this.releaseBitBlaster();
@@ -1,5 +1,3 @@
1
- // Ported from Z3 (src/sat/sat_model_converter.h, src/sat/sat_model_converter.cpp), MIT license,
2
- // see z3-license.txt.
3
1
  import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
4
2
  import { NULL_BOOL_VAR, NULL_LITERAL } from "./clause";
5
3
 
@@ -8,13 +6,12 @@ export const MC_BCE = 1;
8
6
  export const MC_CCE = 2;
9
7
  export const MC_ACCE = 3;
10
8
  export const MC_ABCE = 4;
11
- export const MC_ATE = 5;
9
+ const MC_ATE = 5;
12
10
 
13
11
  export interface McEntry {
14
12
  boolVar: number;
15
13
  kind: number;
16
14
  clauses: number[];
17
- clause: number[];
18
15
  elimStacks: (number[] | undefined)[];
19
16
  }
20
17
 
@@ -26,7 +23,6 @@ const getLitValue = (lit: number, model: Int8Array) => {
26
23
  export class ModelConverter {
27
24
  entries: McEntry[] = [];
28
25
  exposedLim = 0;
29
- private mark: boolean[] = [];
30
26
  elimStack: number[] = [];
31
27
 
32
28
  private processStack(model: Int8Array, clause: number[], stack: number[]) {
@@ -74,7 +70,7 @@ export class ModelConverter {
74
70
  }
75
71
 
76
72
  mk(kind: number, boolVar: number) {
77
- const entry: McEntry = { boolVar, kind, clauses: [], clause: [], elimStacks: [] };
73
+ const entry: McEntry = { boolVar, kind, clauses: [], elimStacks: [] };
78
74
  this.entries.push(entry);
79
75
  return entry;
80
76
  }
@@ -89,19 +85,11 @@ export class ModelConverter {
89
85
  this.elimStack = [];
90
86
  }
91
87
 
92
- setClause(entry: McEntry, lits: number[]) {
93
- entry.clause.push(...lits);
94
- }
95
-
96
88
  insert(entry: McEntry, lits: number[]) {
97
89
  entry.clauses.push(...lits, NULL_LITERAL);
98
90
  this.addElimStack(entry);
99
91
  }
100
92
 
101
- isEmpty() {
102
- return this.entries.length === 0;
103
- }
104
-
105
93
  flush(source: ModelConverter) {
106
94
  this.entries.push(...source.entries);
107
95
  this.exposedLim += source.exposedLim;
@@ -109,14 +97,6 @@ export class ModelConverter {
109
97
  source.exposedLim = 0;
110
98
  }
111
99
 
112
- addClause(lits: number[]) {
113
- if (this.entries.length === 0) return;
114
- for (const lit of lits) {
115
- while (this.mark.length <= lit >> 1) this.mark.push(false);
116
- this.mark[lit >> 1] = true;
117
- }
118
- }
119
-
120
100
  private swap(boolVar: number, size: number, clause: number[]) {
121
101
  for (let index = 0; index < size; index++)
122
102
  if (clause[index] >> 1 === boolVar) {
@@ -1,6 +1,3 @@
1
- // Ported from Z3 (src/sat/smt/pb_constraint.h, src/sat/smt/pb_constraint.cpp,
2
- // src/sat/smt/pb_card.h, src/sat/smt/pb_card.cpp, src/sat/smt/pb_pb.h, src/sat/smt/pb_pb.cpp),
3
- // MIT license, see z3-license.txt.
4
1
  import { L_FALSE } from "../lbool";
5
2
  import { NULL_LITERAL } from "./clause";
6
3
  import { WATCH_EXT_CONSTRAINT, type WatchList } from "./watch-list";
@@ -1,11 +1,17 @@
1
- // Ported from Z3 (src/sat/smt/pb_solver.h, src/sat/smt/pb_solver.cpp,
2
- // src/sat/smt/pb_internalize.cpp), MIT license, see z3-license.txt.
3
1
  import { SmtTacticError } from "../../../../errors";
4
- import { type AstManager, OP_AT_LEAST_K, OP_AT_MOST_K, OP_PB_EQ, OP_PB_GE, OP_PB_LE } from "../ast";
2
+ import {
3
+ type AstManager,
4
+ OP_AT_LEAST_K,
5
+ OP_AT_MOST_K,
6
+ OP_PB_EQ,
7
+ OP_PB_GE,
8
+ OP_PB_LE,
9
+ SORT_BOOL,
10
+ } from "../ast";
5
11
  import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
6
- import { getPbCoeff, getPbK, hasUnitCoefficients } from "../pb-rewriter";
12
+ import { getPbCoeff, getPbK, hasUnitCoefficients, mkPbGe } from "../pb-rewriter";
7
13
  import { Rational } from "../rational";
8
- import { NULL_LITERAL } from "./clause";
14
+ import { NULL_LITERAL, UINT_MAX } from "./clause";
9
15
  import { Card, type Constraint, type ConstraintHost, Pbc } from "./pb-constraint";
10
16
  import {
11
17
  JUSTIFICATION_BINARY,
@@ -16,7 +22,6 @@ import {
16
22
  type Solver,
17
23
  } from "./solver";
18
24
 
19
- const UINT_MAX = 4294967295;
20
25
  const INT_MAX = 2147483647;
21
26
  const INT_MIN = -2147483648;
22
27
 
@@ -1005,14 +1010,6 @@ export class PbSolver implements SatExtension, ConstraintHost {
1005
1010
  this.initWatch(constraint);
1006
1011
  }
1007
1012
 
1008
- private numNonlearnedBin(lit: number) {
1009
- const wlist = this.getWlist(lit ^ 1);
1010
- let count = 0;
1011
- for (let index = 0; index < wlist.size; index++)
1012
- if (wlist.isBinary(index) && !wlist.isLearned(index)) count++;
1013
- return count;
1014
- }
1015
-
1016
1013
  private initUseLists() {
1017
1014
  const solver = this.solver;
1018
1015
  const arena = solver.arena;
@@ -1071,7 +1068,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
1071
1068
  this.value(lit) !== L_UNDEF ||
1072
1069
  this.cnstrUseList[lit].length === 0 ||
1073
1070
  this.useCount(lit ^ 1) !== 0 ||
1074
- this.numNonlearnedBin(lit ^ 1) !== 0
1071
+ this.getWlist(lit).numNonlearnedBin() !== 0
1075
1072
  )
1076
1073
  return false;
1077
1074
  this.solver.assignScoped(lit);
@@ -1323,6 +1320,33 @@ export class PbSolver implements SatExtension, ConstraintHost {
1323
1320
  if (isChanged) lits.splice(0, lits.length, ...members);
1324
1321
  }
1325
1322
 
1323
+ toFormulas(lit2expr: (lit: number) => number, formulas: number[]) {
1324
+ const manager = this.manager;
1325
+ for (const constraint of this.constraints) {
1326
+ const args = constraint.lits.map(lit2expr);
1327
+ const formula =
1328
+ constraint instanceof Pbc
1329
+ ? mkPbGe(
1330
+ manager,
1331
+ constraint.coeffs.map((coeff) => Rational.fromNumber(coeff)),
1332
+ args,
1333
+ Rational.fromNumber(constraint.k),
1334
+ )
1335
+ : manager.mkApp(
1336
+ manager.mkPbDecl(
1337
+ OP_AT_LEAST_K,
1338
+ [Rational.fromNumber(constraint.k)],
1339
+ args.map(() => SORT_BOOL),
1340
+ ),
1341
+ args,
1342
+ SORT_BOOL,
1343
+ );
1344
+ formulas.push(
1345
+ constraint.lit === NULL_LITERAL ? formula : manager.mkEq(lit2expr(constraint.lit), formula),
1346
+ );
1347
+ }
1348
+ }
1349
+
1326
1350
  private active2card() {
1327
1351
  const wlits: { coeff: number; lit: number }[] = [];
1328
1352
  let sum = 0;
@@ -1419,7 +1443,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
1419
1443
  private convertPbWlits(expr: number): WLits {
1420
1444
  const manager = this.manager;
1421
1445
  const lits = this.convertPbArgs(expr);
1422
- const coeffs = lits.map((_, index) =>
1446
+ const coeffs = lits.map((_value, index) =>
1423
1447
  this.checkUnsigned(getPbCoeff(manager, manager.decls[expr], index)),
1424
1448
  );
1425
1449
  return { coeffs, lits };
@@ -1450,7 +1474,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
1450
1474
  this.addRootPbGe(wlits, bound, isSign);
1451
1475
  return NULL_LITERAL;
1452
1476
  }
1453
- const lit = 2 * this.solver.mkVar(true, true);
1477
+ const lit = 2 * this.solver.mkVar(true);
1454
1478
  this.addPbGe(lit, wlits, bound, false);
1455
1479
  return isSign ? lit ^ 1 : lit;
1456
1480
  }
@@ -1462,7 +1486,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
1462
1486
  this.addRootPbGe(wlits, bound, isSign);
1463
1487
  return NULL_LITERAL;
1464
1488
  }
1465
- const lit = 2 * this.solver.mkVar(true, true);
1489
+ const lit = 2 * this.solver.mkVar(true);
1466
1490
  this.addPbGe(lit, wlits, bound, false);
1467
1491
  return isSign ? lit ^ 1 : lit;
1468
1492
  }
@@ -1472,8 +1496,8 @@ export class PbSolver implements SatExtension, ConstraintHost {
1472
1496
  let k = getPbK(this.manager, this.manager.decls[expr]);
1473
1497
  const wlits = this.convertPbWlits(expr);
1474
1498
  const isBaseAssert = isRoot && !isSign;
1475
- const lit1 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true, true);
1476
- const lit2 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true, true);
1499
+ const lit1 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true);
1500
+ const lit2 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true);
1477
1501
  this.addPbGe(lit1, wlits, Number(BigInt.asUintN(32, k.num)), false);
1478
1502
  k = k.neg();
1479
1503
  for (let index = 0; index < wlits.lits.length; index++) {
@@ -1481,7 +1505,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
1481
1505
  k = k.add(Rational.of(BigInt(wlits.coeffs[index])));
1482
1506
  }
1483
1507
  if (k.isNegative()) {
1484
- const lit = 2 * solver.mkVar(false, true);
1508
+ const lit = 2 * solver.mkVar(false);
1485
1509
  solver.assignUnit(lit ^ 1);
1486
1510
  this.si.cache(expr, lit);
1487
1511
  return isSign ? lit ^ 1 : lit;
@@ -1493,7 +1517,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
1493
1517
 
1494
1518
  private mkConjunction(expr: number, lit1: number, lit2: number, isSign: boolean) {
1495
1519
  const solver = this.solver;
1496
- const lit = 2 * solver.mkVar(false, true);
1520
+ const lit = 2 * solver.mkVar(false);
1497
1521
  solver.mkClause([lit ^ 1, lit1]);
1498
1522
  solver.mkClause([lit ^ 1, lit2]);
1499
1523
  solver.mkClause([lit1 ^ 1, lit2 ^ 1, lit]);
@@ -1512,7 +1536,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
1512
1536
  this.addAtLeast(NULL_LITERAL, lits, bound, false);
1513
1537
  return NULL_LITERAL;
1514
1538
  }
1515
- const lit = 2 * this.solver.mkVar(true, true);
1539
+ const lit = 2 * this.solver.mkVar(true);
1516
1540
  this.addAtLeast(lit, lits, bound, false);
1517
1541
  this.si.cache(expr, lit);
1518
1542
  return isSign ? lit ^ 1 : lit;
@@ -1531,7 +1555,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
1531
1555
  this.addAtLeast(NULL_LITERAL, lits, bound, false);
1532
1556
  return NULL_LITERAL;
1533
1557
  }
1534
- const lit = 2 * this.solver.mkVar(true, true);
1558
+ const lit = 2 * this.solver.mkVar(true);
1535
1559
  this.addAtLeast(lit, lits, bound, false);
1536
1560
  this.si.cache(expr, lit);
1537
1561
  return isSign ? lit ^ 1 : lit;
@@ -1541,8 +1565,8 @@ export class PbSolver implements SatExtension, ConstraintHost {
1541
1565
  const solver = this.solver;
1542
1566
  const lits = this.convertPbArgs(expr);
1543
1567
  const isBaseAssert = isRoot && !isSign;
1544
- const lit1 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true, true);
1545
- const lit2 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true, true);
1568
+ const lit1 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true);
1569
+ const lit2 = isBaseAssert ? NULL_LITERAL : 2 * solver.mkVar(true);
1546
1570
  const bound = k.compare(Rational.of(BigInt(lits.length))) > 0 ? lits.length + 1 : Number(k.num);
1547
1571
  this.addAtLeast(lit1, lits, bound, false);
1548
1572
  for (let index = 0; index < lits.length; index++) lits[index] ^= 1;
@@ -1,5 +1,3 @@
1
- // Ported from Z3 (src/sat/sat_probing.h, src/sat/sat_probing.cpp,
2
- // src/sat/sat_simplifier_params.pyg), MIT license, see z3-license.txt.
3
1
  import { L_UNDEF } from "../lbool";
4
2
  import { Big } from "./big";
5
3
  import { getBool, getNumber, type SatParams } from "./config";
@@ -135,26 +133,30 @@ export class Probing {
135
133
  this.big.init(solver, true);
136
134
  const numVars = solver.numVars();
137
135
  this.assigned = new Uint8Array(2 * numVars);
138
- for (let index = 0; index < numVars; index++) {
139
- const boolVar = (this.stoppedAt + index) % numVars;
140
- if (this.counter < -this.limit) {
141
- this.stoppedAt = boolVar;
142
- isComplete = false;
143
- break;
144
- }
145
- if (solver.isInconsistent) break;
146
- if (solver.valueVar(boolVar) !== L_UNDEF || solver.wasEliminated(boolVar)) {
147
- if (this.isCaching) {
148
- this.resetCache(2 * boolVar);
149
- this.resetCache(2 * boolVar + 1);
136
+ try {
137
+ for (let index = 0; index < numVars; index++) {
138
+ const boolVar = (this.stoppedAt + index) % numVars;
139
+ if (this.counter < -this.limit) {
140
+ this.stoppedAt = boolVar;
141
+ isComplete = false;
142
+ break;
143
+ }
144
+ if (solver.isInconsistent) break;
145
+ if (solver.valueVar(boolVar) !== L_UNDEF || solver.wasEliminated(boolVar)) {
146
+ if (this.isCaching) {
147
+ this.resetCache(2 * boolVar);
148
+ this.resetCache(2 * boolVar + 1);
149
+ }
150
+ continue;
150
151
  }
151
- continue;
152
+ solver.checkpoint();
153
+ const oldCounter = this.counter;
154
+ const oldNumAssigned = this.numAssigned;
155
+ this.processCore(boolVar);
156
+ if (this.numAssigned > oldNumAssigned) this.counter = oldCounter;
152
157
  }
153
- solver.checkpoint();
154
- const oldCounter = this.counter;
155
- const oldNumAssigned = this.numAssigned;
156
- this.processCore(boolVar);
157
- if (this.numAssigned > oldNumAssigned) this.counter = oldCounter;
158
+ } finally {
159
+ solver.isProbing = wasProbing;
158
160
  }
159
161
  if (isComplete) this.stoppedAt = 0;
160
162
  this.counter = -this.counter;
@@ -163,7 +165,6 @@ export class Probing {
163
165
  this.assignedLits.length = 0;
164
166
  this.toAssert.length = 0;
165
167
  this.cachedBins = [];
166
- solver.isProbing = wasProbing;
167
168
  return isComplete;
168
169
  }
169
170
  }
@@ -1,9 +1,8 @@
1
- // Ported from Z3 (src/sat/tactic/sat_tactic.cpp), MIT license, see z3-license.txt.
2
1
  import { SmtTacticError } from "../../../../errors";
3
2
  import type { AstManager } from "../ast";
4
3
  import type { ThSolverFactory } from "../euf/euf-solver";
5
4
  import { OVER, type Goal } from "../goal";
6
- import { L_FALSE, L_TRUE } from "../lbool";
5
+ import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
7
6
  import { ProtoModel } from "../proto-model";
8
7
  import type { SatParams } from "./config";
9
8
  import { Goal2Sat } from "./goal2sat";
@@ -21,10 +20,11 @@ export const createSatTactic =
21
20
  goal2sat.run(goal.forms.items);
22
21
  goal.reset();
23
22
  const result = solver.check();
23
+ if (result === L_UNDEF) goal.reasonUnknown = solver.reasonUnknown;
24
24
  const unhandledFuns = goal2sat.euf?.unhandledFunctions ?? goal2sat.unhandledFuns;
25
25
  if (result === L_FALSE) goal.assert(manager.falseExpr);
26
26
  else if (result === L_TRUE && unhandledFuns.length === 0) {
27
- const model = new ProtoModel(manager);
27
+ const model = new ProtoModel(manager).mkModel();
28
28
  for (const [expr, boolVar] of goal2sat.atoms) {
29
29
  if (!manager.isUninterpretedConst(expr)) continue;
30
30
  const value = solver.model[boolVar];
@@ -32,7 +32,7 @@ export const createSatTactic =
32
32
  else if (value === L_FALSE) model.registerConst(manager.decls[expr], manager.falseExpr);
33
33
  }
34
34
  const euf = goal2sat.euf;
35
- goal.model = (euf?.updateModel(model) ?? model).mkModel();
35
+ goal.model = euf?.updateModel(model) ?? model;
36
36
  euf?.validateModel(goal.model);
37
37
  } else {
38
38
  solver.popToBaseLevel();
@@ -1,5 +1,3 @@
1
- // Ported from Z3 (src/sat/tactic/sat2goal.h, src/sat/tactic/sat2goal.cpp,
2
- // src/sat/smt/atom2bool_var.cpp), MIT license, see z3-license.txt.
3
1
  import { SmtCanceledError } from "../../../../errors";
4
2
  import { type AstManager, SORT_BOOL } from "../ast";
5
3
  import type { Definition, Goal } from "../goal";
@@ -7,11 +5,13 @@ import { NULL_LITERAL } from "./clause";
7
5
  import { ModelConverter } from "./model-converter";
8
6
  import type { Solver } from "./solver";
9
7
 
10
- const SMALL_LBD = 3;
11
-
12
8
  const mkNot = (manager: AstManager, expr: number) =>
13
9
  manager.isNot(expr) ? manager.getArg(expr, 0) : manager.mkNot(expr);
14
10
 
11
+ export const isLiteral = (manager: AstManager, expr: number) =>
12
+ manager.isUninterpretedConst(expr) ||
13
+ (manager.isNot(expr) && manager.isUninterpretedConst(manager.getArg(expr, 0)));
14
+
15
15
  class Sat2GoalConverter {
16
16
  readonly smc = new ModelConverter();
17
17
  var2expr: number[] = [];
@@ -19,14 +19,6 @@ class Sat2GoalConverter {
19
19
 
20
20
  constructor(private manager: AstManager) {}
21
21
 
22
- private isLiteral(expr: number) {
23
- const manager = this.manager;
24
- return (
25
- manager.isUninterpretedConst(expr) ||
26
- (manager.isNot(expr) && manager.isUninterpretedConst(manager.getArg(expr, 0)))
27
- );
28
- }
29
-
30
22
  private add(expr: number, def: number) {
31
23
  const manager = this.manager;
32
24
  manager.incRef(def);
@@ -62,7 +54,7 @@ class Sat2GoalConverter {
62
54
  def = manager.mkNot(def);
63
55
  }
64
56
  const expr = this.lit2expr(first);
65
- if (this.isLiteral(expr)) this.add(expr, def);
57
+ if (isLiteral(manager, expr)) this.add(expr, def);
66
58
  clause.length = 0;
67
59
  continue;
68
60
  }
@@ -81,7 +73,7 @@ class Sat2GoalConverter {
81
73
  root ^= 1;
82
74
  }
83
75
  const expr = this.lit2expr(first);
84
- if (this.isLiteral(expr)) this.add(expr, this.lit2expr(root));
76
+ if (isLiteral(manager, expr)) this.add(expr, this.lit2expr(root));
85
77
  index += 5;
86
78
  continue;
87
79
  }
@@ -164,8 +156,10 @@ export const sat2goal = (
164
156
  const arena = solver.arena;
165
157
  for (const clause of solver.clauses) {
166
158
  checkpoint();
167
- if (arena.glue[clause] > SMALL_LBD && arena.isLearned(clause)) continue;
168
159
  goal.assert(manager.mkOr(arena.getLits(clause).map(getExpr)));
169
160
  }
161
+ const formulas: number[] = [];
162
+ solver.ext?.toFormulas(getExpr, formulas);
163
+ for (const formula of formulas) goal.assert(formula);
170
164
  goal.addDefinitions(converter.entries);
171
165
  };
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/sat/sat_scc.h, src/sat/sat_scc.cpp), MIT license, see z3-license.txt.
2
1
  import { Big } from "./big";
3
2
  import { NULL_LITERAL } from "./clause";
4
3
  import type { SatConfig } from "./config";
@@ -8,7 +7,7 @@ import type { Solver } from "./solver";
8
7
  const UNVISITED = -1;
9
8
 
10
9
  export class Scc {
11
- big: Big;
10
+ private big: Big;
12
11
 
13
12
  constructor(
14
13
  private solver: Solver,