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