tla-ts 0.0.10-dev.8aec06f77 → 0.0.10-dev.8be00045c

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 (509) hide show
  1. package/dist/deciders.cjs +37 -36
  2. package/dist/deciders.js +55 -54
  3. package/dist/index.cjs +1 -1
  4. package/dist/index.d.cts +4 -1
  5. package/dist/index.d.ts +4 -1
  6. package/dist/index.js +1 -1
  7. package/dist/parallel-worker.cjs +1 -1
  8. package/dist/parallel-worker.js +1 -1
  9. package/dist/prove.cjs +146 -58
  10. package/dist/prove.js +143 -55
  11. package/dist/run.cjs +43 -43
  12. package/dist/run.js +45 -45
  13. package/dist/transfer.cjs +29 -26
  14. package/dist/transfer.js +43 -40
  15. package/dist/worker.cjs +1 -1
  16. package/dist/worker.js +1 -1
  17. package/package.json +1 -1
  18. package/src/ast.ts +3 -3
  19. package/src/bags.ts +46 -28
  20. package/src/check-trace.ts +2 -16
  21. package/src/check.ts +336 -88
  22. package/src/cli/runtime-invariants.ts +20 -56
  23. package/src/cli/tlapm.ts +261 -68
  24. package/src/cli/tlc-arguments.ts +2 -2
  25. package/src/cli/tlc-output.ts +4 -5
  26. package/src/cli/tlc-usage.ts +0 -1
  27. package/src/cli/tlc.ts +26 -7
  28. package/src/dependencies.ts +23 -2
  29. package/src/dfid.ts +9 -2
  30. package/src/environment.ts +27 -5
  31. package/src/errors.ts +1 -1
  32. package/src/evaluate.ts +9 -3
  33. package/src/exit-codes.ts +5 -2
  34. package/src/instances.ts +1 -1
  35. package/src/levels.ts +134 -86
  36. package/src/liveness-checker.ts +572 -204
  37. package/src/liveness.ts +47 -32
  38. package/src/obligations/action.ts +0 -2
  39. package/src/obligations/anonymize.ts +2 -6
  40. package/src/obligations/equality.ts +0 -2
  41. package/src/obligations/expression.ts +0 -2
  42. package/src/obligations/format.ts +0 -2
  43. package/src/obligations/generate.ts +0 -2
  44. package/src/obligations/index.ts +5 -3
  45. package/src/obligations/levels.ts +0 -2
  46. package/src/obligations/module.ts +0 -2
  47. package/src/obligations/normalize.ts +0 -2
  48. package/src/obligations/operators.ts +0 -2
  49. package/src/obligations/pragma.ts +2 -2
  50. package/src/obligations/printer.ts +0 -2
  51. package/src/obligations/proof.ts +0 -2
  52. package/src/obligations/regroup.ts +0 -2
  53. package/src/obligations/simplify.ts +0 -2
  54. package/src/obligations/subexpression.ts +0 -2
  55. package/src/obligations/substitution.ts +0 -2
  56. package/src/obligations/temporal.ts +0 -2
  57. package/src/obligations/tuples.ts +0 -2
  58. package/src/parallel-worker.ts +8 -2
  59. package/src/parallel.ts +7 -2
  60. package/src/parser.ts +224 -82
  61. package/src/pretty-print.ts +1 -1
  62. package/src/prover/deciders.ts +1 -8
  63. package/src/prover/isabelle/encode.ts +0 -2
  64. package/src/prover/isabelle/isar/attrib.ts +86 -49
  65. package/src/prover/isabelle/isar/context.ts +25 -26
  66. package/src/prover/isabelle/isar/induct.ts +2 -9
  67. package/src/prover/isabelle/isar/method.ts +5 -9
  68. package/src/prover/isabelle/isar/proof.ts +33 -18
  69. package/src/prover/isabelle/isar/rule-cases.ts +14 -22
  70. package/src/prover/isabelle/isar/theory.ts +16 -17
  71. package/src/prover/isabelle/isar/toplevel.ts +46 -56
  72. package/src/prover/isabelle/isar/type-check.ts +0 -2
  73. package/src/prover/isabelle/provers/blast/blast.ts +0 -2
  74. package/src/prover/isabelle/provers/blast/branch.ts +0 -2
  75. package/src/prover/isabelle/provers/blast/prove.ts +0 -2
  76. package/src/prover/isabelle/provers/blast/rules.ts +0 -2
  77. package/src/prover/isabelle/provers/blast/state.ts +0 -2
  78. package/src/prover/isabelle/provers/blast/term.ts +0 -2
  79. package/src/prover/isabelle/provers/clasimp.ts +1 -3
  80. package/src/prover/isabelle/provers/classical.ts +1 -3
  81. package/src/prover/isabelle/provers/hypsubst.ts +2 -4
  82. package/src/prover/isabelle/pure/bicompose.ts +0 -2
  83. package/src/prover/isabelle/pure/consts.ts +0 -2
  84. package/src/prover/isabelle/pure/conv.ts +0 -2
  85. package/src/prover/isabelle/pure/drule.ts +0 -2
  86. package/src/prover/isabelle/pure/envir.ts +0 -2
  87. package/src/prover/isabelle/pure/goal.ts +0 -2
  88. package/src/prover/isabelle/pure/logic.ts +0 -2
  89. package/src/prover/isabelle/pure/name.ts +0 -2
  90. package/src/prover/isabelle/pure/net.ts +0 -2
  91. package/src/prover/isabelle/pure/object-logic.ts +0 -2
  92. package/src/prover/isabelle/pure/pattern.ts +0 -2
  93. package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
  94. package/src/prover/isabelle/pure/rewriter.ts +0 -2
  95. package/src/prover/isabelle/pure/search.ts +0 -2
  96. package/src/prover/isabelle/pure/seq.ts +0 -2
  97. package/src/prover/isabelle/pure/simplifier.ts +0 -2
  98. package/src/prover/isabelle/pure/table.ts +0 -2
  99. package/src/prover/isabelle/pure/tactic.ts +0 -2
  100. package/src/prover/isabelle/pure/tactical.ts +0 -2
  101. package/src/prover/isabelle/pure/term-ord.ts +0 -2
  102. package/src/prover/isabelle/pure/term.ts +0 -2
  103. package/src/prover/isabelle/pure/thm.ts +0 -2
  104. package/src/prover/isabelle/pure/type.ts +0 -2
  105. package/src/prover/isabelle/pure/unify.ts +0 -2
  106. package/src/prover/isabelle/pure/variable.ts +0 -2
  107. package/src/prover/isabelle/tla/classical-setup.ts +0 -2
  108. package/src/prover/isabelle/tla/simpdata.ts +0 -2
  109. package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
  110. package/src/prover/ocaml.ts +4 -1
  111. package/src/prover/prep/action.ts +1 -0
  112. package/src/prover/prep/methods.ts +50 -3
  113. package/src/prover/prep/normalize.ts +4 -1
  114. package/src/prover/prove.ts +58 -32
  115. package/src/prover/ptl/decide.ts +43 -63
  116. package/src/prover/smt/data.ts +51 -45
  117. package/src/prover/smt/encode.ts +1 -2
  118. package/src/prover/smt/rewrite.ts +3 -7
  119. package/src/prover/smt/simplify.ts +1 -1
  120. package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
  121. package/src/prover/smt/solver/ackr-helper.ts +0 -3
  122. package/src/prover/smt/solver/ackr-model-converter.ts +0 -1
  123. package/src/prover/smt/solver/act-cache.ts +0 -1
  124. package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
  125. package/src/prover/smt/solver/aig-tactic.ts +25 -16
  126. package/src/prover/smt/solver/aig.ts +2 -3
  127. package/src/prover/smt/solver/arith-rewriter.ts +3 -6
  128. package/src/prover/smt/solver/arith-terms.ts +0 -2
  129. package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
  130. package/src/prover/smt/solver/array-rewriter.ts +0 -1
  131. package/src/prover/smt/solver/asserted-formulas.ts +9 -3
  132. package/src/prover/smt/solver/ast-lt.ts +1 -2
  133. package/src/prover/smt/solver/ast-util.ts +3 -3
  134. package/src/prover/smt/solver/ast.ts +112 -156
  135. package/src/prover/smt/solver/auf-solver.ts +0 -1
  136. package/src/prover/smt/solver/bit-blast-tactic.ts +0 -3
  137. package/src/prover/smt/solver/bit-blaster.ts +0 -3
  138. package/src/prover/smt/solver/bound-manager.ts +39 -29
  139. package/src/prover/smt/solver/bound-simplifier.ts +0 -2
  140. package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
  141. package/src/prover/smt/solver/bv-decl-plugin.ts +0 -1
  142. package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
  143. package/src/prover/smt/solver/bv-rewriter.ts +15 -19
  144. package/src/prover/smt/solver/bv1-blast.ts +1 -11
  145. package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
  146. package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
  147. package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
  148. package/src/prover/smt/solver/card2bv.ts +1 -4
  149. package/src/prover/smt/solver/case-split-queue.ts +0 -2
  150. package/src/prover/smt/solver/cg-table.ts +19 -16
  151. package/src/prover/smt/solver/check-logic.ts +6 -2
  152. package/src/prover/smt/solver/clause.ts +0 -1
  153. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +0 -2
  154. package/src/prover/smt/solver/conflict-resolution.ts +0 -1
  155. package/src/prover/smt/solver/context.ts +41 -14
  156. package/src/prover/smt/solver/ctx-simplify.ts +1 -3
  157. package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
  158. package/src/prover/smt/solver/datatype-decl-plugin.ts +0 -1
  159. package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
  160. package/src/prover/smt/solver/demodulator.ts +2 -5
  161. package/src/prover/smt/solver/dependent-expr-state.ts +16 -3
  162. package/src/prover/smt/solver/der.ts +0 -1
  163. package/src/prover/smt/solver/diff-neq.ts +1 -3
  164. package/src/prover/smt/solver/distribute-forall.ts +1 -11
  165. package/src/prover/smt/solver/dom-simplify.ts +1 -3
  166. package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
  167. package/src/prover/smt/solver/dyn-ack.ts +0 -1
  168. package/src/prover/smt/solver/e-matching.ts +6 -7
  169. package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
  170. package/src/prover/smt/solver/elim-uncnstr.ts +7 -23
  171. package/src/prover/smt/solver/enode.ts +15 -2
  172. package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
  173. package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
  174. package/src/prover/smt/solver/euf/arith-internalize.ts +1 -3
  175. package/src/prover/smt/solver/euf/arith-solver.ts +0 -1
  176. package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
  177. package/src/prover/smt/solver/euf/array-internalize.ts +20 -11
  178. package/src/prover/smt/solver/euf/array-solver.ts +0 -2
  179. package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
  180. package/src/prover/smt/solver/euf/bv-internalize.ts +1 -3
  181. package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
  182. package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
  183. package/src/prover/smt/solver/euf/egraph.ts +68 -43
  184. package/src/prover/smt/solver/euf/euf-solver.ts +36 -23
  185. package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
  186. package/src/prover/smt/solver/euf/mam.ts +7 -55
  187. package/src/prover/smt/solver/euf/q-ematch.ts +21 -97
  188. package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
  189. package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
  190. package/src/prover/smt/solver/euf/q-solver.ts +2 -2
  191. package/src/prover/smt/solver/euf/th-solver.ts +1 -10
  192. package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
  193. package/src/prover/smt/solver/expr-ref.ts +0 -1
  194. package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
  195. package/src/prover/smt/solver/expr2polynomial.ts +204 -80
  196. package/src/prover/smt/solver/factor.ts +37 -26
  197. package/src/prover/smt/solver/fd-solver.ts +3 -5
  198. package/src/prover/smt/solver/fingerprints.ts +0 -1
  199. package/src/prover/smt/solver/fix-dl-var.ts +1 -3
  200. package/src/prover/smt/solver/flat-literals.ts +0 -1
  201. package/src/prover/smt/solver/fm-tactic.ts +19 -14
  202. package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
  203. package/src/prover/smt/solver/fpa-rewriter.ts +2 -2
  204. package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
  205. package/src/prover/smt/solver/fpa2bv-rewriter.ts +0 -1
  206. package/src/prover/smt/solver/fpa2bv-tactic.ts +0 -2
  207. package/src/prover/smt/solver/goal.ts +3 -2
  208. package/src/prover/smt/solver/goal2nlsat.ts +57 -32
  209. package/src/prover/smt/solver/guard-set.ts +0 -1
  210. package/src/prover/smt/solver/hash.ts +0 -1
  211. package/src/prover/smt/solver/hashtable.ts +0 -1
  212. package/src/prover/smt/solver/inf-eps.ts +1 -2
  213. package/src/prover/smt/solver/inj-axiom.ts +0 -1
  214. package/src/prover/smt/solver/internalizer.ts +41 -3
  215. package/src/prover/smt/solver/lackr.ts +0 -2
  216. package/src/prover/smt/solver/lbool.ts +0 -1
  217. package/src/prover/smt/solver/lia2card.ts +0 -1
  218. package/src/prover/smt/solver/lia2pb.ts +18 -5
  219. package/src/prover/smt/solver/literal.ts +0 -1
  220. package/src/prover/smt/solver/logic-tactics.ts +0 -4
  221. package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
  222. package/src/prover/smt/solver/lp/constraints.ts +0 -1
  223. package/src/prover/smt/solver/lp/containers.ts +7 -2
  224. package/src/prover/smt/solver/lp/core-solver.ts +0 -3
  225. package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
  226. package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
  227. package/src/prover/smt/solver/lp/dependency.ts +0 -2
  228. package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
  229. package/src/prover/smt/solver/lp/explanation.ts +0 -1
  230. package/src/prover/smt/solver/lp/gomory.ts +0 -1
  231. package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
  232. package/src/prover/smt/solver/lp/hnf.ts +0 -3
  233. package/src/prover/smt/solver/lp/int-cube.ts +0 -1
  234. package/src/prover/smt/solver/lp/int-solver.ts +0 -2
  235. package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
  236. package/src/prover/smt/solver/lp/lar-term.ts +0 -1
  237. package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
  238. package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
  239. package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
  240. package/src/prover/smt/solver/lp/nex.ts +2 -2
  241. package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
  242. package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
  243. package/src/prover/smt/solver/lp/nla-core.ts +26 -7
  244. package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
  245. package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
  246. package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
  247. package/src/prover/smt/solver/lp/nla-grobner.ts +158 -82
  248. package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
  249. package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
  250. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
  251. package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
  252. package/src/prover/smt/solver/lp/nla-order.ts +0 -2
  253. package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
  254. package/src/prover/smt/solver/lp/nla-powers.ts +144 -108
  255. package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
  256. package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
  257. package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -19
  258. package/src/prover/smt/solver/lp/nla-types.ts +0 -2
  259. package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
  260. package/src/prover/smt/solver/lp/nra-solver.ts +138 -97
  261. package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
  262. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
  263. package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
  264. package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
  265. package/src/prover/smt/solver/lp/pdd.ts +725 -290
  266. package/src/prover/smt/solver/lp/random-updater.ts +0 -2
  267. package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
  268. package/src/prover/smt/solver/lp/union-find.ts +1 -2
  269. package/src/prover/smt/solver/macro-finder.ts +1 -4
  270. package/src/prover/smt/solver/mam-compiler.ts +14 -15
  271. package/src/prover/smt/solver/mam-interpreter.ts +0 -1
  272. package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
  273. package/src/prover/smt/solver/max-cliques.ts +0 -2
  274. package/src/prover/smt/solver/maxcore.ts +5 -14
  275. package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -1
  276. package/src/prover/smt/solver/maxlex.ts +0 -8
  277. package/src/prover/smt/solver/maxsmt-base.ts +7 -1
  278. package/src/prover/smt/solver/maxsmt.ts +0 -1
  279. package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
  280. package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
  281. package/src/prover/smt/solver/mbp/mbp-plugin.ts +9 -2
  282. package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
  283. package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
  284. package/src/prover/smt/solver/mbp/mbp-term-graph.ts +0 -1
  285. package/src/prover/smt/solver/model-based-opt.ts +1 -2
  286. package/src/prover/smt/solver/model-checker.ts +0 -1
  287. package/src/prover/smt/solver/model-evaluator.ts +9 -6
  288. package/src/prover/smt/solver/model-finder.ts +0 -1
  289. package/src/prover/smt/solver/model-generator.ts +3 -2
  290. package/src/prover/smt/solver/model-macro-solver.ts +3 -4
  291. package/src/prover/smt/solver/model-printer.ts +0 -1
  292. package/src/prover/smt/solver/mpf.ts +2 -5
  293. package/src/prover/smt/solver/mus.ts +1 -3
  294. package/src/prover/smt/solver/muz/dl-context.ts +67 -9
  295. package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
  296. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
  297. package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
  298. package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -2
  299. package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
  300. package/src/prover/smt/solver/muz/dl-mk-slice.ts +78 -16
  301. package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
  302. package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -1
  303. package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
  304. package/src/prover/smt/solver/muz/dl-rule.ts +95 -33
  305. package/src/prover/smt/solver/muz/hnf.ts +6 -6
  306. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
  307. package/src/prover/smt/solver/muz/horn-tactic.ts +15 -6
  308. package/src/prover/smt/solver/muz/rule-properties.ts +194 -37
  309. package/src/prover/smt/solver/muz/spacer-context.ts +104 -89
  310. package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -3
  311. package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
  312. package/src/prover/smt/solver/muz/spacer-manager.ts +0 -2
  313. package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
  314. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +3 -9
  315. package/src/prover/smt/solver/muz/spacer-util.ts +2 -3
  316. package/src/prover/smt/solver/muz/substitution.ts +88 -39
  317. package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
  318. package/src/prover/smt/solver/nlqsat.ts +4 -4
  319. package/src/prover/smt/solver/nlsat/algebraic.ts +194 -93
  320. package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
  321. package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
  322. package/src/prover/smt/solver/nlsat/explain.ts +379 -217
  323. package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
  324. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
  325. package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
  326. package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
  327. package/src/prover/smt/solver/nlsat/solver.ts +112 -99
  328. package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
  329. package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
  330. package/src/prover/smt/solver/nlsat/types.ts +0 -2
  331. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
  332. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
  333. package/src/prover/smt/solver/nlsat-tactic.ts +0 -1
  334. package/src/prover/smt/solver/nnf.ts +0 -1
  335. package/src/prover/smt/solver/normalize-bounds.ts +0 -1
  336. package/src/prover/smt/solver/occf.ts +0 -1
  337. package/src/prover/smt/solver/opt-context.ts +15 -10
  338. package/src/prover/smt/solver/opt-nlsat.ts +97 -77
  339. package/src/prover/smt/solver/opt-pareto.ts +0 -2
  340. package/src/prover/smt/solver/opt-preprocess.ts +0 -1
  341. package/src/prover/smt/solver/opt-solver.ts +22 -11
  342. package/src/prover/smt/solver/opt-value.ts +0 -1
  343. package/src/prover/smt/solver/optsmt.ts +13 -12
  344. package/src/prover/smt/solver/parallel-tactic.ts +0 -2
  345. package/src/prover/smt/solver/pattern-inference.ts +2 -3
  346. package/src/prover/smt/solver/pb-rewriter.ts +14 -20
  347. package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
  348. package/src/prover/smt/solver/poly-rewriter.ts +2 -3
  349. package/src/prover/smt/solver/probes.ts +4 -7
  350. package/src/prover/smt/solver/propagate-values.ts +4 -1
  351. package/src/prover/smt/solver/proto-model.ts +6 -7
  352. package/src/prover/smt/solver/pull-quant.ts +0 -1
  353. package/src/prover/smt/solver/purify-arith.ts +50 -16
  354. package/src/prover/smt/solver/qe-arith-plugin.ts +4 -7
  355. package/src/prover/smt/solver/qe-lite-der.ts +0 -1
  356. package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
  357. package/src/prover/smt/solver/qe-lite.ts +0 -1
  358. package/src/prover/smt/solver/qe-mbp.ts +13 -24
  359. package/src/prover/smt/solver/qe.ts +48 -57
  360. package/src/prover/smt/solver/qel.ts +0 -1
  361. package/src/prover/smt/solver/qi-queue.ts +0 -1
  362. package/src/prover/smt/solver/qsat.ts +70 -91
  363. package/src/prover/smt/solver/quant-hoist.ts +0 -1
  364. package/src/prover/smt/solver/quant-tactics.ts +0 -1
  365. package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
  366. package/src/prover/smt/solver/quantifier-manager.ts +14 -10
  367. package/src/prover/smt/solver/quasi-macros.ts +9 -20
  368. package/src/prover/smt/solver/random-gen.ts +0 -1
  369. package/src/prover/smt/solver/rational.ts +17 -1
  370. package/src/prover/smt/solver/recfun-decl-plugin.ts +35 -21
  371. package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
  372. package/src/prover/smt/solver/reduce-args.ts +0 -1
  373. package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
  374. package/src/prover/smt/solver/ref-vector.ts +0 -1
  375. package/src/prover/smt/solver/relevancy.ts +0 -1
  376. package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
  377. package/src/prover/smt/solver/rewriter.ts +1 -2
  378. package/src/prover/smt/solver/rlimit.ts +13 -1
  379. package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
  380. package/src/prover/smt/solver/sat/big.ts +0 -1
  381. package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
  382. package/src/prover/smt/solver/sat/clause.ts +1 -6
  383. package/src/prover/smt/solver/sat/cleaner.ts +0 -2
  384. package/src/prover/smt/solver/sat/config.ts +4 -7
  385. package/src/prover/smt/solver/sat/consequences.ts +1 -2
  386. package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
  387. package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
  388. package/src/prover/smt/solver/sat/inc-sat-solver.ts +4 -13
  389. package/src/prover/smt/solver/sat/model-converter.ts +2 -18
  390. package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
  391. package/src/prover/smt/solver/sat/pb-solver.ts +50 -26
  392. package/src/prover/smt/solver/sat/probing.ts +22 -21
  393. package/src/prover/smt/solver/sat/sat-tactic.ts +2 -2
  394. package/src/prover/smt/solver/sat/sat2goal.ts +9 -12
  395. package/src/prover/smt/solver/sat/scc.ts +0 -1
  396. package/src/prover/smt/solver/sat/simplifier.ts +16 -60
  397. package/src/prover/smt/solver/sat/solver.ts +45 -68
  398. package/src/prover/smt/solver/sat/var-queue.ts +0 -2
  399. package/src/prover/smt/solver/sat/watch-list.ts +7 -3
  400. package/src/prover/smt/solver/search-tree.ts +0 -1
  401. package/src/prover/smt/solver/seq-axioms.ts +20 -36
  402. package/src/prover/smt/solver/seq-decl-plugin.ts +7 -8
  403. package/src/prover/smt/solver/seq-derive.ts +9 -15
  404. package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
  405. package/src/prover/smt/solver/seq-eq-solver.ts +9 -10
  406. package/src/prover/smt/solver/seq-factory.ts +0 -1
  407. package/src/prover/smt/solver/seq-monadic.ts +7 -7
  408. package/src/prover/smt/solver/seq-range-predicate.ts +14 -3
  409. package/src/prover/smt/solver/seq-re-rewriter.ts +3 -12
  410. package/src/prover/smt/solver/seq-re-util.ts +2 -5
  411. package/src/prover/smt/solver/seq-regex-bisim.ts +2 -3
  412. package/src/prover/smt/solver/seq-regex-live.ts +6 -8
  413. package/src/prover/smt/solver/seq-rewriter.ts +31 -34
  414. package/src/prover/smt/solver/seq-skolem.ts +0 -24
  415. package/src/prover/smt/solver/seq-subset.ts +0 -1
  416. package/src/prover/smt/solver/seq-view-witness.ts +4 -6
  417. package/src/prover/smt/solver/smt-consequences.ts +0 -2
  418. package/src/prover/smt/solver/smt-kernel.ts +8 -3
  419. package/src/prover/smt/solver/smt-logics.ts +0 -1
  420. package/src/prover/smt/solver/smt-setup.ts +18 -14
  421. package/src/prover/smt/solver/smt2-printer.ts +0 -2
  422. package/src/prover/smt/solver/smtlib-parser.ts +1187 -592
  423. package/src/prover/smt/solver/smtlib-script.ts +957 -750
  424. package/src/prover/smt/solver/solve-eqs.ts +11 -19
  425. package/src/prover/smt/solver/solver.ts +1 -2
  426. package/src/prover/smt/solver/static-features.ts +0 -2
  427. package/src/prover/smt/solver/sticky-generations.ts +0 -1
  428. package/src/prover/smt/solver/tactic.ts +77 -18
  429. package/src/prover/smt/solver/term-enumeration.ts +0 -1
  430. package/src/prover/smt/solver/theory-array.ts +25 -60
  431. package/src/prover/smt/solver/theory-bv.ts +15 -54
  432. package/src/prover/smt/solver/theory-char.ts +0 -1
  433. package/src/prover/smt/solver/theory-datatype.ts +0 -1
  434. package/src/prover/smt/solver/theory-finite-set.ts +2 -2
  435. package/src/prover/smt/solver/theory-fpa.ts +46 -79
  436. package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
  437. package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
  438. package/src/prover/smt/solver/theory-lra-final-check.ts +0 -2
  439. package/src/prover/smt/solver/theory-lra-internalize.ts +8 -1
  440. package/src/prover/smt/solver/theory-lra-model.ts +0 -1
  441. package/src/prover/smt/solver/theory-lra-propagate.ts +0 -3
  442. package/src/prover/smt/solver/theory-lra-state.ts +0 -1
  443. package/src/prover/smt/solver/theory-lra.ts +0 -2
  444. package/src/prover/smt/solver/theory-pb.ts +12 -11
  445. package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
  446. package/src/prover/smt/solver/theory-recfun.ts +2 -3
  447. package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
  448. package/src/prover/smt/solver/theory-seq-solve.ts +6 -8
  449. package/src/prover/smt/solver/theory-seq-state.ts +8 -26
  450. package/src/prover/smt/solver/theory-seq.ts +32 -55
  451. package/src/prover/smt/solver/theory.ts +16 -2
  452. package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
  453. package/src/prover/smt/solver/var-subst.ts +2 -3
  454. package/src/prover/smt/table.ts +3 -2
  455. package/src/prover/zenon/decide.ts +9 -13
  456. package/src/prover/zenon/encode.ts +0 -2
  457. package/src/prover/zenon/eqrel.ts +0 -2
  458. package/src/prover/zenon/equality-rules.ts +24 -2
  459. package/src/prover/zenon/expr.ts +21 -2
  460. package/src/prover/zenon/index-table.ts +7 -4
  461. package/src/prover/zenon/isar-case.ts +1 -3
  462. package/src/prover/zenon/isar.ts +2 -4
  463. package/src/prover/zenon/llproof.ts +0 -2
  464. package/src/prover/zenon/mltoll.ts +0 -2
  465. package/src/prover/zenon/node.ts +12 -13
  466. package/src/prover/zenon/parse.ts +0 -2
  467. package/src/prover/zenon/phrase.ts +1 -3
  468. package/src/prover/zenon/proof.ts +0 -2
  469. package/src/prover/zenon/propositional-rules.ts +0 -2
  470. package/src/prover/zenon/rules.ts +2 -3
  471. package/src/prover/zenon/search.ts +0 -2
  472. package/src/prover/zenon/tla/functions.ts +0 -2
  473. package/src/prover/zenon/tla/llproof.ts +0 -2
  474. package/src/prover/zenon/tla/records.ts +0 -2
  475. package/src/prover/zenon/tla/rewrites.ts +0 -2
  476. package/src/prover/zenon/tla/sets.ts +1 -3
  477. package/src/prover/zenon/tla/terms.ts +0 -2
  478. package/src/prover/zenon/tla/tla.ts +0 -2
  479. package/src/resolve.ts +264 -77
  480. package/src/runtime.ts +6 -0
  481. package/src/sany/generation.ts +1 -13
  482. package/src/sany/generator-definitions.ts +2 -1
  483. package/src/sany/generator-expressions.ts +30 -27
  484. package/src/sany/generator-proofs.ts +1 -1
  485. package/src/sany/generator.ts +2 -1
  486. package/src/sany/levels.ts +0 -2
  487. package/src/sany/linter.ts +0 -2
  488. package/src/sany/nodes.ts +1 -1
  489. package/src/sany/selectors.ts +6 -5
  490. package/src/search.ts +198 -45
  491. package/src/simulate.ts +3 -0
  492. package/src/standard-definitions.ts +4 -0
  493. package/src/state-graph.ts +0 -2
  494. package/src/subexpressions.ts +165 -78
  495. package/src/successors.ts +1 -1
  496. package/src/symmetry.ts +2 -2
  497. package/src/tableau.ts +2 -2
  498. package/src/tlc/fingerprint.ts +81 -9
  499. package/src/tlc/jar-data.ts +12 -0
  500. package/src/tlc/order.ts +14 -3
  501. package/src/tlc/summary.ts +29 -14
  502. package/src/tlc/tlcext-operators.ts +61 -16
  503. package/src/tlc/trace-spec.ts +2 -3
  504. package/src/typed-tier.ts +6541 -0
  505. package/src/typescript/types.ts +2 -2
  506. package/src/values.ts +1 -1
  507. package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
  508. package/src/prover/smt/solver/z3-license.txt +0 -10
  509. package/src/prover/zenon/LICENSE +0 -32
