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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (530) hide show
  1. package/dist/compile.cjs +3 -3
  2. package/dist/compile.js +1 -1
  3. package/dist/deciders.cjs +37 -36
  4. package/dist/deciders.js +38 -37
  5. package/dist/index.cjs +1 -1
  6. package/dist/index.d.cts +5 -1
  7. package/dist/index.d.ts +5 -1
  8. package/dist/index.js +1 -1
  9. package/dist/parallel-worker.cjs +1 -1
  10. package/dist/parallel-worker.js +1 -1
  11. package/dist/prove-worker.cjs +1 -1
  12. package/dist/prove-worker.js +1 -1
  13. package/dist/prove.cjs +146 -58
  14. package/dist/prove.js +145 -57
  15. package/dist/run.cjs +43 -43
  16. package/dist/run.js +45 -45
  17. package/dist/tlapm.cjs +1 -1
  18. package/dist/tlapm.js +2 -2
  19. package/dist/transfer.cjs +40 -37
  20. package/dist/transfer.js +38 -35
  21. package/dist/worker.cjs +6 -6
  22. package/dist/worker.js +6 -6
  23. package/package.json +1 -1
  24. package/src/ast.ts +4 -3
  25. package/src/bags.ts +46 -28
  26. package/src/check-trace.ts +2 -16
  27. package/src/check.ts +349 -91
  28. package/src/cli/runtime-invariants.ts +20 -56
  29. package/src/cli/tlapm.ts +268 -71
  30. package/src/cli/tlc-arguments.ts +2 -2
  31. package/src/cli/tlc-output.ts +4 -5
  32. package/src/cli/tlc-usage.ts +0 -1
  33. package/src/cli/tlc.ts +26 -7
  34. package/src/cli/xml-exporter.ts +1 -1
  35. package/src/codegen.ts +9 -5
  36. package/src/dependencies.ts +72 -11
  37. package/src/dfid.ts +9 -2
  38. package/src/environment.ts +65 -36
  39. package/src/errors.ts +8 -1
  40. package/src/evaluate.ts +92 -32
  41. package/src/exit-codes.ts +5 -2
  42. package/src/instances.ts +5 -5
  43. package/src/java-overrides.ts +2 -2
  44. package/src/levels.ts +138 -90
  45. package/src/liveness-checker.ts +572 -204
  46. package/src/liveness.ts +47 -32
  47. package/src/obligations/action.ts +0 -2
  48. package/src/obligations/anonymize.ts +2 -6
  49. package/src/obligations/equality.ts +0 -2
  50. package/src/obligations/expression.ts +0 -2
  51. package/src/obligations/format.ts +0 -2
  52. package/src/obligations/generate.ts +0 -2
  53. package/src/obligations/index.ts +9 -8
  54. package/src/obligations/levels.ts +0 -2
  55. package/src/obligations/module.ts +0 -2
  56. package/src/obligations/normalize.ts +1 -6
  57. package/src/obligations/operators.ts +0 -2
  58. package/src/obligations/pragma.ts +2 -2
  59. package/src/obligations/printer.ts +5 -7
  60. package/src/obligations/proof.ts +0 -2
  61. package/src/obligations/regroup.ts +0 -2
  62. package/src/obligations/simplify.ts +0 -2
  63. package/src/obligations/subexpression.ts +1 -4
  64. package/src/obligations/substitution.ts +0 -2
  65. package/src/obligations/temporal.ts +0 -2
  66. package/src/obligations/tuples.ts +0 -2
  67. package/src/parallel-worker.ts +8 -2
  68. package/src/parallel.ts +7 -2
  69. package/src/parser.ts +256 -185
  70. package/src/pretty-print.ts +1 -1
  71. package/src/prover/deciders.ts +1 -8
  72. package/src/prover/isabelle/encode.ts +0 -2
  73. package/src/prover/isabelle/isar/attrib.ts +86 -55
  74. package/src/prover/isabelle/isar/context.ts +25 -26
  75. package/src/prover/isabelle/isar/induct.ts +2 -12
  76. package/src/prover/isabelle/isar/method.ts +6 -10
  77. package/src/prover/isabelle/isar/proof.ts +40 -39
  78. package/src/prover/isabelle/isar/rule-cases.ts +14 -22
  79. package/src/prover/isabelle/isar/theory.ts +16 -17
  80. package/src/prover/isabelle/isar/toplevel.ts +46 -56
  81. package/src/prover/isabelle/isar/type-check.ts +0 -2
  82. package/src/prover/isabelle/provers/blast/blast.ts +0 -2
  83. package/src/prover/isabelle/provers/blast/branch.ts +0 -2
  84. package/src/prover/isabelle/provers/blast/prove.ts +0 -2
  85. package/src/prover/isabelle/provers/blast/rules.ts +0 -2
  86. package/src/prover/isabelle/provers/blast/state.ts +0 -2
  87. package/src/prover/isabelle/provers/blast/term.ts +0 -2
  88. package/src/prover/isabelle/provers/clasimp.ts +1 -3
  89. package/src/prover/isabelle/provers/classical.ts +1 -3
  90. package/src/prover/isabelle/provers/hypsubst.ts +2 -4
  91. package/src/prover/isabelle/pure/bicompose.ts +0 -2
  92. package/src/prover/isabelle/pure/consts.ts +0 -2
  93. package/src/prover/isabelle/pure/conv.ts +0 -2
  94. package/src/prover/isabelle/pure/drule.ts +0 -2
  95. package/src/prover/isabelle/pure/envir.ts +0 -2
  96. package/src/prover/isabelle/pure/goal.ts +0 -2
  97. package/src/prover/isabelle/pure/logic.ts +0 -2
  98. package/src/prover/isabelle/pure/name.ts +0 -2
  99. package/src/prover/isabelle/pure/net.ts +0 -2
  100. package/src/prover/isabelle/pure/object-logic.ts +0 -2
  101. package/src/prover/isabelle/pure/pattern.ts +0 -2
  102. package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
  103. package/src/prover/isabelle/pure/rewriter.ts +3 -5
  104. package/src/prover/isabelle/pure/search.ts +0 -2
  105. package/src/prover/isabelle/pure/seq.ts +0 -2
  106. package/src/prover/isabelle/pure/simplifier.ts +0 -2
  107. package/src/prover/isabelle/pure/table.ts +0 -2
  108. package/src/prover/isabelle/pure/tactic.ts +0 -2
  109. package/src/prover/isabelle/pure/tactical.ts +0 -2
  110. package/src/prover/isabelle/pure/term-ord.ts +0 -2
  111. package/src/prover/isabelle/pure/term.ts +3 -5
  112. package/src/prover/isabelle/pure/thm.ts +0 -2
  113. package/src/prover/isabelle/pure/type.ts +0 -2
  114. package/src/prover/isabelle/pure/unify.ts +0 -2
  115. package/src/prover/isabelle/pure/variable.ts +0 -2
  116. package/src/prover/isabelle/tla/classical-setup.ts +0 -2
  117. package/src/prover/isabelle/tla/simpdata.ts +0 -2
  118. package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
  119. package/src/prover/ocaml.ts +4 -1
  120. package/src/prover/prep/action.ts +1 -0
  121. package/src/prover/prep/md5.ts +26 -29
  122. package/src/prover/prep/methods.ts +55 -6
  123. package/src/prover/prep/normalize.ts +4 -1
  124. package/src/prover/prove.ts +58 -32
  125. package/src/prover/ptl/decide.ts +43 -63
  126. package/src/prover/smt/context.ts +10 -14
  127. package/src/prover/smt/data.ts +51 -45
  128. package/src/prover/smt/encode.ts +1 -2
  129. package/src/prover/smt/rewrite.ts +3 -7
  130. package/src/prover/smt/simplify.ts +1 -1
  131. package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
  132. package/src/prover/smt/solver/ackr-helper.ts +0 -3
  133. package/src/prover/smt/solver/ackr-model-converter.ts +1 -8
  134. package/src/prover/smt/solver/act-cache.ts +0 -1
  135. package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
  136. package/src/prover/smt/solver/aig-tactic.ts +25 -16
  137. package/src/prover/smt/solver/aig.ts +2 -3
  138. package/src/prover/smt/solver/arith-rewriter.ts +4 -7
  139. package/src/prover/smt/solver/arith-terms.ts +0 -2
  140. package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
  141. package/src/prover/smt/solver/array-rewriter.ts +1 -4
  142. package/src/prover/smt/solver/asserted-formulas.ts +67 -3
  143. package/src/prover/smt/solver/ast-lt.ts +2 -3
  144. package/src/prover/smt/solver/ast-util.ts +4 -5
  145. package/src/prover/smt/solver/ast.ts +171 -168
  146. package/src/prover/smt/solver/auf-solver.ts +0 -1
  147. package/src/prover/smt/solver/bit-blast-tactic.ts +2 -11
  148. package/src/prover/smt/solver/bit-blaster.ts +0 -3
  149. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  150. package/src/prover/smt/solver/bound-manager.ts +39 -29
  151. package/src/prover/smt/solver/bound-simplifier.ts +2 -5
  152. package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
  153. package/src/prover/smt/solver/bv-decl-plugin.ts +13 -11
  154. package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
  155. package/src/prover/smt/solver/bv-rewriter.ts +15 -19
  156. package/src/prover/smt/solver/bv1-blast.ts +1 -11
  157. package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
  158. package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
  159. package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
  160. package/src/prover/smt/solver/card2bv.ts +3 -7
  161. package/src/prover/smt/solver/case-split-queue.ts +0 -2
  162. package/src/prover/smt/solver/cg-table.ts +19 -16
  163. package/src/prover/smt/solver/check-logic.ts +6 -2
  164. package/src/prover/smt/solver/clause.ts +0 -1
  165. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +2 -5
  166. package/src/prover/smt/solver/conflict-resolution.ts +8 -8
  167. package/src/prover/smt/solver/context.ts +45 -15
  168. package/src/prover/smt/solver/ctx-simplify.ts +1 -3
  169. package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
  170. package/src/prover/smt/solver/datatype-decl-plugin.ts +22 -17
  171. package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
  172. package/src/prover/smt/solver/demodulator.ts +2 -5
  173. package/src/prover/smt/solver/dependent-expr-state.ts +25 -7
  174. package/src/prover/smt/solver/der.ts +0 -1
  175. package/src/prover/smt/solver/diff-neq.ts +1 -3
  176. package/src/prover/smt/solver/distribute-forall.ts +1 -11
  177. package/src/prover/smt/solver/dom-simplify.ts +1 -3
  178. package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
  179. package/src/prover/smt/solver/dyn-ack.ts +0 -1
  180. package/src/prover/smt/solver/e-matching.ts +6 -7
  181. package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
  182. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  183. package/src/prover/smt/solver/elim-uncnstr.ts +7 -23
  184. package/src/prover/smt/solver/enode.ts +16 -10
  185. package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
  186. package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
  187. package/src/prover/smt/solver/euf/arith-internalize.ts +2 -8
  188. package/src/prover/smt/solver/euf/arith-solver.ts +0 -6
  189. package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
  190. package/src/prover/smt/solver/euf/array-internalize.ts +21 -12
  191. package/src/prover/smt/solver/euf/array-solver.ts +0 -2
  192. package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
  193. package/src/prover/smt/solver/euf/bv-internalize.ts +1 -3
  194. package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
  195. package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
  196. package/src/prover/smt/solver/euf/egraph.ts +69 -53
  197. package/src/prover/smt/solver/euf/euf-solver.ts +38 -37
  198. package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
  199. package/src/prover/smt/solver/euf/mam.ts +7 -55
  200. package/src/prover/smt/solver/euf/q-ematch.ts +27 -98
  201. package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
  202. package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
  203. package/src/prover/smt/solver/euf/q-solver.ts +3 -3
  204. package/src/prover/smt/solver/euf/th-solver.ts +1 -16
  205. package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
  206. package/src/prover/smt/solver/expr-ref.ts +0 -1
  207. package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
  208. package/src/prover/smt/solver/expr2polynomial.ts +204 -80
  209. package/src/prover/smt/solver/factor.ts +37 -26
  210. package/src/prover/smt/solver/fd-solver.ts +3 -5
  211. package/src/prover/smt/solver/fingerprints.ts +0 -1
  212. package/src/prover/smt/solver/fix-dl-var.ts +2 -4
  213. package/src/prover/smt/solver/flat-literals.ts +0 -1
  214. package/src/prover/smt/solver/fm-tactic.ts +25 -14
  215. package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
  216. package/src/prover/smt/solver/fpa-rewriter.ts +12 -14
  217. package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
  218. package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -1
  219. package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
  220. package/src/prover/smt/solver/goal.ts +6 -4
  221. package/src/prover/smt/solver/goal2nlsat.ts +57 -32
  222. package/src/prover/smt/solver/guard-set.ts +0 -1
  223. package/src/prover/smt/solver/hash.ts +0 -1
  224. package/src/prover/smt/solver/hashtable.ts +4 -1
  225. package/src/prover/smt/solver/inf-eps.ts +1 -2
  226. package/src/prover/smt/solver/inj-axiom.ts +0 -1
  227. package/src/prover/smt/solver/internalizer.ts +41 -3
  228. package/src/prover/smt/solver/lackr.ts +0 -2
  229. package/src/prover/smt/solver/lbool.ts +0 -1
  230. package/src/prover/smt/solver/lia2card.ts +1 -2
  231. package/src/prover/smt/solver/lia2pb.ts +18 -5
  232. package/src/prover/smt/solver/literal.ts +0 -1
  233. package/src/prover/smt/solver/logic-tactics.ts +9 -6
  234. package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
  235. package/src/prover/smt/solver/lp/constraints.ts +0 -1
  236. package/src/prover/smt/solver/lp/containers.ts +7 -2
  237. package/src/prover/smt/solver/lp/core-solver.ts +0 -3
  238. package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
  239. package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
  240. package/src/prover/smt/solver/lp/dependency.ts +0 -2
  241. package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
  242. package/src/prover/smt/solver/lp/explanation.ts +0 -1
  243. package/src/prover/smt/solver/lp/gomory.ts +0 -1
  244. package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
  245. package/src/prover/smt/solver/lp/hnf.ts +0 -3
  246. package/src/prover/smt/solver/lp/int-cube.ts +0 -1
  247. package/src/prover/smt/solver/lp/int-solver.ts +0 -2
  248. package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
  249. package/src/prover/smt/solver/lp/lar-term.ts +0 -1
  250. package/src/prover/smt/solver/lp/lp-settings.ts +1 -2
  251. package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
  252. package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
  253. package/src/prover/smt/solver/lp/nex.ts +2 -2
  254. package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
  255. package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
  256. package/src/prover/smt/solver/lp/nla-core.ts +26 -7
  257. package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
  258. package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
  259. package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
  260. package/src/prover/smt/solver/lp/nla-grobner.ts +158 -82
  261. package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
  262. package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
  263. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
  264. package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
  265. package/src/prover/smt/solver/lp/nla-order.ts +0 -2
  266. package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
  267. package/src/prover/smt/solver/lp/nla-powers.ts +144 -108
  268. package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
  269. package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
  270. package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -19
  271. package/src/prover/smt/solver/lp/nla-types.ts +0 -2
  272. package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
  273. package/src/prover/smt/solver/lp/nra-solver.ts +138 -97
  274. package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
  275. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
  276. package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
  277. package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
  278. package/src/prover/smt/solver/lp/pdd.ts +725 -290
  279. package/src/prover/smt/solver/lp/random-updater.ts +0 -2
  280. package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
  281. package/src/prover/smt/solver/lp/union-find.ts +1 -2
  282. package/src/prover/smt/solver/macro-finder.ts +1 -4
  283. package/src/prover/smt/solver/mam-compiler.ts +14 -15
  284. package/src/prover/smt/solver/mam-interpreter.ts +0 -1
  285. package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
  286. package/src/prover/smt/solver/max-cliques.ts +0 -2
  287. package/src/prover/smt/solver/maxcore.ts +6 -15
  288. package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -2
  289. package/src/prover/smt/solver/maxlex.ts +0 -8
  290. package/src/prover/smt/solver/maxsmt-base.ts +7 -1
  291. package/src/prover/smt/solver/maxsmt.ts +0 -1
  292. package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
  293. package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
  294. package/src/prover/smt/solver/mbp/mbp-plugin.ts +10 -3
  295. package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
  296. package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
  297. package/src/prover/smt/solver/mbp/mbp-term-graph.ts +1 -19
  298. package/src/prover/smt/solver/model-based-opt.ts +1 -2
  299. package/src/prover/smt/solver/model-checker.ts +2 -3
  300. package/src/prover/smt/solver/model-evaluator.ts +9 -6
  301. package/src/prover/smt/solver/model-finder.ts +0 -1
  302. package/src/prover/smt/solver/model-generator.ts +3 -2
  303. package/src/prover/smt/solver/model-macro-solver.ts +3 -4
  304. package/src/prover/smt/solver/model-printer.ts +0 -1
  305. package/src/prover/smt/solver/mpf.ts +2 -5
  306. package/src/prover/smt/solver/mus.ts +2 -4
  307. package/src/prover/smt/solver/muz/dl-context.ts +67 -19
  308. package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
  309. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
  310. package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
  311. package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -6
  312. package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
  313. package/src/prover/smt/solver/muz/dl-mk-slice.ts +78 -16
  314. package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
  315. package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -30
  316. package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
  317. package/src/prover/smt/solver/muz/dl-rule.ts +93 -57
  318. package/src/prover/smt/solver/muz/hnf.ts +6 -6
  319. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
  320. package/src/prover/smt/solver/muz/horn-tactic.ts +15 -6
  321. package/src/prover/smt/solver/muz/rule-properties.ts +195 -37
  322. package/src/prover/smt/solver/muz/spacer-context.ts +111 -102
  323. package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -4
  324. package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
  325. package/src/prover/smt/solver/muz/spacer-manager.ts +0 -6
  326. package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
  327. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +4 -15
  328. package/src/prover/smt/solver/muz/spacer-util.ts +2 -29
  329. package/src/prover/smt/solver/muz/substitution.ts +88 -39
  330. package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
  331. package/src/prover/smt/solver/nlqsat.ts +5 -5
  332. package/src/prover/smt/solver/nlsat/algebraic.ts +197 -96
  333. package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
  334. package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
  335. package/src/prover/smt/solver/nlsat/explain.ts +379 -217
  336. package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
  337. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
  338. package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
  339. package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
  340. package/src/prover/smt/solver/nlsat/solver.ts +118 -105
  341. package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
  342. package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
  343. package/src/prover/smt/solver/nlsat/types.ts +0 -2
  344. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
  345. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
  346. package/src/prover/smt/solver/nlsat-tactic.ts +1 -2
  347. package/src/prover/smt/solver/nnf.ts +6 -3
  348. package/src/prover/smt/solver/normalize-bounds.ts +0 -1
  349. package/src/prover/smt/solver/occf.ts +0 -1
  350. package/src/prover/smt/solver/opt-context.ts +19 -13
  351. package/src/prover/smt/solver/opt-nlsat.ts +97 -77
  352. package/src/prover/smt/solver/opt-pareto.ts +0 -2
  353. package/src/prover/smt/solver/opt-preprocess.ts +1 -2
  354. package/src/prover/smt/solver/opt-solver.ts +22 -11
  355. package/src/prover/smt/solver/opt-value.ts +0 -1
  356. package/src/prover/smt/solver/optsmt.ts +13 -12
  357. package/src/prover/smt/solver/parallel-tactic.ts +0 -2
  358. package/src/prover/smt/solver/pattern-inference.ts +2 -3
  359. package/src/prover/smt/solver/pb-rewriter.ts +15 -30
  360. package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
  361. package/src/prover/smt/solver/poly-rewriter.ts +76 -21
  362. package/src/prover/smt/solver/probes.ts +91 -28
  363. package/src/prover/smt/solver/propagate-values.ts +4 -1
  364. package/src/prover/smt/solver/proto-model.ts +9 -12
  365. package/src/prover/smt/solver/pull-quant.ts +0 -1
  366. package/src/prover/smt/solver/purify-arith.ts +50 -16
  367. package/src/prover/smt/solver/qe-arith-plugin.ts +4 -7
  368. package/src/prover/smt/solver/qe-lite-der.ts +0 -1
  369. package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
  370. package/src/prover/smt/solver/qe-lite.ts +2 -3
  371. package/src/prover/smt/solver/qe-mbp.ts +13 -24
  372. package/src/prover/smt/solver/qe.ts +48 -57
  373. package/src/prover/smt/solver/qel.ts +0 -1
  374. package/src/prover/smt/solver/qi-queue.ts +0 -1
  375. package/src/prover/smt/solver/qsat.ts +71 -97
  376. package/src/prover/smt/solver/quant-hoist.ts +2 -1
  377. package/src/prover/smt/solver/quant-tactics.ts +0 -1
  378. package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
  379. package/src/prover/smt/solver/quantifier-manager.ts +14 -10
  380. package/src/prover/smt/solver/quasi-macros.ts +9 -20
  381. package/src/prover/smt/solver/random-gen.ts +0 -1
  382. package/src/prover/smt/solver/rational.ts +17 -1
  383. package/src/prover/smt/solver/recfun-decl-plugin.ts +35 -21
  384. package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
  385. package/src/prover/smt/solver/reduce-args.ts +0 -1
  386. package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
  387. package/src/prover/smt/solver/ref-vector.ts +0 -1
  388. package/src/prover/smt/solver/relevancy.ts +0 -1
  389. package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
  390. package/src/prover/smt/solver/rewriter.ts +1 -2
  391. package/src/prover/smt/solver/rlimit.ts +17 -1
  392. package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
  393. package/src/prover/smt/solver/sat/big.ts +0 -1
  394. package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
  395. package/src/prover/smt/solver/sat/clause.ts +2 -20
  396. package/src/prover/smt/solver/sat/cleaner.ts +0 -2
  397. package/src/prover/smt/solver/sat/config.ts +6 -9
  398. package/src/prover/smt/solver/sat/consequences.ts +1 -2
  399. package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
  400. package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
  401. package/src/prover/smt/solver/sat/inc-sat-solver.ts +30 -15
  402. package/src/prover/smt/solver/sat/model-converter.ts +2 -22
  403. package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
  404. package/src/prover/smt/solver/sat/pb-solver.ts +50 -26
  405. package/src/prover/smt/solver/sat/probing.ts +22 -21
  406. package/src/prover/smt/solver/sat/sat-tactic.ts +4 -4
  407. package/src/prover/smt/solver/sat/sat2goal.ts +9 -15
  408. package/src/prover/smt/solver/sat/scc.ts +1 -2
  409. package/src/prover/smt/solver/sat/simplifier.ts +16 -60
  410. package/src/prover/smt/solver/sat/solver.ts +47 -70
  411. package/src/prover/smt/solver/sat/var-queue.ts +0 -2
  412. package/src/prover/smt/solver/sat/watch-list.ts +7 -3
  413. package/src/prover/smt/solver/search-tree.ts +0 -1
  414. package/src/prover/smt/solver/seq-axioms.ts +21 -39
  415. package/src/prover/smt/solver/seq-decl-plugin.ts +10 -14
  416. package/src/prover/smt/solver/seq-derive.ts +11 -16
  417. package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
  418. package/src/prover/smt/solver/seq-eq-solver.ts +9 -10
  419. package/src/prover/smt/solver/seq-factory.ts +2 -4
  420. package/src/prover/smt/solver/seq-monadic.ts +7 -7
  421. package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
  422. package/src/prover/smt/solver/seq-re-rewriter.ts +5 -130
  423. package/src/prover/smt/solver/seq-re-util.ts +8 -27
  424. package/src/prover/smt/solver/seq-regex-bisim.ts +2 -3
  425. package/src/prover/smt/solver/seq-regex-live.ts +6 -8
  426. package/src/prover/smt/solver/seq-rewriter.ts +32 -35
  427. package/src/prover/smt/solver/seq-skolem.ts +0 -24
  428. package/src/prover/smt/solver/seq-subset.ts +0 -1
  429. package/src/prover/smt/solver/seq-view-witness.ts +4 -6
  430. package/src/prover/smt/solver/smt-consequences.ts +0 -2
  431. package/src/prover/smt/solver/smt-kernel.ts +9 -5
  432. package/src/prover/smt/solver/smt-logics.ts +0 -1
  433. package/src/prover/smt/solver/smt-setup.ts +86 -20
  434. package/src/prover/smt/solver/smt2-printer.ts +0 -2
  435. package/src/prover/smt/solver/smtlib-parser.ts +1681 -721
  436. package/src/prover/smt/solver/smtlib-script.ts +1273 -793
  437. package/src/prover/smt/solver/solve-eqs.ts +13 -23
  438. package/src/prover/smt/solver/solver.ts +1 -2
  439. package/src/prover/smt/solver/static-features.ts +0 -5
  440. package/src/prover/smt/solver/sticky-generations.ts +0 -1
  441. package/src/prover/smt/solver/tactic.ts +269 -130
  442. package/src/prover/smt/solver/term-enumeration.ts +0 -1
  443. package/src/prover/smt/solver/theory-array.ts +25 -60
  444. package/src/prover/smt/solver/theory-bv.ts +15 -54
  445. package/src/prover/smt/solver/theory-char.ts +0 -1
  446. package/src/prover/smt/solver/theory-datatype.ts +0 -1
  447. package/src/prover/smt/solver/theory-finite-set.ts +2 -2
  448. package/src/prover/smt/solver/theory-fpa.ts +46 -79
  449. package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
  450. package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
  451. package/src/prover/smt/solver/theory-lra-final-check.ts +1 -2
  452. package/src/prover/smt/solver/theory-lra-internalize.ts +9 -1
  453. package/src/prover/smt/solver/theory-lra-model.ts +0 -1
  454. package/src/prover/smt/solver/theory-lra-propagate.ts +6 -5
  455. package/src/prover/smt/solver/theory-lra-state.ts +0 -1
  456. package/src/prover/smt/solver/theory-lra.ts +0 -7
  457. package/src/prover/smt/solver/theory-pb.ts +34 -15
  458. package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
  459. package/src/prover/smt/solver/theory-recfun.ts +2 -3
  460. package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
  461. package/src/prover/smt/solver/theory-seq-solve.ts +6 -8
  462. package/src/prover/smt/solver/theory-seq-state.ts +8 -36
  463. package/src/prover/smt/solver/theory-seq.ts +32 -55
  464. package/src/prover/smt/solver/theory.ts +16 -2
  465. package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
  466. package/src/prover/smt/solver/var-subst.ts +6 -6
  467. package/src/prover/smt/table.ts +3 -2
  468. package/src/prover/tlapm/cache.ts +8 -8
  469. package/src/prover/zenon/decide.ts +9 -13
  470. package/src/prover/zenon/encode.ts +0 -2
  471. package/src/prover/zenon/eqrel.ts +0 -2
  472. package/src/prover/zenon/equality-rules.ts +24 -2
  473. package/src/prover/zenon/expr.ts +21 -2
  474. package/src/prover/zenon/index-table.ts +7 -4
  475. package/src/prover/zenon/isar-case.ts +1 -3
  476. package/src/prover/zenon/isar.ts +2 -4
  477. package/src/prover/zenon/llproof.ts +0 -2
  478. package/src/prover/zenon/mltoll.ts +0 -2
  479. package/src/prover/zenon/node.ts +12 -13
  480. package/src/prover/zenon/parse.ts +0 -2
  481. package/src/prover/zenon/phrase.ts +1 -3
  482. package/src/prover/zenon/proof.ts +0 -2
  483. package/src/prover/zenon/propositional-rules.ts +0 -2
  484. package/src/prover/zenon/rules.ts +2 -3
  485. package/src/prover/zenon/search.ts +0 -2
  486. package/src/prover/zenon/tla/functions.ts +0 -2
  487. package/src/prover/zenon/tla/llproof.ts +0 -2
  488. package/src/prover/zenon/tla/records.ts +0 -2
  489. package/src/prover/zenon/tla/rewrites.ts +0 -2
  490. package/src/prover/zenon/tla/sets.ts +1 -3
  491. package/src/prover/zenon/tla/terms.ts +0 -2
  492. package/src/prover/zenon/tla/tla.ts +0 -2
  493. package/src/resolve.ts +625 -189
  494. package/src/runtime.ts +7 -1
  495. package/src/sany/builtins.ts +10 -10
  496. package/src/sany/generation.ts +2 -13
  497. package/src/sany/generator-definitions.ts +3 -1
  498. package/src/sany/generator-expressions.ts +36 -30
  499. package/src/sany/generator-proofs.ts +5 -3
  500. package/src/sany/generator.ts +2 -1
  501. package/src/sany/levels.ts +0 -2
  502. package/src/sany/lexer.ts +3 -3
  503. package/src/sany/linter.ts +0 -2
  504. package/src/sany/modules.ts +4 -2
  505. package/src/sany/nodes.ts +1 -1
  506. package/src/sany/selectors.ts +11 -6
  507. package/src/sany/xml.ts +2 -3
  508. package/src/search.ts +209 -56
  509. package/src/simulate.ts +3 -0
  510. package/src/spec-description.ts +2 -2
  511. package/src/standard-definitions.ts +4 -0
  512. package/src/state-graph.ts +0 -2
  513. package/src/subexpressions.ts +265 -94
  514. package/src/successors.ts +2 -1
  515. package/src/symmetry.ts +3 -3
  516. package/src/tableau.ts +2 -2
  517. package/src/tlc/fingerprint.ts +81 -9
  518. package/src/tlc/jar-data.ts +10 -0
  519. package/src/tlc/messages.ts +3 -3
  520. package/src/tlc/order.ts +14 -3
  521. package/src/tlc/summary.ts +29 -14
  522. package/src/tlc/tlc-operators.ts +3 -1
  523. package/src/tlc/tlcext-operators.ts +61 -16
  524. package/src/tlc/trace-spec.ts +5 -5
  525. package/src/typed-tier.ts +6541 -0
  526. package/src/typescript/types.ts +2 -2
  527. package/src/values.ts +46 -27
  528. package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
  529. package/src/prover/smt/solver/z3-license.txt +0 -10
  530. package/src/prover/zenon/LICENSE +0 -32
