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,6 @@
1
- // Ported from Z3 (src/ast/fpa/fpa2bv_converter.cpp), MIT license, see z3-license.txt.
2
- import { SmtUnsupportedError } from "../../../errors";
1
+ // A statement that discards its result builds a term that upstream builds and never uses, so the
2
+ // terms after it get the ids Z3 gives them.
3
+ import { SmtCanceledError, SmtUnsupportedError } from "../../../errors";
3
4
  import {
4
5
  type AstManager,
5
6
  OP_BADD,
@@ -103,15 +104,15 @@ export class Fpa2BvConverter {
103
104
  manager.decDeclRef(entry[0]);
104
105
  manager.decRef(entry[1]);
105
106
  }
107
+ for (const entry of this.uf2BvUf) {
108
+ manager.decDeclRef(entry[0]);
109
+ manager.decDeclRef(entry[1]);
110
+ }
106
111
  for (const entry of this.minMaxUfs) {
107
112
  manager.decDeclRef(entry[0]);
108
113
  manager.decRef(entry[1][0]);
109
114
  manager.decRef(entry[1][1]);
110
115
  }
111
- for (const entry of this.uf2BvUf) {
112
- manager.decDeclRef(entry[0]);
113
- manager.decDeclRef(entry[1]);
114
- }
115
116
  this.constants.clear();
116
117
  this.rmConstants.clear();
117
118
  this.minMaxUfs.clear();
@@ -1413,10 +1414,12 @@ export class Fpa2BvConverter {
1413
1414
  if (manager.getOp(x) !== OP_NUM) return this.mkToFpSymbolicReal(sort, rm, x);
1414
1415
  const value = manager.getRationalValue(x);
1415
1416
  if (value.isZero()) return this.mkPzero(sort);
1416
- if (manager.isBvNumeral(rm))
1417
+ if (manager.isBvNumeral(rm)) {
1418
+ const mode = Number(manager.getBvNumeralValue(rm));
1417
1419
  return this.mkFpOfMpf(
1418
- mpfFromRational(ebits, sbits, Number(manager.getBvNumeralValue(rm)), 0n, value),
1420
+ mpfFromRational(ebits, sbits, mode > BV_RM_TO_ZERO ? BV_RM_TO_ZERO : mode, 0n, value),
1419
1421
  );
1422
+ }
1420
1423
  const rmNta = this.mkIsRm(rm, BV_RM_TIES_TO_AWAY);
1421
1424
  const rmNte = this.mkIsRm(rm, BV_RM_TIES_TO_EVEN);
1422
1425
  const rmTp = this.mkIsRm(rm, BV_RM_TO_POSITIVE);
@@ -1437,6 +1440,8 @@ export class Fpa2BvConverter {
1437
1440
  const manager = this.manager;
1438
1441
  const ebits = manager.getEbits(sort);
1439
1442
  const sbits = manager.getSbits(sort);
1443
+ // Deviation from Z3: it runs out of memory from an exponent width of 31, where this gives up as at a resource limit.
1444
+ if (ebits > 30) throw new SmtCanceledError();
1440
1445
  const x =
1441
1446
  manager.sorts[input] === SORT_INT ? manager.mkApp(OP_TO_REAL, [input], SORT_REAL) : input;
1442
1447
  const real = (op: number, ...args: number[]) => manager.mkApp(op, args, SORT_REAL);
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/ast/fpa/fpa2bv_rewriter.cpp), MIT license, see z3-license.txt.
2
1
  import { SmtUnsupportedError } from "../../../errors";
3
2
  import {
4
3
  type AstManager,
@@ -1,5 +1,3 @@
1
- // Ported from Z3 (src/tactic/fpa/fpa2bv_tactic.cpp, src/tactic/fpa/fpa2bv_model_converter.cpp,
2
- // src/ast/fpa/bv2fpa_converter.cpp), MIT license, see z3-license.txt.
3
1
  import type { AstManager } from "./ast";
4
2
  import { TACTIC_ARITH_OPTIONS } from "./arith-rewriter";
5
3
  import { convertMinMaxSpecials, convertUf2BvUf } from "./bv2fpa-converter";
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/tactic/goal.cpp), MIT license, see z3-license.txt.
2
1
  import { OP_AND, OP_NOT, OP_OR, SORT_BOOL, type AstManager } from "./ast";
3
2
  import type { ProtoModel } from "./proto-model";
4
3
  import { RefVector } from "./ref-vector";
@@ -44,7 +43,7 @@ interface Polarized {
44
43
  isPositive: boolean;
45
44
  }
46
45
 
47
- export const PRECISE = 0;
46
+ const PRECISE = 0;
48
47
  export const UNDER = 1;
49
48
  export const OVER = 2;
50
49
  const UNDER_OVER = 3;
@@ -83,6 +82,8 @@ export class Goal {
83
82
  model: ProtoModel | undefined;
84
83
  isProofsEnabled = false;
85
84
  isCoresEnabled = false;
85
+ // As in Z3, it isn't copied with the goal.
86
+ reasonUnknown = "";
86
87
 
87
88
  constructor(readonly manager: AstManager) {
88
89
  this.forms = new RefVector(manager);
@@ -1,5 +1,3 @@
1
- // Ported from Z3 (src/nlsat/tactic/goal2nlsat.cpp, src/ast/expr2polynomial.cpp), MIT license, see
2
- // z3-license.txt.
3
1
  import { SmtTacticError } from "../../../errors";
4
2
  import {
5
3
  type AstManager,
@@ -24,9 +22,10 @@ import {
24
22
  SORT_INT,
25
23
  SORT_REAL,
26
24
  } from "./ast";
27
- import { toPolynomial } from "./expr2polynomial";
25
+ import { Expr2Polynomial } from "./expr2polynomial";
28
26
  import { getLcm } from "./rational";
29
27
  import { flipKind } from "./nlsat/atoms";
28
+ import { Factors, type Polynomial, PolynomialRef } from "./nlsat/polynomial";
30
29
  import type { NlsatSolver } from "./nlsat/solver";
31
30
  import { TRANSCENDENTAL_OPS } from "./nlsat/transcendental-eval";
32
31
  import type { IneqKind } from "./nlsat/types";
@@ -41,38 +40,54 @@ export const goal2nlsat = (
41
40
  isFactoring = true,
42
41
  ) => {
43
42
  const pm = solver.pm;
43
+ const expr2poly = new Expr2Polynomial(manager, pm, t2x, (isInt) => solver.mkVar(isInt));
44
44
 
45
- const mkVar = (term: number) => {
46
- let variable = t2x.get(term);
47
- if (variable === undefined) {
48
- variable = solver.mkVar(manager.sorts[term] === SORT_INT);
49
- t2x.set(term, variable);
50
- }
51
- return variable;
45
+ const factorAtom = (polynomial: Polynomial, kind: IneqKind) => {
46
+ const factors = new Factors(pm);
47
+ pm.factor(polynomial, factors);
48
+ const literal = solver.mkIneqLiteral(
49
+ factors.constant < 0n ? flipKind(kind) : kind,
50
+ factors.factors,
51
+ factors.degrees.map((degree) => degree % 2 === 0),
52
+ );
53
+ factors.reset();
54
+ return literal;
52
55
  };
53
56
 
54
- const processIneq = (atom: number, kind: IneqKind) => {
55
- const lhs = toPolynomial(manager, pm, manager.getArg(atom, 0), mkVar);
56
- const rhs = toPolynomial(manager, pm, manager.getArg(atom, 1), mkVar);
57
- const lcm = getLcm(lhs.denominator, rhs.denominator);
58
- const polynomial = pm.addmul(
59
- lcm / lhs.denominator,
60
- lhs.polynomial,
61
- -(lcm / rhs.denominator),
62
- rhs.polynomial,
63
- );
57
+ const processIneqPolynomial = (p: PolynomialRef, kind: IneqKind) => {
58
+ const polynomial = p.get();
64
59
  if (pm.isConst(polynomial)) {
65
60
  const sign = pm.isZero(polynomial) ? 0 : polynomial.as[0] > 0n ? 1 : -1;
66
61
  const isTrue = kind === "EQ" ? sign === 0 : kind === "LT" ? sign < 0 : sign > 0;
67
62
  return isTrue ? 0 : 1;
68
63
  }
69
- if (!isFactoring) return solver.mkIneqLiteral(kind, [polynomial], [false]);
70
- const factors = pm.factor(polynomial);
71
- return solver.mkIneqLiteral(
72
- factors.constant < 0n ? flipKind(kind) : kind,
73
- factors.factors,
74
- factors.degrees.map((degree) => degree % 2 === 0),
64
+ return isFactoring
65
+ ? factorAtom(polynomial, kind)
66
+ : solver.mkIneqLiteral(kind, [polynomial], [false]);
67
+ };
68
+
69
+ const processIneq = (atom: number, kind: IneqKind) => {
70
+ const first = new PolynomialRef(pm);
71
+ const second = new PolynomialRef(pm);
72
+ const p = new PolynomialRef(pm);
73
+ const firstDenominator = expr2poly.toPolynomial(manager.getArg(atom, 0), first);
74
+ const secondDenominator = expr2poly.toPolynomial(manager.getArg(atom, 1), second);
75
+ const lcm = getLcm(firstDenominator, secondDenominator);
76
+ p.set(
77
+ pm.addmulTerms(
78
+ lcm / firstDenominator,
79
+ pm.unit,
80
+ first.get(),
81
+ -(lcm / secondDenominator),
82
+ pm.unit,
83
+ second.get(),
84
+ ),
75
85
  );
86
+ const literal = processIneqPolynomial(p, kind);
87
+ p.reset();
88
+ second.reset();
89
+ first.reset();
90
+ return literal;
76
91
  };
77
92
 
78
93
  const processBoolVar = (atom: number) => {
@@ -131,20 +146,29 @@ export const goal2nlsat = (
131
146
  // The polynomial conversion treats a transcendental application, argument included, as one
132
147
  // variable, so its argument gets a variable here, through an equation unless it is one already.
133
148
  const mkArgVar = (term: number) => {
134
- const result = toPolynomial(manager, pm, term, mkVar);
135
- const polynomial = result.polynomial;
149
+ const p = new PolynomialRef(pm);
150
+ const denominator = expr2poly.toPolynomial(term, p);
151
+ const polynomial = p.get();
136
152
  const monomial = polynomial.ms[0];
137
153
  if (
138
- result.denominator === 1n &&
154
+ denominator === 1n &&
139
155
  polynomial.ms.length === 1 &&
140
156
  polynomial.as[0] === 1n &&
141
157
  monomial.size === 1 &&
142
158
  monomial.degrees[0] === 1
143
- )
159
+ ) {
160
+ p.reset();
144
161
  return monomial.vars[0];
162
+ }
145
163
  const variable = solver.mkVar(false);
146
- const equation = pm.addmul(result.denominator, pm.mkVar(variable), -1n, polynomial);
147
- solver.mkExternalClause([solver.mkIneqLiteral("EQ", [equation], [false])], null);
164
+ const vp = new PolynomialRef(pm);
165
+ const equation = new PolynomialRef(pm);
166
+ vp.set(pm.mkVar(variable));
167
+ equation.set(pm.addmulTerms(denominator, pm.unit, vp.get(), -1n, pm.unit, polynomial));
168
+ solver.mkExternalClause([solver.mkIneqLiteral("EQ", [equation.get()], [false])], null);
169
+ equation.reset();
170
+ vp.reset();
171
+ p.reset();
148
172
  return variable;
149
173
  };
150
174
 
@@ -176,6 +200,7 @@ export const goal2nlsat = (
176
200
  }
177
201
  }
178
202
  if (piVar !== undefined) solver.transcendentals.addPi(piVar);
203
+ expr2poly.release();
179
204
  };
180
205
 
181
206
  const hasTermIte = (manager: AstManager, form: number) => {
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/ast/rewriter/guard_set.cpp), MIT license, see z3-license.txt.
2
1
  import {
3
2
  type AstManager,
4
3
  OP_AND,
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/util/hash.h, src/util/hash.cpp), MIT license, see z3-license.txt.
2
1
  const GOLDEN_RATIO = 0x9e3779b9;
3
2
 
4
3
  const mix = (state: Uint32Array) => {
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/util/hashtable.h, src/util/obj_hashtable.h), MIT license, see z3-license.txt.
2
1
  import { SmtInvariantError } from "../../../errors";
3
2
 
4
3
  const INITIAL_CAPACITY = 8;
@@ -1,5 +1,4 @@
1
- // Ported from Z3 (src/util/inf_eps_rational.h), MIT license, see z3-license.txt. A value
2
- // infinity * oo + value + epsilon * ε, ordered lexicographically.
1
+ // A value infinity * oo + value + epsilon * ε, ordered lexicographically.
3
2
  import { Rational } from "./rational";
4
3
 
5
4
  export class InfEps {
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/ast/rewriter/inj_axiom.cpp), MIT license, see z3-license.txt.
2
1
  import {
3
2
  FAMILY_USER,
4
3
  KIND_APP,
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/smt/smt_context.h, src/smt/smt_internalizer.cpp), MIT license, see z3-license.txt.
2
1
  import { SmtInvariantError, SmtUnsupportedError } from "../../../errors";
3
2
  import {
4
3
  AstManager,
@@ -6,10 +5,18 @@ import {
6
5
  FAMILY_USER,
7
6
  KIND_APP,
8
7
  KIND_QUANTIFIER,
8
+ OP_ADD,
9
9
  OP_AND,
10
+ OP_BADD,
11
+ OP_BAND,
12
+ OP_BMUL,
13
+ OP_BOR,
14
+ OP_BXNOR,
15
+ OP_BXOR,
10
16
  OP_EQ,
11
17
  OP_IMPLIES,
12
18
  OP_ITE,
19
+ OP_MUL,
13
20
  OP_NOT,
14
21
  OP_OR,
15
22
  OP_XOR,
@@ -36,6 +43,7 @@ import {
36
43
  NO_ENODES,
37
44
  UnitResolutionJustification,
38
45
  } from "./enode";
46
+ import { isCommutativeDecl } from "./euf/egraph";
39
47
  import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
40
48
  import {
41
49
  BoolVar,
@@ -84,6 +92,26 @@ export const BV_THEORY = 1 << 31;
84
92
  export const UNDO_ADD_EQ = 8;
85
93
  export const UNDO_TH_VAR = 9;
86
94
 
95
+ // func_decl_info::is_flat_associative of a commutative declaration. cg_table::mk_table_for gives
96
+ // such a declaration the n-ary table, not the binary commutative one.
97
+ const isFlatAssociativeDecl = (manager: AstManager, decl: number) => {
98
+ switch (manager.funcDecls[decl].op) {
99
+ case OP_AND:
100
+ case OP_OR:
101
+ case OP_ADD:
102
+ case OP_MUL:
103
+ case OP_BADD:
104
+ case OP_BMUL:
105
+ case OP_BAND:
106
+ case OP_BOR:
107
+ case OP_BXOR:
108
+ case OP_BXNOR:
109
+ return true;
110
+ default:
111
+ return false;
112
+ }
113
+ };
114
+
87
115
  interface NewEq {
88
116
  lhs: Enode;
89
117
  rhs: Enode;
@@ -306,7 +334,13 @@ export abstract class Internalizer {
306
334
  }
307
335
 
308
336
  findCongruent(decl: number, args: Enode[]) {
309
- return this.cgTable.findFor(decl, args, decl === OP_EQ);
337
+ return this.cgTable.findFor(
338
+ decl,
339
+ args,
340
+ args.length === 2 &&
341
+ isCommutativeDecl(this.manager, decl) &&
342
+ !isFlatAssociativeDecl(this.manager, decl),
343
+ );
310
344
  }
311
345
 
312
346
  isDiseq(first: Enode, second: Enode, isCheckingValues = true) {
@@ -552,15 +586,19 @@ export abstract class Internalizer {
552
586
  const moreArgs: Enode[] = numArgs > 2 ? [] : NO_ENODES;
553
587
  for (let index = 2; index < numArgs; index++) moreArgs.push(this.getArgEnode(expr, index));
554
588
  const isEq = !isSuppressingArgs && manager.getOp(expr) === OP_EQ;
589
+ const decl = manager.decls[expr];
590
+ const isCommutative = isEq || (numArgs === 2 && isCommutativeDecl(manager, decl));
555
591
  const node = new Enode(
556
592
  expr,
557
- manager.decls[expr],
593
+ decl,
558
594
  numArgs,
559
595
  numArgs > 0 ? this.getArgEnode(expr, 0) : null,
560
596
  numArgs > 1 ? this.getArgEnode(expr, 1) : null,
561
597
  moreArgs,
562
598
  generation,
563
599
  isEq,
600
+ isCommutative,
601
+ isEq || (isCommutative && !isFlatAssociativeDecl(manager, decl)),
564
602
  manager.sorts[expr] === SORT_BOOL,
565
603
  isMergeTf,
566
604
  isCgcEnabled,
@@ -1,5 +1,3 @@
1
- // Ported from Z3 (src/ackermannization/lackr.cpp, src/ackermannization/lackr_model_constructor.cpp),
2
- // MIT license, see z3-license.txt.
3
1
  import {
4
2
  type AstManager,
5
3
  KIND_APP,
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/util/lbool.h), MIT license, see z3-license.txt.
2
1
  export const L_TRUE = 1;
3
2
  export const L_FALSE = -1;
4
3
  export const L_UNDEF = 0;
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/tactic/arith/lia2card_tactic.cpp), MIT license, see z3-license.txt.
2
1
  import {
3
2
  type AstManager,
4
3
  KIND_APP,
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/tactic/arith/lia2pb_tactic.cpp), MIT license, see z3-license.txt.
2
1
  import { SmtTacticError } from "../../../errors";
3
2
  import {
4
3
  type AstManager,
@@ -18,7 +17,7 @@ import {
18
17
  isArithSort,
19
18
  } from "./ast";
20
19
  import { BoundManager } from "./bound-manager";
21
- import type { Definition, Goal } from "./goal";
20
+ import { type Definition, type Dependency, type Goal, joinDependencies } from "./goal";
22
21
  import { Rational } from "./rational";
23
22
  import { RefVector } from "./ref-vector";
24
23
  import { Rewriter, type RewriterOptions } from "./rewriter";
@@ -38,7 +37,8 @@ export const lia2pb = (manager: AstManager, goal: Goal, options: Lia2PbOptions)
38
37
  if (goal.isProofsEnabled) throw new SmtTacticError("lia2pb does not support proof production");
39
38
  if (goal.isInconsistent) return;
40
39
  const bounds = new BoundManager(manager);
41
- for (const form of goal.forms.items) bounds.add(form);
40
+ for (let index = 0; index < goal.forms.size; index++)
41
+ bounds.add(goal.forms.items[index], goal.getDependency(index));
42
42
  const getTargetUpper = (expr: number) => {
43
43
  if (!manager.isUninterpretedConst(expr)) return undefined;
44
44
  const lower = bounds.lowers.get(expr);
@@ -101,6 +101,7 @@ export const lia2pb = (manager: AstManager, goal: Goal, options: Lia2PbOptions)
101
101
  const terms = new RefVector(manager);
102
102
  const definitions: Definition[] = [];
103
103
  const substitution = new Map<number, number>();
104
+ const substitutionDependencies = new Map<number, Dependency | undefined>();
104
105
  const zero = manager.mkNumeral(0n);
105
106
  const one = manager.mkNumeral(1n);
106
107
  terms.push(zero);
@@ -124,14 +125,26 @@ export const lia2pb = (manager: AstManager, goal: Goal, options: Lia2PbOptions)
124
125
  const def = manager.mkApp(OP_ADD, args, SORT_INT);
125
126
  terms.push(def);
126
127
  substitution.set(variable, def);
128
+ substitutionDependencies.set(
129
+ variable,
130
+ joinDependencies(
131
+ bounds.lowerDependencies.get(variable),
132
+ bounds.upperDependencies.get(variable),
133
+ ),
134
+ );
127
135
  definitions.push({ decl: manager.decls[variable], def });
128
136
  }
129
137
  const rewriter = new Rewriter(manager, options.rewriter);
130
- rewriter.setSubstitution(substitution);
138
+ rewriter.setSubstitution(substitution, substitutionDependencies);
131
139
  const size = goal.forms.size;
132
140
  for (let index = 0; !goal.isInconsistent && index < size; index++) {
133
141
  const rewritten = rewriter.rewrite(goal.forms.items[index]);
134
- goal.update(index, rewritten);
142
+ goal.update(
143
+ index,
144
+ rewritten,
145
+ joinDependencies(rewriter.usedDependencies, goal.getDependency(index)),
146
+ );
147
+ rewriter.usedDependencies = undefined;
135
148
  manager.decRef(rewritten);
136
149
  }
137
150
  rewriter.release();
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/smt/smt_literal.h, src/smt/smt_types.h), MIT license, see z3-license.txt.
2
1
  declare const boolVarBrand: unique symbol;
3
2
  declare const literalBrand: unique symbol;
4
3
 
@@ -1,7 +1,3 @@
1
- // Ported from Z3 (src/tactic/smtlogics/*.cpp, src/tactic/portfolio/default_tactic.cpp,
2
- // src/tactic/ufbv/ufbv_tactic.cpp, src/nlsat/tactic/qfnra_nlsat_tactic.cpp), MIT license, see
3
- // z3-license.txt.
4
-
5
1
  interface QfnraSolver {
6
2
  simpleCheck: number;
7
3
  heuristic?: number;
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/math/lp/bound_analyzer_on_row.h, src/math/lp/lp_bound_propagator.h, src/math/lp/implied_bound.h, and propagate_bounds_for_touched_rows in src/math/lp/lar_solver.h), MIT license, see z3-license.txt.
2
1
  import { Rational } from "../rational";
3
2
  import { COLUMN_FIXED, COLUMN_FREE, COLUMN_LOWER, COLUMN_UPPER } from "./core-solver";
4
3
  import { type ConstraintKind, KIND_GE, KIND_GT, KIND_LE, KIND_LT } from "./constraints";
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/math/lp/lar_constraints.h), MIT license, see z3-license.txt.
2
1
  import { type Dependency, mkLeaf } from "./dependency";
3
2
  import { Impq } from "./numeric-pair";
4
3
  import { shrink } from "../array";
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/util/uint_set.h, src/util/heap.h, src/math/lp/stacked_vector.h), MIT license, see z3-license.txt.
2
1
  import { shrink } from "../array";
3
2
 
4
3
  export class IndexedUintSet {
@@ -160,7 +159,7 @@ interface HashLink<V> {
160
159
  }
161
160
 
162
161
  interface HashNode<V> extends HashLink<V> {
163
- readonly value: V;
162
+ value: V;
164
163
  }
165
164
 
166
165
  const constrainHash = (hash: number, count: number) =>
@@ -198,6 +197,12 @@ export class UnorderedUintMap<V> {
198
197
  for (let node = this.anchor.next; node !== null; node = node.next) yield [node.key, node.value];
199
198
  }
200
199
 
200
+ set(key: number, value: V) {
201
+ const node = this.nodes.get(key);
202
+ if (node === undefined) this.insert(key, value);
203
+ else node.value = value;
204
+ }
205
+
201
206
  insert(key: number, value: V) {
202
207
  const node: HashNode<V> = { key, value, next: null };
203
208
  const count = this.buckets.length;
@@ -1,6 +1,3 @@
1
- // Ported from Z3 (src/math/lp/lar_core_solver.h, src/math/lp/lp_core_solver_base.h,
2
- // src/math/lp/lp_primal_core_solver.h, src/math/lp/lp_primal_core_solver_tableau_def.h), MIT
3
- // license, see z3-license.txt.
4
1
  import { Rational } from "../rational";
5
2
  import { IndexedUintSet, StackedVector, VarHeap } from "./containers";
6
3
  import type { LpSettings } from "./lp-settings";
@@ -1,6 +1,3 @@
1
- // Ported from Z3 (src/math/lp/cross_nested.h), MIT license, see z3-license.txt.
2
- // Deviation from Z3: the occurrence map iterates in insertion order where Z3 has an unordered_map,
3
- // so an extracted common factor may list its variables in another order.
4
1
  import { Rational } from "../rational";
5
2
  import {
6
3
  type Nex,
@@ -147,7 +144,7 @@ export class CrossNested {
147
144
  private getVarsFromOccurencesMap() {
148
145
  const occurences = this.nexCreator.occurencesMap;
149
146
  const isRandomBit = this.nextRandom() % 2 === 1;
150
- return [...occurences.keys()].sort((first, second) => {
147
+ return Array.from(occurences, (entry) => entry[0]).sort((first, second) => {
151
148
  const firstOcc = occurences.get(first);
152
149
  const secondOcc = occurences.get(second);
153
150
  if (firstOcc === undefined || secondOcc === undefined) return 0;
@@ -1,6 +1,3 @@
1
- // Ported from Z3 (src/math/interval/interval.h, src/math/interval/interval_def.h,
2
- // src/math/interval/dep_intervals.h, src/math/interval/dep_intervals.cpp), MIT license, see
3
- // z3-license.txt.
4
1
  import { Rational } from "../rational";
5
2
  import { type Dependency, linearize, mkJoin } from "./dependency";
6
3
 
@@ -1,5 +1,3 @@
1
- // Ported from Z3 (src/util/dependency.h), MIT license, see z3-license.txt.
2
-
3
1
  export interface DependencyLeaf {
4
2
  readonly isLeaf: true;
5
3
  readonly value: number;
@@ -1,5 +1,3 @@
1
- // Ported from Z3 (src/math/lp/dioph_eq.cpp, src/math/lp/var_register.h), MIT license, see
2
- // z3-license.txt.
3
1
  import { SmtInvariantError } from "../../../../errors";
4
2
  import { getGcd, getLcm, Rational } from "../rational";
5
3
  import { IndexedUintSet, UnorderedUintMap } from "./containers";
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/math/lp/explanation.h), MIT license, see z3-license.txt.
2
1
  import { getIdentityHash, ObjMap } from "../hashtable";
3
2
  import { Rational } from "../rational";
4
3
  import { type Dependency, linearize } from "./dependency";
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/math/lp/gomory.cpp), MIT license, see z3-license.txt.
2
1
  import { Rational } from "../rational";
3
2
  import { KIND_GE, KIND_LE } from "./constraints";
4
3
  import { LP_CANCELLED } from "./core-solver";
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/math/lp/hnf_cutter.cpp, and get_equality_and_right_side_for_term_on_current_x in src/math/lp/lar_solver.cpp), MIT license, see z3-license.txt.
2
1
  import { Rational } from "../rational";
3
2
  import type { Dependency } from "./dependency";
4
3
  import { GeneralMatrix, getDeterminantOfRectangularMatrix, getHermiteNormalForm } from "./hnf";
@@ -1,6 +1,3 @@
1
- // Ported from Z3 (src/math/lp/hnf.h, src/math/lp/general_matrix.h,
2
- // src/math/lp/permutation_matrix.h, and the extended gcd of src/util/mpz.cpp), MIT license, see
3
- // z3-license.txt.
4
1
  import { Rational } from "../rational";
5
2
 
6
3
  export const getRemainder = (first: Rational, second: Rational) =>
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/math/lp/int_cube.cpp, and tighten_term_bounds_by_delta and round_to_integer_solution in src/math/lp/lar_solver.cpp), MIT license, see z3-license.txt.
2
1
  import { Rational } from "../rational";
3
2
  import { type ConstraintKind, KIND_GE, KIND_GT, KIND_LE, KIND_LT } from "./constraints";
4
3
  import { LP_FEASIBLE, LP_OPTIMAL, LP_UNBOUNDED } from "./core-solver";
@@ -1,5 +1,3 @@
1
- // Ported from Z3 (src/math/lp/int_solver.cpp, src/math/lp/int_gcd_test.cpp,
2
- // src/math/lp/int_branch.cpp), MIT license, see z3-license.txt.
3
1
  import { getGcd, getLcm, Rational } from "../rational";
4
2
  import { COLUMN_BOXED, COLUMN_FIXED, COLUMN_FREE, COLUMN_LOWER, COLUMN_UPPER } from "./core-solver";
5
3
  import { DiophantineSolver } from "./dioph-eq";
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/math/lp/lar_solver.h, src/math/lp/lar_solver.cpp, src/math/lp/column.h, src/math/lp/var_register.h), MIT license, see z3-license.txt.
2
1
  import { SmtInvariantError } from "../../../../errors";
3
2
  import { Rational } from "../rational";
4
3
  import { IndexedUintSet, StackedVector } from "./containers";
@@ -628,7 +627,7 @@ export class LarSolver {
628
627
  }
629
628
 
630
629
  hasIntVar() {
631
- return this.localIsInt.some((isInt) => isInt);
630
+ return this.localIsInt.includes(true);
632
631
  }
633
632
 
634
633
  // Columns added after the backup get basic values from their rows, as the tableau requires.
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/math/lp/lar_term.h), MIT license, see z3-license.txt.
2
1
  import { getIdentityHash, ObjMap } from "../hashtable";
3
2
  import { Rational } from "../rational";
4
3
  import { Impq } from "./numeric-pair";
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/math/lp/lp_settings.h, src/math/lp/lp_settings.cpp), MIT license, see z3-license.txt.
2
1
  import { RandomGen } from "../random-gen";
3
2
 
4
3
  export interface LpStats {
@@ -1,6 +1,3 @@
1
- // Ported from Z3 (maximize_term and its helpers in src/math/lp/lar_solver.cpp, and the tableau part
2
- // of src/math/lp/lp_primal_core_solver.h, src/math/lp/lp_primal_core_solver_def.h,
3
- // src/math/lp/lp_primal_core_solver_tableau_def.h), MIT license, see z3-license.txt.
4
1
  import { Rational } from "../rational";
5
2
  import {
6
3
  COLUMN_BOXED,
@@ -1,5 +1,5 @@
1
- // Ported from Z3 (src/math/lp/nex_creator.h, src/math/lp/nex_creator.cpp), MIT license, see z3-license.txt.
2
1
  import { Rational } from "../rational";
2
+ import { UnorderedUintMap } from "./containers";
3
3
  import {
4
4
  type Nex,
5
5
  type NexMul,
@@ -25,8 +25,8 @@ interface MapEntry<Value> {
25
25
  }
26
26
 
27
27
  export class NexCreator {
28
- readonly occurencesMap = new Map<number, Occ>();
29
- readonly powers = new Map<number, number>();
28
+ readonly occurencesMap = new UnorderedUintMap<Occ>();
29
+ readonly powers = new UnorderedUintMap<number>();
30
30
  private activeVarsWeights: number[] = [];
31
31
 
32
32
  setNumberOfVars(count: number) {
@@ -1,5 +1,5 @@
1
- // Ported from Z3 (src/math/lp/nex.h), MIT license, see z3-license.txt.
2
1
  import { Rational } from "../rational";
2
+ import type { UnorderedUintMap } from "./containers";
3
3
 
4
4
  interface NexScalar {
5
5
  readonly kind: "scalar";
@@ -64,7 +64,7 @@ export const isALinearTerm = (sum: NexSum) => {
64
64
  return numberOfNonScalars > 1;
65
65
  };
66
66
 
67
- export const getPowersFromMul = (mul: NexMul, powers: Map<number, number>) => {
67
+ export const getPowersFromMul = (mul: NexMul, powers: UnorderedUintMap<number>) => {
68
68
  powers.clear();
69
69
  for (const child of mul.children)
70
70
  if (child.expr.kind === "var") powers.set(child.expr.variable, child.power);