@@ -1,5 +1,3 @@
1
- // Ported from Z3 (src/muz/base/dl_context.cpp, src/muz/base/dl_engine_base.h), MIT license, see
2
- // z3-license.txt.
3
1
  import { SmtTacticError, SmtUnsupportedError } from "../../../../errors";
4
2
  import {
5
3
  type AstManager,
@@ -11,6 +9,9 @@ import {
11
9
  SORT_BOOL,
12
10
  SORT_SIZE_INFINITE,
13
11
  } from "../ast";
12
+ import type { Definition } from "../goal";
13
+ import { ModelEvaluator } from "../model-evaluator";
14
+ import { FuncInterp, type ProtoModel } from "../proto-model";
14
15
  import { type RewriterOptions, Rewriter } from "../rewriter";
15
16
  import { RefVector } from "../ref-vector";
16
17
  import { applyQeLiteToConjuncts } from "../qe-lite";
@@ -37,9 +38,13 @@ const ENGINE_NAMES = new Map([
37
38
  ["ddnf", ENGINE_DDNF],
38
39
  ]);
39
40
 
40
- // The fp module's parameters, which Z3 keeps as global parameters across resets.
41
+ // As in Z3, these are copied when the context is made, so a later fp option doesn't apply.
41
42
  export class FpParams {
42
- constructor(private parameters: ReadonlyMap<string, string>) {}
43
+ private parameters: ReadonlyMap<string, string>;
44
+
45
+ constructor(parameters: ReadonlyMap<string, string>) {
46
+ this.parameters = new Map(parameters);
47
+ }
43
48
 
44
49
  getBool(name: string, defaultValue: boolean) {
45
50
  const value = this.parameters.get(`fp.${name}`);
@@ -56,8 +61,45 @@ export class FpParams {
56
61
  }
57
62
  }
58
63
 
64
+ export type ModelConverter = (model: ProtoModel) => ProtoModel;
65
+
66
+ // generic_model_converter::operator() over predicates, where a definition of -1 hides the
67
+ // declaration.
68
+ const applyDefinitions = (definitions: readonly Definition[], model: ProtoModel) => {
69
+ const manager = model.manager;
70
+ let evaluator = new ModelEvaluator(manager, model);
71
+ evaluator.setModelCompletion(true);
72
+ for (let index = definitions.length - 1; index >= 0; index--) {
73
+ const definition = definitions[index];
74
+ if (definition.def === -1) {
75
+ model.unregisterDecl(definition.decl);
76
+ continue;
77
+ }
78
+ const value = evaluator.rewrite(definition.def);
79
+ const arity = manager.funcDecls[definition.decl].domain.length;
80
+ const oldInterp = model.funcInterps.get(definition.decl);
81
+ const old = arity === 0 ? model.constInterps.get(definition.decl) : oldInterp?.elseExpr;
82
+ if (old !== value) {
83
+ if (arity === 0) model.registerConst(definition.decl, value);
84
+ else {
85
+ const interp = new FuncInterp(manager, arity);
86
+ interp.setElse(value);
87
+ model.registerFunc(definition.decl, interp);
88
+ }
89
+ }
90
+ manager.decRef(value);
91
+ if (old === value || (arity === 0 ? old === undefined : oldInterp === undefined)) continue;
92
+ evaluator.release();
93
+ evaluator = new ModelEvaluator(manager, model);
94
+ evaluator.setModelCompletion(true);
95
+ }
96
+ evaluator.release();
97
+ return model;
98
+ };
99
+
59
100
  export interface Engine {
60
101
  query(query: number): number;
102
+ getModel(): ProtoModel;
61
103
  }
62
104
 
63
105
  type EngineFactory = (context: DatalogContext, engine: number) => Engine;
@@ -77,12 +119,14 @@ export class DatalogContext {
77
119
  private engineType = ENGINE_LAST;
78
120
  private engine: Engine | undefined;
79
121
  readonly rewriter: Rewriter;
80
- hasModelConverter = false;
122
+ // m_mc: the converters since the last query, or undefined before one.
123
+ modelConverters: ModelConverter[] | undefined;
124
+ isBounded = false;
81
125
 
82
126
  constructor(
83
127
  readonly manager: AstManager,
84
128
  readonly params: FpParams,
85
- rewriterOptions: RewriterOptions,
129
+ readonly rewriterOptions: RewriterOptions,
86
130
  private engineFactory: EngineFactory,
87
131
  ) {
88
132
  this.ruleManager = new RuleManager(manager, this);
@@ -288,12 +332,26 @@ export class DatalogContext {
288
332
  }
289
333
 
290
334
  query(query: number) {
291
- this.hasModelConverter = true;
335
+ this.modelConverters = [];
336
+ this.isBounded = false;
292
337
  this.getEngine(query);
293
338
  this.flushAddRules();
294
339
  return this.ensureEngine(query).query(query);
295
340
  }
296
341
 
342
+ addGenericModelConverter(definitions: readonly Definition[]) {
343
+ if (this.modelConverters === undefined) return;
344
+ for (const definition of definitions) {
345
+ this.manager.incDeclRef(definition.decl);
346
+ if (definition.def !== -1) this.manager.incRef(definition.def);
347
+ }
348
+ this.modelConverters.push((model) => applyDefinitions(definitions, model));
349
+ }
350
+
351
+ getModel() {
352
+ return this.ensureEngine().getModel();
353
+ }
354
+
297
355
  // engine_base::query over one relation.
298
356
  relQuery(relation: number) {
299
357
  const manager = this.manager;
@@ -310,7 +368,7 @@ export class DatalogContext {
310
368
  : mkExists(
311
369
  manager,
312
370
  [...domain].reverse(),
313
- domain.map((_, index) => String(index)).reverse(),
371
+ domain.map((_value, index) => String(index)).reverse(),
314
372
  atom,
315
373
  );
316
374
  manager.incRef(query);
@@ -343,7 +401,7 @@ export class DatalogContext {
343
401
  ...conjs.items.map((conj) => this.ruleManager.ensureApp(conj)),
344
402
  ];
345
403
  const isNegated = tail.map(
346
- (_, index) => index < rule.uninterpretedSize && rule.isNegated[index],
404
+ (_value, index) => index < rule.uninterpretedSize && rule.isNegated[index],
347
405
  );
348
406
  const reduced = this.ruleManager.mk(rule.head, tail, isNegated, rule.name);
349
407
  conjs.reset();
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/muz/transforms/dl_mk_bit_blast.cpp), MIT license, see z3-license.txt.
2
1
  import { type AstManager, FAMILY_USER, getSymbolName, OP_MKBV, SORT_BOOL } from "../ast";
3
2
  import { BitBlasterRewriter } from "../bit-blast-tactic";
4
3
  import { type Rewrite, RewriterTpl } from "../rewriter-tpl";
@@ -1,6 +1,7 @@
1
- // Ported from Z3 (src/muz/transforms/dl_mk_coi_filter.cpp, src/muz/dataflow/dataflow.h,
2
- // src/muz/dataflow/reachability.h), MIT license, see z3-license.txt.
1
+ import { ObjHashtable, ObjMap } from "../hashtable";
3
2
  import type { DatalogContext } from "./dl-context";
3
+ import type { Rule } from "./dl-rule";
4
+ import { HornSubsumeModelConverter } from "./horn-subsume-model-converter";
4
5
  import { RuleSet } from "./dl-rule-set";
5
6
  import type { RuleTransformerPlugin } from "./dl-rule-transformer";
6
7
 
@@ -15,30 +16,50 @@ export class MkCoiFilter implements RuleTransformerPlugin {
15
16
  return this.bottomUp(topDown ?? source) ?? topDown;
16
17
  }
17
18
 
18
- // The predicates whose rules can derive a fact: a rule fires once its positive predicates can.
19
- private getBottomUpReachable(source: RuleSet) {
19
+ // dataflow_engine<reachability_info>::run_bottom_up: whether the rules of a predicate can
20
+ // derive a fact, for the predicates the engine reached.
21
+ private runBottomUp(source: RuleSet) {
20
22
  const manager = this.context.manager;
21
- const reachable = new Set<number>();
22
- let isChanged = true;
23
- while (isChanged) {
24
- isChanged = false;
25
- for (const rule of source.rules) {
26
- const head = rule.getDecl(manager);
27
- if (reachable.has(head)) continue;
28
- let isFiring = true;
29
- for (let index = 0; isFiring && index < rule.positiveSize; index++)
30
- isFiring = reachable.has(rule.getTailDecl(manager, index));
31
- if (!isFiring) continue;
32
- reachable.add(head);
33
- isChanged = true;
23
+ const getHash = (decl: number) => manager.getDeclHash(decl);
24
+ const facts = new ObjMap<boolean>(getHash);
25
+ const body2rules = new Map<number, Rule[]>();
26
+ const todos = [new ObjHashtable(getHash), new ObjHashtable(getHash)];
27
+ let todoIndex = 0;
28
+ for (const rule of source.rules) {
29
+ for (let index = 0; index < rule.uninterpretedSize; index++) {
30
+ const decl = rule.getTailDecl(manager, index);
31
+ const users = body2rules.get(decl);
32
+ if (users === undefined) body2rules.set(decl, [rule]);
33
+ else users.push(rule);
34
34
  }
35
+ const head = rule.getDecl(manager);
36
+ if (rule.positiveSize !== 0 || facts.get(head) === true) continue;
37
+ facts.set(head, true);
38
+ todos[todoIndex].add(head);
35
39
  }
36
- return reachable;
40
+ while (todos[todoIndex].size > 0) {
41
+ for (const decl of todos[todoIndex])
42
+ for (const rule of body2rules.get(decl) ?? []) {
43
+ const head = rule.getDecl(manager);
44
+ if (!facts.has(head)) facts.set(head, false);
45
+ if (facts.get(head) === true) continue;
46
+ let isFiring = true;
47
+ for (let index = 0; isFiring && index < rule.positiveSize; index++)
48
+ isFiring = facts.get(rule.getTailDecl(manager, index)) === true;
49
+ if (!isFiring) continue;
50
+ facts.set(head, true);
51
+ todos[1 - todoIndex].add(head);
52
+ }
53
+ todos[todoIndex] = new ObjHashtable(getHash);
54
+ todoIndex = 1 - todoIndex;
55
+ }
56
+ return facts;
37
57
  }
38
58
 
39
59
  private bottomUp(source: RuleSet) {
40
60
  const manager = this.context.manager;
41
- const reachable = this.getBottomUpReachable(source);
61
+ const facts = this.runBottomUp(source);
62
+ const unreachable = new ObjHashtable((decl) => manager.getDeclHash(decl));
42
63
  const result = new RuleSet(this.context);
43
64
  result.inheritPredicates(source);
44
65
  for (const rule of source.rules) {
@@ -46,7 +67,8 @@ export class MkCoiFilter implements RuleTransformerPlugin {
46
67
  let newTail: number[] | undefined;
47
68
  let newNegated: boolean[] = [];
48
69
  for (let index = 0; index < rule.uninterpretedSize; index++) {
49
- const isReachable = reachable.has(rule.getTailDecl(manager, index));
70
+ const isReachable = facts.get(rule.getTailDecl(manager, index)) === true;
71
+ if (!isReachable) unreachable.add(rule.getTailDecl(manager, index));
50
72
  if (rule.isNegated[index]) {
51
73
  if (!isReachable && newTail === undefined) {
52
74
  newTail = rule.tail.slice(0, index);
@@ -73,6 +95,12 @@ export class MkCoiFilter implements RuleTransformerPlugin {
73
95
  }
74
96
  if (result.rules.length === source.rules.length) return undefined;
75
97
  result.close();
98
+ if (this.context.modelConverters !== undefined) {
99
+ for (const [decl, isReachable] of facts) if (!isReachable) unreachable.add(decl);
100
+ this.context.addGenericModelConverter(
101
+ [...unreachable].map((decl) => ({ decl, def: manager.falseExpr })),
102
+ );
103
+ }
76
104
  return result;
77
105
  }
78
106
 
@@ -103,6 +131,7 @@ export class MkCoiFilter implements RuleTransformerPlugin {
103
131
  const result = new RuleSet(this.context);
104
132
  result.inheritPredicates(source);
105
133
  const seen = new Set<number>();
134
+ const prunedPreds = new ObjHashtable((decl) => manager.getDeclHash(decl));
106
135
  for (const rule of source.rules) {
107
136
  const predicate = rule.getDecl(manager);
108
137
  if (seen.has(predicate)) continue;
@@ -111,11 +140,28 @@ export class MkCoiFilter implements RuleTransformerPlugin {
111
140
  for (const kept of source.getPredicateRules(predicate)) result.addRule(kept);
112
141
  continue;
113
142
  }
114
- if (!this.context.hasModelConverter) continue;
143
+ if (this.context.modelConverters === undefined) continue;
115
144
  for (const pruned of source.getPredicateRules(predicate))
116
145
  for (let index = 0; index < pruned.uninterpretedSize; index++)
117
146
  if (pruned.getTailDecl(manager, index) !== predicate) return undefined;
147
+ prunedPreds.add(predicate);
118
148
  }
119
- return result.rules.length === source.rules.length ? undefined : result;
149
+ if (result.rules.length === source.rules.length) return undefined;
150
+ if (this.context.modelConverters !== undefined && prunedPreds.size > 0) {
151
+ const horn = new HornSubsumeModelConverter(this.context);
152
+ this.context.addGenericModelConverter(
153
+ [...prunedPreds].map((decl) => ({
154
+ decl,
155
+ def: manager.mkOr(
156
+ source
157
+ .getPredicateRules(decl)
158
+ .map((rule) =>
159
+ horn.mkHorn(rule.head, manager.mkAnd(rule.tail.slice(rule.uninterpretedSize))),
160
+ ),
161
+ ),
162
+ })),
163
+ );
164
+ }
165
+ return result;
120
166
  }
121
167
  }
@@ -1,5 +1,3 @@
1
- // Ported from Z3 (src/muz/transforms/dl_mk_elim_term_ite.cpp,
2
- // src/ast/simplifiers/blast_term_ite_simplifier.h), MIT license, see z3-license.txt.
3
1
  import { SmtUnsupportedError } from "../../../../errors";
4
2
  import { type AstManager, KIND_APP, KIND_QUANTIFIER, OP_ITE, SORT_BOOL } from "../ast";
5
3
  import { flattenAndVector, getNumExprs } from "../ast-util";
@@ -24,7 +22,13 @@ class BlastTermIte extends RewriterTpl {
24
22
  reduceApp(decl: number, args: number[], sort: number): number | Rewrite {
25
23
  const manager = this.manager;
26
24
  if (decl === OP_ITE) return -1;
27
- if (this.initTermSize > 0 && this.maxInflation * this.initTermSize < this.numFresh) return -1;
25
+ // The product wraps as Z3's unsigned one does.
26
+ if (
27
+ this.maxInflation < 0xffffffff &&
28
+ this.initTermSize > 0 &&
29
+ Math.imul(this.maxInflation, this.initTermSize) >>> 0 < this.numFresh
30
+ )
31
+ return -1;
28
32
  for (let index = 0; index < args.length; index++) {
29
33
  const arg = args[index];
30
34
  if (manager.sorts[arg] === SORT_BOOL || manager.getOp(arg) !== OP_ITE) continue;
@@ -1,5 +1,3 @@
1
- // Ported from Z3 (src/muz/transforms/dl_mk_interp_tail_simplifier.cpp), MIT license, see
2
- // z3-license.txt.
3
1
  import {
4
2
  type AstManager,
5
3
  KIND_APP,
@@ -1,10 +1,11 @@
1
- // Ported from Z3 (src/muz/transforms/dl_mk_rule_inliner.cpp), MIT license, see z3-license.txt.
2
1
  import { SmtUnsupportedError } from "../../../../errors";
2
+ import { L_FALSE, L_UNDEF } from "../lbool";
3
3
  import type { DatalogContext } from "./dl-context";
4
4
  import { MkInterpTailSimplifier } from "./dl-mk-interp-tail-simplifier";
5
5
  import { getRuleVars, type Rule } from "./dl-rule";
6
6
  import { RuleSet } from "./dl-rule-set";
7
7
  import { removeDuplicateTails, type RuleTransformerPlugin } from "./dl-rule-transformer";
8
+ import { HornSubsumeModelConverter } from "./horn-subsume-model-converter";
8
9
  import { Substitution } from "./substitution";
9
10
 
10
11
  class RuleUnifier {
@@ -50,7 +51,7 @@ class RuleUnifier {
50
51
  this.subst.apply(target.head, 0, this.deltas),
51
52
  tail,
52
53
  isNegated,
53
- `${target.name};${source.name}`,
54
+ `${target.getNameText()};${source.getNameText()}`,
54
55
  ),
55
56
  true,
56
57
  );
@@ -58,9 +59,6 @@ class RuleUnifier {
58
59
  }
59
60
  }
60
61
 
61
- const hasQuantifier = (context: DatalogContext, rule: Rule) =>
62
- context.ruleManager.hasQuantifiers(rule);
63
-
64
62
  // The rules at a position of a head or tail, and which of them can still be expanded or removed.
65
63
  class Visitor {
66
64
  readonly positions = new Map<number, number[]>();
@@ -98,6 +96,7 @@ export class MkRuleInliner implements RuleTransformerPlugin {
98
96
  private tailVisitor = new Visitor();
99
97
  // Z3 throws has_new_quantifier when it would inline a rule that has a quantifier.
100
98
  private hasNewQuantifier = false;
99
+ private modelConverter: HornSubsumeModelConverter | undefined;
101
100
 
102
101
  constructor(
103
102
  private context: DatalogContext,
@@ -109,7 +108,7 @@ export class MkRuleInliner implements RuleTransformerPlugin {
109
108
 
110
109
  private tryToInlineRule(target: Rule, source: Rule, tailIndex: number): Rule | undefined {
111
110
  this.context.ruleManager.normVars(target);
112
- if (hasQuantifier(this.context, source)) {
111
+ if (this.context.ruleManager.hasQuantifiers(source)) {
113
112
  this.hasNewQuantifier = true;
114
113
  return undefined;
115
114
  }
@@ -213,10 +212,18 @@ export class MkRuleInliner implements RuleTransformerPlugin {
213
212
  if (this.forbidMultipleMultipliers(source, candidates))
214
213
  candidates = this.createAllowedRuleSet(source);
215
214
  for (const stratum of candidates.getStrats())
216
- for (const rule of candidates.getPredicateRules(stratum.values().next().value as number))
215
+ for (const rule of candidates.getPredicateRules(stratum.values().next().value as number)) {
217
216
  this.transformRule(source, rule, this.inlinedRules);
217
+ // Z3 does not catch the has_new_quantifier that plan_inlining throws, and aborts.
218
+ if (this.hasNewQuantifier)
219
+ throw new SmtUnsupportedError("inlining a rule with a quantifier");
220
+ }
221
+ for (const rule of this.inlinedRules.rules) this.modelConverter?.delRule(rule, L_UNDEF);
218
222
  }
219
223
 
224
+ // Deviation from Z3: transform_rule keeps a rule that has a quantifier without inlining the rest
225
+ // of its tail, although the rules of those predicates are dropped, so Z3 answers unreachable for
226
+ // a reachable query (dl_mk_rule_inliner.cpp). The rest of the tail is inlined here.
220
227
  private transformRule(source: RuleSet, original: Rule, target: RuleSet) {
221
228
  const manager = this.context.manager;
222
229
  let isModified = false;
@@ -239,6 +246,7 @@ export class MkRuleInliner implements RuleTransformerPlugin {
239
246
  if (result !== undefined) todo.push(result);
240
247
  }
241
248
  }
249
+ if (isModified) this.modelConverter?.delRule(original, L_UNDEF);
242
250
  return isModified;
243
251
  }
244
252
 
@@ -253,6 +261,10 @@ export class MkRuleInliner implements RuleTransformerPlugin {
253
261
  isDone = true;
254
262
  if (this.hasNewQuantifier) break;
255
263
  }
264
+ if (isDone)
265
+ for (const rule of source.rules)
266
+ if (this.isInliningAllowed(source, rule.getDecl(manager)))
267
+ this.modelConverter?.delRule(rule, L_UNDEF);
256
268
  return isDone;
257
269
  }
258
270
 
@@ -297,9 +309,15 @@ export class MkRuleInliner implements RuleTransformerPlugin {
297
309
  candidate = predicateRule;
298
310
  }
299
311
  if (isAmbiguous) continue;
300
- if (candidate === undefined) return null;
312
+ if (candidate === undefined) {
313
+ this.modelConverter?.delRule(rule, L_FALSE);
314
+ return null;
315
+ }
301
316
  if (!this.isOrientedRewriter(candidate, rules)) continue;
302
- return this.tryToInlineRule(rule, candidate, index) ?? null;
317
+ const inlined = this.tryToInlineRule(rule, candidate, index);
318
+ if (inlined !== undefined) return inlined;
319
+ this.modelConverter?.delRule(rule, L_FALSE);
320
+ return null;
303
321
  }
304
322
  return undefined;
305
323
  }
@@ -384,6 +402,7 @@ export class MkRuleInliner implements RuleTransformerPlugin {
384
402
  canExpand[index] = canExpand[other];
385
403
  if (tailUnifiers.length === 1) {
386
404
  isValid[other] = false;
405
+ this.modelConverter?.delRule(otherRule, L_UNDEF);
387
406
  this.delRule(otherRule, other);
388
407
  }
389
408
  }
@@ -397,8 +416,14 @@ export class MkRuleInliner implements RuleTransformerPlugin {
397
416
 
398
417
  apply(source: RuleSet) {
399
418
  if (source.rules.length === 0) return undefined;
400
- if (source.rules.some((rule) => hasQuantifier(this.context, rule))) return undefined;
419
+ if (source.rules.some((rule) => this.context.ruleManager.hasQuantifiers(rule)))
420
+ return undefined;
401
421
  this.hasNewQuantifier = false;
422
+ this.modelConverter =
423
+ this.context.modelConverters === undefined
424
+ ? undefined
425
+ : new HornSubsumeModelConverter(this.context);
426
+ const converter = this.modelConverter;
402
427
  let isDone = false;
403
428
  let result = new RuleSet(this.context);
404
429
  if (this.context.params.getBool("xform.inline_eager", true)) {
@@ -422,6 +447,9 @@ export class MkRuleInliner implements RuleTransformerPlugin {
422
447
  }
423
448
  }
424
449
  if (this.hasNewQuantifier) throw new SmtUnsupportedError("inlining a rule with a quantifier");
425
- return isDone ? result : undefined;
450
+ if (!isDone) return undefined;
451
+ if (converter !== undefined)
452
+ this.context.modelConverters?.push((model) => converter.apply(model));
453
+ return result;
426
454
  }
427
455
  }
@@ -1,8 +1,9 @@
1
- // Ported from Z3 (src/muz/transforms/dl_mk_slice.cpp), MIT license, see z3-license.txt.
2
1
  import { getSymbolName, KIND_VAR, OP_EQ, OP_ITE, SORT_BOOL } from "../ast";
3
2
  import { flattenAndVector } from "../ast-util";
3
+ import { ObjMap } from "../hashtable";
4
+ import { FuncInterp, ProtoModel } from "../proto-model";
4
5
  import { RefVector } from "../ref-vector";
5
- import { getFreeVarSorts } from "../var-subst";
6
+ import { getFreeVarSorts, VarSubst } from "../var-subst";
6
7
  import type { DatalogContext } from "./dl-context";
7
8
  import type { Rule } from "./dl-rule";
8
9
  import { RuleSet } from "./dl-rule-set";
@@ -10,14 +11,19 @@ import type { RuleTransformerPlugin } from "./dl-rule-transformer";
10
11
 
11
12
  export class MkSlice implements RuleTransformerPlugin {
12
13
  readonly priority = 1;
13
- private sliceable = new Map<number, boolean[]>();
14
+ private sliceable: ObjMap<boolean[]>;
14
15
  private input: boolean[] = [];
15
16
  private output: boolean[] = [];
16
17
  private isVarSliceable: boolean[] = [];
17
18
  private solvedVars: number[] = [];
18
19
  readonly predicates = new Map<number, number>();
20
+ // slice_model_converter::m_slice2old
21
+ private slice2old: ObjMap<number>;
19
22
 
20
- constructor(private context: DatalogContext) {}
23
+ constructor(private context: DatalogContext) {
24
+ this.sliceable = new ObjMap((decl) => context.manager.getDeclHash(decl));
25
+ this.slice2old = new ObjMap((decl) => context.manager.getDeclHash(decl));
26
+ }
21
27
 
22
28
  private getPredicateSlice(predicate: number) {
23
29
  const existing = this.sliceable.get(predicate);
@@ -82,7 +88,7 @@ export class MkSlice implements RuleTransformerPlugin {
82
88
  const manager = this.context.manager;
83
89
  if (manager.getOp(expr) === OP_ITE) {
84
90
  const thenEq = this.getEq(manager.getArg(expr, 1));
85
- const elseEq = this.getEq(manager.getArg(expr, 2));
91
+ const elseEq = thenEq === undefined ? undefined : this.getEq(manager.getArg(expr, 2));
86
92
  if (thenEq !== undefined && elseEq !== undefined && thenEq.index === elseEq.index)
87
93
  return {
88
94
  index: thenEq.index,
@@ -95,11 +101,13 @@ export class MkSlice implements RuleTransformerPlugin {
95
101
  }
96
102
  if (manager.kinds[expr] === KIND_VAR)
97
103
  return { index: manager.values[expr], value: manager.trueExpr };
98
- if (manager.isNot(expr) && manager.kinds[manager.getArg(expr, 0)] === KIND_VAR)
99
- return { index: manager.values[manager.getArg(expr, 0)], value: manager.falseExpr };
100
- if (manager.getOp(expr) !== OP_EQ) return undefined;
101
- const left = manager.getArg(expr, 0);
102
- const right = manager.getArg(expr, 1);
104
+ // is_not rebinds the expression to its argument, so the equation under a negation is solved.
105
+ const atom = manager.isNot(expr) ? manager.getArg(expr, 0) : expr;
106
+ if (atom !== expr && manager.kinds[atom] === KIND_VAR)
107
+ return { index: manager.values[atom], value: manager.falseExpr };
108
+ if (manager.getOp(atom) !== OP_EQ) return undefined;
109
+ const left = manager.getArg(atom, 0);
110
+ const right = manager.getArg(atom, 1);
103
111
  if (manager.kinds[left] === KIND_VAR) return { index: manager.values[left], value: right };
104
112
  if (manager.kinds[right] === KIND_VAR) return { index: manager.values[right], value: left };
105
113
  return undefined;
@@ -205,7 +213,7 @@ export class MkSlice implements RuleTransformerPlugin {
205
213
  const manager = this.context.manager;
206
214
  let hasOutput = false;
207
215
  for (const [predicate, slice] of this.sliceable) {
208
- const domain = manager.funcDecls[predicate].domain.filter((_, index) => !slice[index]);
216
+ const domain = manager.funcDecls[predicate].domain.filter((_value, index) => !slice[index]);
209
217
  if (domain.length < slice.length) {
210
218
  const sliced = this.context.mkFreshHeadPredicate(
211
219
  getSymbolName(manager.funcDecls[predicate].name),
@@ -214,6 +222,7 @@ export class MkSlice implements RuleTransformerPlugin {
214
222
  );
215
223
  this.predicates.set(predicate, sliced);
216
224
  target.inheritPredicate(source, predicate, sliced);
225
+ this.slice2old.set(sliced, predicate);
217
226
  } else if (source.isOutputPredicate(predicate)) {
218
227
  target.setOutputPredicate(predicate);
219
228
  hasOutput = true;
@@ -229,7 +238,7 @@ export class MkSlice implements RuleTransformerPlugin {
229
238
  const slice = this.getPredicateSlice(manager.decls[atom]);
230
239
  return manager.mkApp(
231
240
  sliced,
232
- manager.getArgs(atom).filter((_, index) => !slice[index]),
241
+ manager.getArgs(atom).filter((_value, index) => !slice[index]),
233
242
  SORT_BOOL,
234
243
  );
235
244
  }
@@ -246,16 +255,14 @@ export class MkSlice implements RuleTransformerPlugin {
246
255
  return;
247
256
  }
248
257
  this.initVars(rule);
258
+ const head = this.updatePredicate(rule.head);
249
259
  const tail = rule.tail
250
260
  .slice(0, rule.uninterpretedSize)
251
261
  .map((atom) => this.updatePredicate(atom));
252
262
  const conjs = this.getTailConjs(rule);
253
263
  tail.push(...conjs.items);
254
264
  const ruleManager = this.context.ruleManager;
255
- const updated = ruleManager.fixUnboundVars(
256
- ruleManager.mk(this.updatePredicate(rule.head), tail, [], rule.name),
257
- false,
258
- );
265
+ const updated = ruleManager.fixUnboundVars(ruleManager.mk(head, tail, [], rule.name), false);
259
266
  conjs.reset();
260
267
  target.addRule(updated);
261
268
  }
@@ -273,6 +280,61 @@ export class MkSlice implements RuleTransformerPlugin {
273
280
  this.declarePredicates(source, result);
274
281
  if (this.predicates.size === 0) return undefined;
275
282
  for (const rule of source.rules) this.updateRule(rule, result);
283
+ const slice2old = this.slice2old;
284
+ const sliceable = new Map([...this.sliceable].map((entry) => [entry[0], [...entry[1]]]));
285
+ this.context.modelConverters?.push((model) => this.convertModel(model, slice2old, sliceable));
276
286
  return result;
277
287
  }
288
+
289
+ // slice_model_converter::operator(): the interpretation of a sliced predicate over the
290
+ // arguments of the predicate it was sliced from.
291
+ private convertModel(
292
+ model: ProtoModel,
293
+ slice2old: ObjMap<number>,
294
+ sliceable: ReadonlyMap<number, boolean[]>,
295
+ ) {
296
+ const manager = this.context.manager;
297
+ const oldModel = new ProtoModel(manager);
298
+ const varSubst = new VarSubst(manager, false);
299
+ for (const [sliced, predicate] of slice2old) {
300
+ // Z3 drops the interpretation of a predicate that has every argument sliced.
301
+ if (manager.funcDecls[sliced].domain.length === 0) continue;
302
+ const slice = sliceable.get(predicate) ?? [];
303
+ const domain = manager.funcDecls[predicate].domain;
304
+ const subst = domain
305
+ .map((sort, index) => manager.mkVar(index, sort))
306
+ .filter((_value, index) => !slice[index]);
307
+ const interp = model.funcInterps.get(sliced);
308
+ if (interp === undefined) continue;
309
+ const oldInterp = new FuncInterp(manager, slice.length);
310
+ if (interp.elseExpr !== null) {
311
+ const elseExpr = varSubst.apply(interp.elseExpr, subst);
312
+ oldInterp.setElse(elseExpr);
313
+ manager.decRef(elseExpr);
314
+ }
315
+ for (const entry of interp.entries) {
316
+ let next = 0;
317
+ const args = domain.map((sort, index) =>
318
+ slice[index] ? manager.mkVar(index, sort) : varSubst.apply(entry.args[next++], subst),
319
+ );
320
+ const result = varSubst.apply(entry.result, subst);
321
+ oldInterp.insertEntry(args, result);
322
+ manager.decRef(result);
323
+ args.forEach((arg, index) => {
324
+ if (!slice[index]) manager.decRef(arg);
325
+ });
326
+ }
327
+ oldModel.registerFunc(predicate, oldInterp);
328
+ }
329
+ for (const decl of model.getConstDecls()) {
330
+ const value = model.constInterps.get(decl);
331
+ if (value !== undefined && !slice2old.has(decl)) oldModel.registerConst(decl, value);
332
+ }
333
+ for (const decl of model.getFuncDecls()) {
334
+ const interp = model.funcInterps.get(decl);
335
+ if (interp !== undefined && !slice2old.has(decl)) oldModel.registerFunc(decl, interp.copy());
336
+ }
337
+ varSubst.release();
338
+ return oldModel;
339
+ }
278
340
  }
@@ -1,6 +1,5 @@
1
- // Ported from Z3 (src/muz/transforms/dl_mk_subsumption_checker.cpp,
2
- // src/muz/base/dl_rule_subsumption_index.cpp), MIT license, see z3-license.txt.
3
1
  import { KIND_VAR } from "../ast";
2
+ import { ObjHashtable } from "../hashtable";
4
3
  import type { DatalogContext } from "./dl-context";
5
4
  import type { Rule } from "./dl-rule";
6
5
  import { RuleSet } from "./dl-rule-set";
@@ -28,14 +27,16 @@ class RuleSubsumptionIndex {
28
27
  }
29
28
 
30
29
  export class MkSubsumptionChecker implements RuleTransformerPlugin {
31
- private totalRelations = new Set<number>();
30
+ private totalRelations: ObjHashtable;
32
31
  private definingRules = new Map<number, Rule>();
33
32
  private hasNewTotalRule = false;
34
33
 
35
34
  constructor(
36
35
  private context: DatalogContext,
37
36
  readonly priority: number,
38
- ) {}
37
+ ) {
38
+ this.totalRelations = new ObjHashtable((decl) => context.manager.getDeclHash(decl));
39
+ }
39
40
 
40
41
  private isTotalRule(rule: Rule) {
41
42
  const manager = this.context.manager;
@@ -136,6 +137,10 @@ export class MkSubsumptionChecker implements RuleTransformerPlugin {
136
137
  index.add(transformed);
137
138
  }
138
139
  target.inheritPredicates(source);
140
+ if (this.totalRelations.size > 0)
141
+ this.context.addGenericModelConverter(
142
+ [...this.totalRelations].map((decl) => ({ decl, def: manager.trueExpr })),
143
+ );
139
144
  return isModified;
140
145
  }
141
146
 
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/muz/base/dl_rule_set.cpp), MIT license, see z3-license.txt.
2
1
  import { SmtTacticError } from "../../../../errors";
3
2
  import { type AstManager, KIND_APP, KIND_QUANTIFIER } from "../ast";
4
3
  import type { DatalogContext } from "./dl-context";