@@ -1,5 +1,3 @@
1
- // Ported from Z3 (src/tactic/probe.cpp, src/tactic/arith/probe_arith.cpp), MIT license, see
2
- // z3-license.txt.
3
1
  import { SmtParseError, SmtUnsupportedError } from "../../../errors";
4
2
  import {
5
3
  type AstManager,
@@ -47,9 +45,11 @@ import {
47
45
  } from "./ast";
48
46
  import { getAckrBound } from "./ackr-helper";
49
47
  import { BoundManager } from "./bound-manager";
48
+ import { Expr2Polynomial } from "./expr2polynomial";
49
+ import { PolynomialManager, PolynomialRef } from "./nlsat/polynomial";
50
50
  import { findNonPb } from "./pb2bv-tactic";
51
51
  import type { Goal } from "./goal";
52
- import { isSymbol, type SExpr, type SmtToken } from "./smtlib-parser";
52
+ import { isSymbol, type SExpr } from "./smtlib-parser";
53
53
 
54
54
  export interface Probe {
55
55
  (goal: Goal): number;
@@ -59,8 +59,7 @@ const forEachExpr = (goal: Goal, visit: (expr: number) => void) => {
59
59
  const manager = goal.manager;
60
60
  const visited = new Set<number>();
61
61
  const todo = [...goal.forms.items].reverse();
62
- while (todo.length > 0) {
63
- const expr = todo.pop() as number;
62
+ for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
64
63
  if (visited.has(expr)) continue;
65
64
  visited.add(expr);
66
65
  visit(expr);
@@ -154,8 +153,8 @@ const mkNonQffp = (isLra: boolean) => (manager: AstManager, expr: number) => {
154
153
  return isLra ? sort !== SORT_REAL : !(sort === SORT_REAL && manager.isNumeral(expr));
155
154
  };
156
155
 
157
- // Ported from Z3 (src/tactic/fpa/qffp_tactic.cpp). Z3 rejects every application of the basic family
158
- // before it would accept one, so the goal must not have a Boolean connective.
156
+ // Z3 rejects every application of the basic family before it would accept one, so the goal must not
157
+ // have a Boolean connective.
159
158
  const isNonFpQfnra = (manager: AstManager, expr: number) => {
160
159
  if (!isApp(manager, expr)) return true;
161
160
  const family = manager.getFamily(expr);
@@ -267,7 +266,7 @@ const mkNonNira =
267
266
  const divisor = manager.getArg(expr, 1);
268
267
  if (isLinear)
269
268
  return !manager.isNumeral(divisor) || manager.getRationalValue(divisor).isZero();
270
- return !manager.isGround(manager.getArg(expr, 0)) || !manager.isGround(divisor);
269
+ return !manager.isGroundApp(manager.getArg(expr, 0)) || !manager.isGroundApp(divisor);
271
270
  }
272
271
  if (op === OP_IS_INT) return isReal;
273
272
  if (op === OP_TO_INT || op === OP_TO_REAL) return false;
@@ -363,6 +362,65 @@ const hasPatterns: Probe = (goal) => {
363
362
  );
364
363
  };
365
364
 
365
+ const mkArithDegreeProbe =
366
+ (isAverage: boolean): Probe =>
367
+ (goal) => {
368
+ const manager = goal.manager;
369
+ let variableCount = 0;
370
+ const expr2poly = new Expr2Polynomial(
371
+ manager,
372
+ new PolynomialManager(manager.limit),
373
+ new Map(),
374
+ () => variableCount++,
375
+ );
376
+ let maxDegree = 0;
377
+ let accDegree = 0;
378
+ let counter = 0;
379
+ const updateDegree = (polynomial: PolynomialRef) => {
380
+ const degree = expr2poly.pm.totalDegree(polynomial.get());
381
+ if (degree > maxDegree) maxDegree = degree;
382
+ accDegree += degree;
383
+ counter++;
384
+ };
385
+ const process = (expr: number) => {
386
+ const first = new PolynomialRef(expr2poly.pm);
387
+ const second = new PolynomialRef(expr2poly.pm);
388
+ expr2poly.toPolynomial(manager.getArg(expr, 0), first);
389
+ expr2poly.toPolynomial(manager.getArg(expr, 1), second);
390
+ updateDegree(first);
391
+ updateDegree(second);
392
+ second.reset();
393
+ first.reset();
394
+ };
395
+ forEachExpr(goal, (expr) => {
396
+ const op = manager.getOp(expr);
397
+ if (op === OP_LE || op === OP_LT || op === OP_GT || op === OP_GE) process(expr);
398
+ if (op === OP_EQ && isArithSort(manager.sorts[manager.getArg(expr, 0)])) process(expr);
399
+ });
400
+ expr2poly.release();
401
+ return isAverage ? (counter === 0 ? 0 : accDegree / counter) : maxDegree;
402
+ };
403
+
404
+ const getBitsize = (value: bigint) => (value < 0n ? -value : value).toString(2).length;
405
+
406
+ const mkArithBwProbe =
407
+ (isAverage: boolean): Probe =>
408
+ (goal) => {
409
+ const manager = goal.manager;
410
+ let maxBitWidth = 0;
411
+ let accBitWidth = 0;
412
+ let counter = 0;
413
+ forEachExpr(goal, (expr) => {
414
+ if (!manager.isNumeral(expr)) return;
415
+ const value = manager.getRationalValue(expr);
416
+ const bitWidth = getBitsize(value.num) + (value.den === 1n ? 0 : getBitsize(value.den));
417
+ if (bitWidth > maxBitWidth) maxBitWidth = bitWidth;
418
+ accBitWidth += bitWidth;
419
+ counter++;
420
+ });
421
+ return isAverage ? (counter === 0 ? 0 : accBitWidth / counter) : maxBitWidth;
422
+ };
423
+
366
424
  const NAMED_PROBES = new Map<string, Probe>([
367
425
  ["depth", (goal) => goal.depth],
368
426
  ["size", (goal) => goal.forms.size],
@@ -438,11 +496,13 @@ const NAMED_PROBES = new Map<string, Probe>([
438
496
  ),
439
497
  ],
440
498
  ["ackr-bound-probe", getAckrBound],
499
+ ["arith-max-deg", mkArithDegreeProbe(false)],
500
+ ["arith-avg-deg", mkArithDegreeProbe(true)],
501
+ ["arith-max-bw", mkArithBwProbe(false)],
502
+ ["arith-avg-bw", mkArithBwProbe(true)],
441
503
  ]);
442
504
 
443
- const UNPORTED_PROBES = new Set(
444
- "memory arith-max-deg arith-avg-deg arith-max-bw arith-avg-bw".split(" "),
445
- );
505
+ const UNPORTED_PROBES = new Set(["memory"]);
446
506
 
447
507
  const BINARY_PROBES = new Map<string, (first: number, second: number) => number>([
448
508
  ["=", (first, second) => Number(first === second)],
@@ -463,48 +523,51 @@ const NARY_PROBES = new Map<string, (first: number, second: number) => number>([
463
523
  ["*", (first, second) => first * second],
464
524
  ]);
465
525
 
466
- export const compileProbe = (sexpr: SExpr, end: SmtToken, isInternal = false): Probe => {
467
- if (sexpr.kind === "numeral") {
468
- const value = Number(sexpr.text);
469
- if (value > 2 ** 31 - 1)
526
+ export const compileProbe = (sexpr: SExpr, isInternal = false): Probe => {
527
+ // A decimal is a numeral of the s-expression, which is_int32 rejects unless it is whole.
528
+ if (sexpr.kind === "numeral" || sexpr.kind === "decimal") {
529
+ const [whole, fraction = ""] = sexpr.text.split(".");
530
+ const value = Number(whole);
531
+ if (!/^0*$/.test(fraction) || value > 2 ** 31 - 1)
470
532
  throw new SmtParseError(
471
533
  "invalid probe, constant is too big to fit in a fixed size integer",
472
- end,
534
+ sexpr,
473
535
  );
474
536
  return () => value;
475
537
  }
476
538
  if (sexpr.kind !== "list") {
477
- if (!isSymbol(sexpr)) throw new SmtParseError("invalid probe, unexpected input", end);
539
+ if (!isSymbol(sexpr)) throw new SmtParseError("invalid probe, unexpected input", sexpr);
478
540
  const named =
479
541
  NAMED_PROBES.get(sexpr.text) ?? (isInternal ? INTERNAL_PROBES.get(sexpr.text) : undefined);
480
542
  if (named !== undefined) return named;
481
543
  if (UNPORTED_PROBES.has(sexpr.text)) throw new SmtUnsupportedError(`the probe ${sexpr.text}`);
482
- throw new SmtParseError(`invalid probe, unknown builtin probe ${sexpr.text}`, end);
544
+ throw new SmtParseError(`invalid probe, unknown builtin probe ${sexpr.text}`, sexpr);
483
545
  }
484
546
  const head = sexpr.items[0];
485
- if (head === undefined) throw new SmtParseError("invalid probe, arguments expected", end);
486
- if (!isSymbol(head)) throw new SmtParseError("invalid probe, symbol expected", end);
547
+ if (head === undefined) throw new SmtParseError("invalid probe, arguments expected", sexpr.end);
548
+ if (!isSymbol(head)) throw new SmtParseError("invalid probe, symbol expected", sexpr.end);
487
549
  const children = sexpr.items.slice(1);
488
550
  if (head.text === "not") {
489
551
  if (children.length !== 1)
490
- throw new SmtParseError("invalid probe expression, one argument expected", end);
491
- const child = compileProbe(children[0], end, isInternal);
552
+ throw new SmtParseError("invalid probe expression, one argument expected", sexpr.end);
553
+ const child = compileProbe(children[0], isInternal);
492
554
  return (goal) => Number(child(goal) === 0);
493
555
  }
494
556
  const binary = BINARY_PROBES.get(head.text);
495
557
  if (binary !== undefined) {
496
558
  if (children.length !== 2)
497
- throw new SmtParseError("invalid probe expression, two arguments expected", end);
498
- const first = compileProbe(children[0], end, isInternal);
499
- const second = compileProbe(children[1], end, isInternal);
559
+ throw new SmtParseError("invalid probe expression, two arguments expected", sexpr.end);
560
+ const first = compileProbe(children[0], isInternal);
561
+ const second = compileProbe(children[1], isInternal);
500
562
  return (goal) => binary(first(goal), second(goal));
501
563
  }
502
564
  const nary = NARY_PROBES.get(head.text);
503
565
  if (nary === undefined)
504
- throw new SmtParseError(`invalid probe, unknown probe expression ${head.text}`, end);
566
+ throw new SmtParseError(`invalid probe, unknown probe expression ${head.text}`, sexpr.end);
505
567
  if (children.length === 0)
506
- throw new SmtParseError("invalid probe, at least one argument expected", end);
507
- const probes = children.map((child) => compileProbe(child, end, isInternal));
568
+ throw new SmtParseError("invalid probe, at least one argument expected", sexpr.end);
569
+ const probes = children.map((child) => compileProbe(child, isInternal));
570
+ // Deviation from Z3: MK_NARY_PROBE applies the operator to its first argument twice.
508
571
  return (goal) => probes.map((probe) => probe(goal)).reduce(nary);
509
572
  };
510
573
 
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/tactic/core/propagate_values_tactic.cpp, src/ast/shared_occs.cpp), MIT license, see z3-license.txt.
2
1
  import { KIND_APP, KIND_QUANTIFIER, OP_EQ, type AstManager } from "./ast";
3
2
  import { type Dependency, type Goal, joinDependencies } from "./goal";
4
3
  import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
@@ -23,6 +22,10 @@ const getSharedOccs = (manager: AstManager, forms: number[]) => {
23
22
  export const propagateValues = (manager: AstManager, goal: Goal, maxRounds = 4) => {
24
23
  goal.depth++;
25
24
  if (goal.isInconsistent) return;
25
+ if (goal.isProofsEnabled) {
26
+ goal.elimRedundancies();
27
+ return;
28
+ }
26
29
  const rewriter = new Rewriter(manager, TACTIC_REWRITER_OPTIONS);
27
30
  const substitution = new Map<number, number>();
28
31
  const dependencies = new Map<number, Dependency | undefined>();
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/smt/proto_model/proto_model.cpp, src/model/func_interp.cpp, src/model/value_factory.cpp, src/model/model_core.cpp, src/model/datatype_factory.cpp), MIT license, see z3-license.txt.
2
1
  import { TermEnumeration } from "./term-enumeration";
3
2
  import {
4
3
  type AstManager,
@@ -144,7 +143,7 @@ export class FuncInterp {
144
143
  const manager = this.manager;
145
144
  if (manager.getOp(expr) !== OP_ITE) return undefined;
146
145
  const condition = manager.getArg(expr, 0);
147
- if (!manager.isGround(manager.getArg(expr, 1)) || this.arity === 0) return undefined;
146
+ if (!manager.isGroundApp(manager.getArg(expr, 1)) || this.arity === 0) return undefined;
148
147
  if (this.arity === 1 && manager.getOp(condition) !== OP_EQ) return undefined;
149
148
  if (
150
149
  this.arity > 1 &&
@@ -189,7 +188,7 @@ export class FuncInterp {
189
188
 
190
189
  isConstant() {
191
190
  const elseExpr = this.elseExpr;
192
- if (elseExpr === null || !this.manager.isGround(elseExpr)) return false;
191
+ if (elseExpr === null || !this.manager.isGroundApp(elseExpr)) return false;
193
192
  return this.entries.every((entry) => entry.result === elseExpr);
194
193
  }
195
194
 
@@ -211,7 +210,7 @@ export class FuncInterp {
211
210
  compress() {
212
211
  const manager = this.manager;
213
212
  const elseExpr = this.elseExpr;
214
- if (elseExpr === null || this.entries.length === 0 || !manager.isGround(elseExpr)) return;
213
+ if (elseExpr === null || this.entries.length === 0 || !manager.isGroundApp(elseExpr)) return;
215
214
  const kept = this.entries.filter((entry) => {
216
215
  if (entry.result !== elseExpr) return true;
217
216
  this.releaseEntry(entry);
@@ -252,10 +251,10 @@ export class FuncInterp {
252
251
  if (elseExpr === null) return undefined;
253
252
  const domain = manager.funcDecls[decl].domain;
254
253
  const isGround =
255
- manager.isGround(elseExpr) &&
254
+ manager.isGroundApp(elseExpr) &&
256
255
  this.entries.every(
257
256
  (entry) =>
258
- manager.isGround(entry.result) && entry.args.every((arg) => manager.isGround(arg)),
257
+ manager.isGroundApp(entry.result) && entry.args.every((arg) => manager.isGroundApp(arg)),
259
258
  );
260
259
  if (!isGround) {
261
260
  const interp = this.getInterp();
@@ -268,7 +267,7 @@ export class FuncInterp {
268
267
  const lambda = manager.mkQuantifier({
269
268
  kind: QUANTIFIER_LAMBDA,
270
269
  sorts: [...domain],
271
- names: domain.map((_, index) => index),
270
+ names: domain.map((_value, index) => index),
272
271
  body,
273
272
  patterns: [],
274
273
  noPatterns: [],
@@ -754,7 +753,7 @@ export class ProtoModel {
754
753
  ]);
755
754
  }
756
755
  for (const [decl, value] of this.constInterps)
757
- if (!manager.recFunDefs.has(decl)) collectDeps(decl, [value]);
756
+ if (!manager.recFunDefs.has(decl) && !manager.macros.has(decl)) collectDeps(decl, [value]);
758
757
  sort.sort();
759
758
  const rewriter = new Rewriter(manager, TACTIC_REWRITER_OPTIONS);
760
759
  for (const decl of sort.sorted) {
@@ -1038,10 +1037,8 @@ export class ProtoModel {
1038
1037
  copy() {
1039
1038
  const model = new ProtoModel(this.manager);
1040
1039
  model.isFinal = this.isFinal;
1041
- for (const decl of this.constDecls)
1042
- model.registerConst(decl, this.constInterps.get(decl) as number);
1043
- for (const decl of this.funcDecls)
1044
- model.registerFunc(decl, (this.funcInterps.get(decl) as FuncInterp).copy());
1040
+ for (const entry of this.constInterps) model.registerConst(entry[0], entry[1]);
1041
+ for (const entry of this.funcInterps) model.registerFunc(entry[0], entry[1].copy());
1045
1042
  for (const sort of this.getUninterpretedSorts())
1046
1043
  for (const value of this.getKnownUniverse(sort)) model.registerValue(value);
1047
1044
  for (const entry of this.universes) model.registerUsort(entry[0], entry[1].items);
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/ast/normal_forms/pull_quant.cpp), MIT license, see z3-license.txt.
2
1
  import {
3
2
  KIND_QUANTIFIER,
4
3
  OP_AND,
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/tactic/arith/purify_arith_tactic.cpp), MIT license, see z3-license.txt.
2
1
  import {
3
2
  type AstManager,
4
3
  FAMILY_ARITH,
@@ -110,7 +109,7 @@ class PurifyState {
110
109
  private initCannotPurify() {
111
110
  const manager = this.manager;
112
111
  this.forEachApp((expr) => {
113
- if (manager.getArgs(expr).some((arg) => !manager.isGround(arg)))
112
+ if (manager.getArgs(expr).some((arg) => !manager.isGroundApp(arg)))
114
113
  this.cannotPurify.add(manager.decls[expr]);
115
114
  });
116
115
  }
@@ -253,7 +252,7 @@ class PurifyRewriter extends RewriterTpl {
253
252
  const expr = this.mk(decl, args, SORT_INT);
254
253
  const processed = this.state.appToFresh.get(expr);
255
254
  if (processed !== undefined) return processed;
256
- this.processIdiv(OP_IDIV, args);
255
+ this.processIdiv(decl, args);
257
256
  return this.state.appToFresh.get(expr) as number;
258
257
  }
259
258
 
@@ -377,9 +376,9 @@ class PurifyRewriter extends RewriterTpl {
377
376
  return -1;
378
377
  }
379
378
 
380
- // Inside [-1, 1], k is asin or acos on its principal range. Outside it, k is asin-u or acos-u
381
- // when the purification is complete.
382
- private processInverse(decl: number, x: number) {
379
+ // Inside [-1, 1], k is asin on its principal range. Outside it, k is asin-u when the
380
+ // purification is complete.
381
+ private processAsin(decl: number, x: number) {
383
382
  const state = this.state;
384
383
  if (!state.options.isElimInverses) return -1;
385
384
  const expr = this.mk(decl, [x], SORT_REAL);
@@ -387,27 +386,61 @@ class PurifyRewriter extends RewriterTpl {
387
386
  if (processed !== undefined) return processed;
388
387
  const fresh = this.mkFreshVar(false);
389
388
  this.cacheResult(expr, fresh);
390
- const isAsin = decl === OP_ASIN;
391
389
  const one = this.mkNumeral(Rational.one, false);
392
390
  const minusOne = this.mkNumeral(Rational.minusOne, false);
393
- const upper = isAsin ? this.mkHalfPi(1n) : this.manager.piExpr;
394
- const lower = isAsin ? this.mkHalfPi(-1n) : this.mkNumeral(Rational.zero, false);
391
+ const halfPi = this.mkHalfPi(1n);
392
+ const minusHalfPi = this.mkHalfPi(-1n);
395
393
  const xGeMinusOne = this.mk(OP_GE, [x, minusOne]);
394
+ const xLtMinusOne = this.mk(OP_NOT, [xGeMinusOne]);
396
395
  const xLeOne = this.mk(OP_LE, [x, one]);
397
- const outside = this.mk(OP_OR, [this.mk(OP_NOT, [xGeMinusOne]), this.mk(OP_NOT, [xLeOne])]);
398
- const inverseEq = this.mk(OP_EQ, [x, this.mk(isAsin ? OP_SIN : OP_COS, [fresh], SORT_REAL)]);
399
- const freshGeLower = this.mk(OP_GE, [fresh, lower]);
396
+ const outside = this.mk(OP_OR, [xLtMinusOne, this.mk(OP_NOT, [xLeOne])]);
397
+ const sinEq = this.mk(OP_EQ, [x, this.mk(OP_SIN, [fresh], SORT_REAL)]);
398
+ const freshGeMinusHalfPi = this.mk(OP_GE, [fresh, minusHalfPi]);
400
399
  this.pushConstraint(
401
400
  this.mk(OP_OR, [
402
401
  outside,
403
402
  this.mk(OP_AND, [
404
- inverseEq,
405
- this.mk(OP_AND, [freshGeLower, this.mk(OP_LE, [fresh, upper])]),
403
+ sinEq,
404
+ this.mk(OP_AND, [freshGeMinusHalfPi, this.mk(OP_LE, [fresh, halfPi])]),
406
405
  ]),
407
406
  ]),
408
407
  );
409
408
  if (state.options.isComplete) {
410
- const unspecified = this.mk(isAsin ? OP_U_ASIN : OP_U_ACOS, [x], SORT_REAL);
409
+ const unspecified = this.mk(OP_U_ASIN, [x], SORT_REAL);
410
+ this.pushConstraint(this.mk(OP_OR, [xGeMinusOne, this.mk(OP_EQ, [fresh, unspecified])]));
411
+ this.pushConstraint(this.mk(OP_OR, [xLeOne, this.mk(OP_EQ, [fresh, unspecified])]));
412
+ }
413
+ return fresh;
414
+ }
415
+
416
+ // Inside [-1, 1], k is acos on its principal range. Outside it, k is acos-u when the
417
+ // purification is complete.
418
+ private processAcos(decl: number, x: number) {
419
+ const state = this.state;
420
+ if (!state.options.isElimInverses) return -1;
421
+ const expr = this.mk(decl, [x], SORT_REAL);
422
+ const processed = state.appToFresh.get(expr);
423
+ if (processed !== undefined) return processed;
424
+ const fresh = this.mkFreshVar(false);
425
+ this.cacheResult(expr, fresh);
426
+ const one = this.mkNumeral(Rational.one, false);
427
+ const minusOne = this.mkNumeral(Rational.minusOne, false);
428
+ const pi = this.manager.piExpr;
429
+ const zero = this.mkNumeral(Rational.zero, false);
430
+ const xGeMinusOne = this.mk(OP_GE, [x, minusOne]);
431
+ const xLtMinusOne = this.mk(OP_NOT, [xGeMinusOne]);
432
+ const xLeOne = this.mk(OP_LE, [x, one]);
433
+ const outside = this.mk(OP_OR, [xLtMinusOne, this.mk(OP_NOT, [xLeOne])]);
434
+ const cosEq = this.mk(OP_EQ, [x, this.mk(OP_COS, [fresh], SORT_REAL)]);
435
+ const freshGeZero = this.mk(OP_GE, [fresh, zero]);
436
+ this.pushConstraint(
437
+ this.mk(OP_OR, [
438
+ outside,
439
+ this.mk(OP_AND, [cosEq, this.mk(OP_AND, [freshGeZero, this.mk(OP_LE, [fresh, pi])])]),
440
+ ]),
441
+ );
442
+ if (state.options.isComplete) {
443
+ const unspecified = this.mk(OP_U_ACOS, [x], SORT_REAL);
411
444
  this.pushConstraint(this.mk(OP_OR, [xGeMinusOne, this.mk(OP_EQ, [fresh, unspecified])]));
412
445
  this.pushConstraint(this.mk(OP_OR, [xLeOne, this.mk(OP_EQ, [fresh, unspecified])]));
413
446
  }
@@ -459,8 +492,9 @@ class PurifyRewriter extends RewriterTpl {
459
492
  case OP_POWER:
460
493
  return this.processPower(decl, args);
461
494
  case OP_ASIN:
495
+ return this.processAsin(decl, args[0]);
462
496
  case OP_ACOS:
463
- return this.processInverse(decl, args[0]);
497
+ return this.processAcos(decl, args[0]);
464
498
  case OP_SIN:
465
499
  return this.processSinCos(true, decl, args[0]);
466
500
  case OP_COS:
@@ -1,5 +1,3 @@
1
- // Ported from Z3 (src/qe/qe_arith_plugin.cpp, src/smt/arith_eq_solver.cpp), MIT license, see
2
- // z3-license.txt.
3
1
  import { SmtInvariantError } from "../../../errors";
4
2
  import {
5
3
  type AstManager,
@@ -177,8 +175,7 @@ class ArithQeUtil {
177
175
  const restList: number[] = [];
178
176
  const todo = [p];
179
177
  let k: Rational | undefined;
180
- while (todo.length > 0) {
181
- const expr = todo.pop() as number;
178
+ for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
182
179
  if (isAppOf(manager, expr, OP_ADD)) {
183
180
  todo.push(...manager.getArgs(expr));
184
181
  continue;
@@ -364,8 +361,9 @@ class ArithQeUtil {
364
361
  ? manager.getArg(expr, 1)
365
362
  : expr;
366
363
  };
364
+ const ids = manager.ids;
367
365
  const args = [...manager.getArgs(simplified)].sort(
368
- (first, second) => strip(first) - strip(second),
366
+ (first, second) => ids[strip(first)] - ids[strip(second)],
369
367
  );
370
368
  return this.mkAddN(args);
371
369
  }
@@ -561,8 +559,7 @@ class ArithQeUtil {
561
559
  return true;
562
560
  };
563
561
  const todo = [p];
564
- while (todo.length > 0) {
565
- const expr = todo.pop() as number;
562
+ for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
566
563
  if (isAppOf(manager, expr, OP_ADD)) {
567
564
  todo.push(...manager.getArgs(expr));
568
565
  continue;
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/qe/lite/qe_lite_tactic.cpp, src/qe/mbp/mbp_solve_plugin.cpp), MIT license, see z3-license.txt.
2
1
  import {
3
2
  KIND_VAR,
4
3
  OP_ADD,
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/qe/lite/qe_lite_tactic.cpp), MIT license, see z3-license.txt.
2
1
  import {
3
2
  KIND_QUANTIFIER,
4
3
  KIND_VAR,
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/qe/lite/qe_lite_tactic.cpp, src/qe/mbp/mbp_solve_plugin.cpp), MIT license, see z3-license.txt.
2
1
  import {
3
2
  KIND_QUANTIFIER,
4
3
  KIND_VAR,
@@ -17,6 +16,7 @@ import {
17
16
  QUANTIFIER_LAMBDA,
18
17
  } from "./ast";
19
18
  import { flattenAndVector, flattenOrVector, pushNotOwned } from "./ast-util";
19
+ import { finishSimplifier } from "./dependent-expr-state";
20
20
  import { isOccurring } from "./der";
21
21
  import { ExprSafeReplace } from "./expr-safe-replace";
22
22
  import type { Goal } from "./goal";
@@ -365,8 +365,7 @@ export const applyQeLite = (manager: AstManager, goal: Goal) => {
365
365
  }
366
366
  release(manager, formula);
367
367
  }
368
- goal.elimTrue();
369
- goal.elimRedundancies();
368
+ finishSimplifier(goal);
370
369
  qe.release();
371
370
  release(manager, dep);
372
371
  };
@@ -1,4 +1,3 @@
1
- // Ported from Z3 (src/qe/qe_mbp.cpp), MIT license, see z3-license.txt.
2
1
  import { SmtUnsupportedError } from "../../../errors";
3
2
  import {
4
3
  type AstManager,
@@ -8,7 +7,6 @@ import {
8
7
  FAMILY_DATATYPE,
9
8
  FAMILY_SEQ,
10
9
  KIND_APP,
11
- KIND_QUANTIFIER,
12
10
  OP_EQ,
13
11
  SORT_BOOL,
14
12
  } from "./ast";
@@ -20,24 +18,10 @@ import { applyMbpQel } from "./mbp/mbp-qel";
20
18
  import { filterRefVector } from "./mbp/mbp-term-graph";
21
19
  import type { ProtoModel } from "./proto-model";
22
20
  import { applyQel } from "./qel";
21
+ import { hasSubterm } from "./recfun-decl-plugin";
23
22
  import { RefVector } from "./ref-vector";
24
23
  import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
25
24
 
26
- const getSubterms = (manager: AstManager, roots: readonly number[]) => {
27
- const visited = new Set<number>();
28
- const todo = [...roots];
29
- for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
30
- if (visited.has(expr)) continue;
31
- visited.add(expr);
32
- if (manager.kinds[expr] === KIND_APP) manager.pushArgs(expr, todo);
33
- else if (manager.kinds[expr] === KIND_QUANTIFIER) todo.push(manager.getQuantifier(expr).body);
34
- }
35
- return visited;
36
- };
37
-
38
- const isOccurring = (manager: AstManager, variable: number, expr: number) =>
39
- getSubterms(manager, [expr]).has(variable);
40
-
41
25
  const hasSortFamily = (manager: AstManager, expr: number, families: readonly number[]) =>
42
26
  families.includes(manager.getSortFamily(manager.sorts[expr])) ||
43
27
  (manager.kinds[expr] === KIND_APP && families.includes(manager.getFamily(expr)));
@@ -58,7 +42,7 @@ export class Mbproj {
58
42
  apply(isForceElim: boolean, vars: RefVector, model: ProtoModel, fmls: RefVector) {
59
43
  const manager = this.manager;
60
44
  const context = new MbpContext(manager, model);
61
- const isUnsupportedTh = [...getSubterms(manager, fmls.items)].some((expr) =>
45
+ const isUnsupportedTh = hasSubterm(manager, fmls.items, (expr) =>
62
46
  hasSortFamily(manager, expr, [FAMILY_SEQ, FAMILY_CHAR]),
63
47
  );
64
48
  if (isUnsupportedTh) this.mbp(context, isForceElim, vars, fmls);
@@ -96,7 +80,7 @@ export class Mbproj {
96
80
  const manager = this.manager;
97
81
  // The term graph's rules for arrays and datatypes, and spacer_qe_lite, are not ported.
98
82
  if (
99
- [...getSubterms(manager, [formula])].some((expr) =>
83
+ hasSubterm(manager, [formula], (expr) =>
100
84
  hasSortFamily(manager, expr, [FAMILY_ARRAY, FAMILY_DATATYPE]),
101
85
  )
102
86
  )
@@ -117,7 +101,7 @@ export class Mbproj {
117
101
  if (
118
102
  !vars.items.includes(innerVar) &&
119
103
  !otherVars.items.includes(innerVar) &&
120
- isOccurring(manager, innerVar, result)
104
+ hasSubterm(manager, [result], (expr) => expr === innerVar)
121
105
  )
122
106
  otherVars.push(innerVar);
123
107
  if (otherVars.size > 0) {
@@ -161,7 +145,8 @@ export class Mbproj {
161
145
  }
162
146
  const term = terms.find(
163
147
  (candidate) =>
164
- context.eval(candidate, false) === value && !isOccurring(manager, innerVar, candidate),
148
+ context.eval(candidate, false) === value &&
149
+ !hasSubterm(manager, [candidate], (expr) => expr === innerVar),
165
150
  );
166
151
  if (term === undefined) {
167
152
  vars.set(kept++, innerVar);
@@ -221,13 +206,13 @@ export class Mbproj {
221
206
  filterRefVector(vars, (innerVar) => visited.has(innerVar));
222
207
  this.projectBools(context, vars, fmls);
223
208
  let isProgress = true;
224
- while (isProgress && vars.size > 0 && fmls.size > 0) {
209
+ while (isProgress && vars.size > 0 && fmls.size > 0 && manager.limit.inc()) {
225
210
  const newVars = new RefVector(manager);
226
211
  isProgress = false;
227
212
  const remaining = [...vars.items];
228
213
  arith.project(remaining, fmls);
229
214
  filterRefVector(vars, (innerVar) => remaining.includes(innerVar));
230
- while (vars.size > 0 && fmls.size > 0) {
215
+ while (vars.size > 0 && fmls.size > 0 && manager.limit.inc()) {
231
216
  const innerVar = vars.items[vars.size - 1];
232
217
  manager.incRef(innerVar);
233
218
  vars.pop();
@@ -236,7 +221,7 @@ export class Mbproj {
236
221
  else newVars.push(innerVar);
237
222
  manager.decRef(innerVar);
238
223
  }
239
- if (!isProgress && newVars.size > 0 && fmls.size > 0 && isForceElim) {
224
+ if (!isProgress && newVars.size > 0 && fmls.size > 0 && isForceElim && manager.limit.inc()) {
240
225
  const innerVar = newVars.items[newVars.size - 1];
241
226
  const subst = new ExprSafeReplace(manager);
242
227
  subst.insert(innerVar, context.eval(innerVar));
@@ -252,6 +237,10 @@ export class Mbproj {
252
237
  subst.release();
253
238
  isProgress = true;
254
239
  }
240
+ if (!manager.limit.inc()) {
241
+ newVars.reset();
242
+ return;
243
+ }
255
244
  for (const innerVar of newVars.items) vars.push(innerVar);
256
245
  newVars.reset();
257
246
  if (isProgress) this.preprocessSolve(context, vars, fmls);