tla-ts 0.0.9 → 0.0.10-dev.09e53c2a6

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 (625) hide show
  1. package/README.md +30 -1
  2. package/dist/compile.cjs +23 -0
  3. package/dist/compile.js +23 -0
  4. package/dist/deciders.cjs +41 -37
  5. package/dist/deciders.js +57 -53
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +109 -10
  8. package/dist/index.d.ts +109 -10
  9. package/dist/index.js +1 -1
  10. package/dist/parallel-worker.cjs +1 -1
  11. package/dist/parallel-worker.js +1 -1
  12. package/dist/prove-worker.cjs +1 -1
  13. package/dist/prove-worker.js +1 -1
  14. package/dist/prove.cjs +2746 -410
  15. package/dist/prove.js +2745 -409
  16. package/dist/run.cjs +146 -31
  17. package/dist/run.js +146 -31
  18. package/dist/tlapm.cjs +2 -2
  19. package/dist/tlapm.js +2 -2
  20. package/dist/transfer.cjs +132 -104
  21. package/dist/transfer.js +132 -104
  22. package/dist/worker.cjs +6 -6
  23. package/dist/worker.js +6 -6
  24. package/package.json +3 -1
  25. package/src/ast.ts +45 -59
  26. package/src/bags.ts +99 -102
  27. package/src/builtins.ts +28 -75
  28. package/src/bundled-modules.ts +1 -8
  29. package/src/check-failure.ts +116 -0
  30. package/src/check-trace.ts +282 -0
  31. package/src/check.ts +797 -782
  32. package/src/cli/options.ts +12 -32
  33. package/src/cli/run.ts +0 -2
  34. package/src/cli/runtime-invariants.ts +136 -0
  35. package/src/cli/shared.ts +19 -12
  36. package/src/cli/tlapm.ts +433 -82
  37. package/src/cli/tlc-arguments.ts +652 -0
  38. package/src/cli/tlc-output.ts +687 -0
  39. package/src/cli/tlc-usage.ts +360 -0
  40. package/src/cli/tlc.ts +323 -658
  41. package/src/cli/typescript.ts +23 -0
  42. package/src/cli/xml-exporter.ts +27 -49
  43. package/src/cli.ts +0 -1
  44. package/src/codegen.ts +196 -74
  45. package/src/config.ts +140 -109
  46. package/src/coverage.ts +830 -0
  47. package/src/dependencies.ts +36 -54
  48. package/src/dfid.ts +618 -0
  49. package/src/environment-config.ts +315 -0
  50. package/src/environment.ts +178 -339
  51. package/src/errors.ts +100 -57
  52. package/src/evaluate.ts +598 -340
  53. package/src/exit-codes.ts +38 -3
  54. package/src/fingerprints.ts +75 -11
  55. package/src/index.ts +3 -0
  56. package/src/instances.ts +126 -21
  57. package/src/java-hash.ts +7 -0
  58. package/src/java-overrides.ts +4 -19
  59. package/src/json-reader.ts +455 -0
  60. package/src/json.ts +252 -139
  61. package/src/levels.ts +46 -58
  62. package/src/lexer.ts +83 -101
  63. package/src/liveness-checker.ts +590 -311
  64. package/src/liveness.ts +180 -124
  65. package/src/obligations/action.ts +17 -44
  66. package/src/obligations/anonymize.ts +120 -95
  67. package/src/obligations/enabled-axioms.ts +218 -0
  68. package/src/obligations/equality.ts +1 -3
  69. package/src/obligations/expression.ts +37 -26
  70. package/src/obligations/format.ts +0 -10
  71. package/src/obligations/generate.ts +66 -64
  72. package/src/obligations/index.ts +38 -19
  73. package/src/obligations/levels.ts +27 -18
  74. package/src/obligations/module.ts +28 -55
  75. package/src/obligations/normalize.ts +30 -37
  76. package/src/obligations/operators.ts +0 -3
  77. package/src/obligations/pragma.ts +52 -24
  78. package/src/obligations/printer.ts +89 -58
  79. package/src/obligations/proof.ts +3 -6
  80. package/src/obligations/regroup.ts +0 -5
  81. package/src/obligations/simplify.ts +57 -63
  82. package/src/obligations/source.ts +119 -95
  83. package/src/obligations/subexpression.ts +49 -28
  84. package/src/obligations/substitution.ts +1 -5
  85. package/src/obligations/temporal.ts +12 -20
  86. package/src/obligations/tuples.ts +2 -10
  87. package/src/parallel-worker.ts +30 -60
  88. package/src/parallel.ts +59 -73
  89. package/src/parser.ts +1082 -399
  90. package/src/pcal/ast.ts +53 -86
  91. package/src/pcal/parse.ts +144 -219
  92. package/src/pcal/tokenize.ts +91 -131
  93. package/src/pcal/translate.ts +83 -130
  94. package/src/pcal/validate.ts +48 -68
  95. package/src/pretty-print.ts +7 -8
  96. package/src/prover/decide-pool.ts +8 -13
  97. package/src/prover/deciders.ts +12 -13
  98. package/src/prover/first-order.ts +0 -11
  99. package/src/prover/isabelle/decide.ts +3 -31
  100. package/src/prover/isabelle/encode.ts +82 -64
  101. package/src/prover/isabelle/isar/attrib.ts +250 -0
  102. package/src/prover/isabelle/isar/context.ts +335 -0
  103. package/src/prover/isabelle/isar/induct.ts +382 -0
  104. package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
  105. package/src/prover/isabelle/isar/method.ts +510 -226
  106. package/src/prover/isabelle/isar/proof.ts +570 -23
  107. package/src/prover/isabelle/isar/rule-cases.ts +224 -0
  108. package/src/prover/isabelle/isar/theory.ts +488 -88
  109. package/src/prover/isabelle/isar/toplevel.ts +331 -0
  110. package/src/prover/isabelle/isar/type-check.ts +99 -38
  111. package/src/prover/isabelle/provers/blast/blast.ts +16 -105
  112. package/src/prover/isabelle/provers/blast/branch.ts +0 -33
  113. package/src/prover/isabelle/provers/blast/prove.ts +0 -36
  114. package/src/prover/isabelle/provers/blast/rules.ts +5 -45
  115. package/src/prover/isabelle/provers/blast/state.ts +1 -29
  116. package/src/prover/isabelle/provers/blast/term.ts +8 -37
  117. package/src/prover/isabelle/provers/clasimp.ts +0 -14
  118. package/src/prover/isabelle/provers/classical.ts +58 -61
  119. package/src/prover/isabelle/provers/hypsubst.ts +27 -52
  120. package/src/prover/isabelle/pure/bicompose.ts +24 -39
  121. package/src/prover/isabelle/pure/consts.ts +0 -8
  122. package/src/prover/isabelle/pure/conv.ts +2 -18
  123. package/src/prover/isabelle/pure/drule.ts +95 -45
  124. package/src/prover/isabelle/pure/envir.ts +2 -53
  125. package/src/prover/isabelle/pure/goal.ts +1 -9
  126. package/src/prover/isabelle/pure/interrupt.ts +0 -5
  127. package/src/prover/isabelle/pure/list.ts +0 -3
  128. package/src/prover/isabelle/pure/logic.ts +1 -16
  129. package/src/prover/isabelle/pure/name.ts +1 -10
  130. package/src/prover/isabelle/pure/net.ts +2 -60
  131. package/src/prover/isabelle/pure/object-logic.ts +15 -16
  132. package/src/prover/isabelle/pure/pattern.ts +1 -20
  133. package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
  134. package/src/prover/isabelle/pure/rewriter.ts +31 -74
  135. package/src/prover/isabelle/pure/search.ts +2 -11
  136. package/src/prover/isabelle/pure/seq.ts +0 -11
  137. package/src/prover/isabelle/pure/simplifier.ts +27 -16
  138. package/src/prover/isabelle/pure/table.ts +2 -33
  139. package/src/prover/isabelle/pure/tactic.ts +11 -23
  140. package/src/prover/isabelle/pure/tactical.ts +47 -48
  141. package/src/prover/isabelle/pure/term-ord.ts +1 -7
  142. package/src/prover/isabelle/pure/term.ts +1 -44
  143. package/src/prover/isabelle/pure/thm.ts +26 -48
  144. package/src/prover/isabelle/pure/type.ts +1 -16
  145. package/src/prover/isabelle/pure/unify.ts +19 -31
  146. package/src/prover/isabelle/pure/variable.ts +2 -8
  147. package/src/prover/isabelle/tla/classical-setup.ts +17 -25
  148. package/src/prover/isabelle/tla/context.ts +65 -26
  149. package/src/prover/isabelle/tla/logic-data.ts +1 -1
  150. package/src/prover/isabelle/tla/logic.ts +53 -32
  151. package/src/prover/isabelle/tla/simpdata.ts +45 -44
  152. package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
  153. package/src/prover/ocaml.ts +4 -7
  154. package/src/prover/prep/action.ts +33 -66
  155. package/src/prover/prep/enabled-axioms.ts +22 -20
  156. package/src/prover/prep/fingerprint.ts +2 -21
  157. package/src/prover/prep/level-comparison.ts +8 -12
  158. package/src/prover/prep/md5.ts +0 -2
  159. package/src/prover/prep/methods.ts +189 -86
  160. package/src/prover/prep/normalize.ts +42 -37
  161. package/src/prover/prove-worker.ts +0 -2
  162. package/src/prover/prove.ts +398 -133
  163. package/src/prover/ptl/decide.ts +96 -56
  164. package/src/prover/ptl/encode.ts +15 -38
  165. package/src/prover/ptl/sat.ts +24 -32
  166. package/src/prover/ptl/tableau.ts +40 -28
  167. package/src/prover/smt/arithmetic.ts +310 -0
  168. package/src/prover/smt/axioms.ts +12 -15
  169. package/src/prover/smt/context.ts +60 -32
  170. package/src/prover/smt/data.ts +517 -401
  171. package/src/prover/smt/encode.ts +155 -85
  172. package/src/prover/smt/extensionality.ts +5 -13
  173. package/src/prover/smt/flatten.ts +7 -28
  174. package/src/prover/smt/format.ts +33 -14
  175. package/src/prover/smt/instances.ts +7 -11
  176. package/src/prover/smt/layout.ts +91 -0
  177. package/src/prover/smt/rewrite.ts +1026 -658
  178. package/src/prover/smt/simplify.ts +441 -0
  179. package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
  180. package/src/prover/smt/solver/ackr-helper.ts +179 -0
  181. package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
  182. package/src/prover/smt/solver/act-cache.ts +0 -16
  183. package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
  184. package/src/prover/smt/solver/aig-tactic.ts +52 -0
  185. package/src/prover/smt/solver/aig.ts +889 -0
  186. package/src/prover/smt/solver/arith-rewriter.ts +615 -53
  187. package/src/prover/smt/solver/arith-terms.ts +121 -0
  188. package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
  189. package/src/prover/smt/solver/array-rewriter.ts +309 -0
  190. package/src/prover/smt/solver/array.ts +1 -3
  191. package/src/prover/smt/solver/asserted-formulas.ts +87 -58
  192. package/src/prover/smt/solver/ast-lt.ts +166 -22
  193. package/src/prover/smt/solver/ast-util.ts +160 -7
  194. package/src/prover/smt/solver/ast.ts +1424 -180
  195. package/src/prover/smt/solver/auf-solver.ts +7 -44
  196. package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
  197. package/src/prover/smt/solver/bit-blaster.ts +871 -0
  198. package/src/prover/smt/solver/bound-manager.ts +196 -0
  199. package/src/prover/smt/solver/bound-simplifier.ts +600 -0
  200. package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
  201. package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
  202. package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
  203. package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
  204. package/src/prover/smt/solver/bv1-blast.ts +214 -0
  205. package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
  206. package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
  207. package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
  208. package/src/prover/smt/solver/card2bv.ts +110 -0
  209. package/src/prover/smt/solver/case-split-queue.ts +0 -10
  210. package/src/prover/smt/solver/cg-table.ts +39 -42
  211. package/src/prover/smt/solver/check-logic.ts +330 -0
  212. package/src/prover/smt/solver/clause.ts +0 -27
  213. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
  214. package/src/prover/smt/solver/conflict-resolution.ts +78 -11
  215. package/src/prover/smt/solver/context.ts +519 -175
  216. package/src/prover/smt/solver/ctx-simplify.ts +33 -50
  217. package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
  218. package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
  219. package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
  220. package/src/prover/smt/solver/demodulator.ts +786 -0
  221. package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
  222. package/src/prover/smt/solver/der.ts +39 -30
  223. package/src/prover/smt/solver/diff-neq.ts +206 -0
  224. package/src/prover/smt/solver/distribute-forall.ts +57 -0
  225. package/src/prover/smt/solver/dom-simplify.ts +511 -0
  226. package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
  227. package/src/prover/smt/solver/dyn-ack.ts +0 -11
  228. package/src/prover/smt/solver/e-matching.ts +9 -41
  229. package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
  230. package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
  231. package/src/prover/smt/solver/enode.ts +100 -23
  232. package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
  233. package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
  234. package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
  235. package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
  236. package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
  237. package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
  238. package/src/prover/smt/solver/euf/array-solver.ts +306 -0
  239. package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
  240. package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
  241. package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
  242. package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
  243. package/src/prover/smt/solver/euf/egraph.ts +907 -0
  244. package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
  245. package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
  246. package/src/prover/smt/solver/euf/mam.ts +1050 -0
  247. package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
  248. package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
  249. package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
  250. package/src/prover/smt/solver/euf/q-solver.ts +361 -0
  251. package/src/prover/smt/solver/euf/th-solver.ts +335 -0
  252. package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
  253. package/src/prover/smt/solver/expr-ref.ts +0 -5
  254. package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
  255. package/src/prover/smt/solver/expr2polynomial.ts +146 -0
  256. package/src/prover/smt/solver/factor.ts +141 -0
  257. package/src/prover/smt/solver/fd-solver.ts +265 -0
  258. package/src/prover/smt/solver/fingerprints.ts +15 -26
  259. package/src/prover/smt/solver/fix-dl-var.ts +148 -0
  260. package/src/prover/smt/solver/flat-literals.ts +0 -9
  261. package/src/prover/smt/solver/fm-tactic.ts +884 -0
  262. package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
  263. package/src/prover/smt/solver/fpa-rewriter.ts +640 -0
  264. package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
  265. package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
  266. package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
  267. package/src/prover/smt/solver/goal.ts +176 -28
  268. package/src/prover/smt/solver/goal2nlsat.ts +189 -0
  269. package/src/prover/smt/solver/guard-set.ts +219 -0
  270. package/src/prover/smt/solver/hash.ts +0 -9
  271. package/src/prover/smt/solver/hashtable.ts +26 -23
  272. package/src/prover/smt/solver/inf-eps.ts +63 -0
  273. package/src/prover/smt/solver/inj-axiom.ts +101 -0
  274. package/src/prover/smt/solver/internalizer.ts +112 -132
  275. package/src/prover/smt/solver/lackr.ts +381 -0
  276. package/src/prover/smt/solver/lbool.ts +0 -2
  277. package/src/prover/smt/solver/lia2card.ts +268 -0
  278. package/src/prover/smt/solver/lia2pb.ts +154 -0
  279. package/src/prover/smt/solver/literal.ts +0 -4
  280. package/src/prover/smt/solver/logic-tactics.ts +345 -0
  281. package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
  282. package/src/prover/smt/solver/lp/constraints.ts +1 -8
  283. package/src/prover/smt/solver/lp/containers.ts +11 -30
  284. package/src/prover/smt/solver/lp/core-solver.ts +23 -29
  285. package/src/prover/smt/solver/lp/cross-nested.ts +5 -20
  286. package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
  287. package/src/prover/smt/solver/lp/dependency.ts +0 -5
  288. package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
  289. package/src/prover/smt/solver/lp/explanation.ts +0 -6
  290. package/src/prover/smt/solver/lp/gomory.ts +8 -22
  291. package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
  292. package/src/prover/smt/solver/lp/hnf.ts +10 -28
  293. package/src/prover/smt/solver/lp/int-cube.ts +17 -39
  294. package/src/prover/smt/solver/lp/int-solver.ts +3 -35
  295. package/src/prover/smt/solver/lp/lar-solver.ts +69 -82
  296. package/src/prover/smt/solver/lp/lar-term.ts +0 -5
  297. package/src/prover/smt/solver/lp/lp-settings.ts +0 -14
  298. package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
  299. package/src/prover/smt/solver/lp/nex-creator.ts +4 -28
  300. package/src/prover/smt/solver/lp/nex.ts +0 -6
  301. package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
  302. package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
  303. package/src/prover/smt/solver/lp/nla-core.ts +91 -135
  304. package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
  305. package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
  306. package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
  307. package/src/prover/smt/solver/lp/nla-grobner.ts +22 -72
  308. package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
  309. package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
  310. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
  311. package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
  312. package/src/prover/smt/solver/lp/nla-order.ts +0 -13
  313. package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
  314. package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
  315. package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
  316. package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
  317. package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
  318. package/src/prover/smt/solver/lp/nla-types.ts +0 -12
  319. package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
  320. package/src/prover/smt/solver/lp/nra-solver.ts +123 -112
  321. package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
  322. package/src/prover/smt/solver/lp/pdd-interval.ts +0 -3
  323. package/src/prover/smt/solver/lp/pdd-simplifier.ts +1 -14
  324. package/src/prover/smt/solver/lp/pdd-solver.ts +2 -33
  325. package/src/prover/smt/solver/lp/pdd.ts +7 -70
  326. package/src/prover/smt/solver/lp/random-updater.ts +0 -9
  327. package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
  328. package/src/prover/smt/solver/lp/union-find.ts +5 -5
  329. package/src/prover/smt/solver/macro-finder.ts +530 -0
  330. package/src/prover/smt/solver/mam-compiler.ts +129 -139
  331. package/src/prover/smt/solver/mam-interpreter.ts +0 -21
  332. package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
  333. package/src/prover/smt/solver/max-cliques.ts +105 -0
  334. package/src/prover/smt/solver/maxcore.ts +309 -0
  335. package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
  336. package/src/prover/smt/solver/maxlex.ts +115 -0
  337. package/src/prover/smt/solver/maxsmt-base.ts +105 -0
  338. package/src/prover/smt/solver/maxsmt.ts +92 -0
  339. package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
  340. package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
  341. package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
  342. package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
  343. package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
  344. package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
  345. package/src/prover/smt/solver/model-based-opt.ts +844 -0
  346. package/src/prover/smt/solver/model-checker.ts +19 -62
  347. package/src/prover/smt/solver/model-evaluator.ts +190 -40
  348. package/src/prover/smt/solver/model-finder.ts +14 -32
  349. package/src/prover/smt/solver/model-generator.ts +56 -40
  350. package/src/prover/smt/solver/model-macro-solver.ts +60 -114
  351. package/src/prover/smt/solver/model-printer.ts +214 -0
  352. package/src/prover/smt/solver/mpf.ts +711 -0
  353. package/src/prover/smt/solver/mus.ts +51 -0
  354. package/src/prover/smt/solver/muz/dl-context.ts +404 -0
  355. package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
  356. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
  357. package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
  358. package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
  359. package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
  360. package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
  361. package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
  362. package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
  363. package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
  364. package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
  365. package/src/prover/smt/solver/muz/hnf.ts +201 -0
  366. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
  367. package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
  368. package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
  369. package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
  370. package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
  371. package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
  372. package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
  373. package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
  374. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
  375. package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
  376. package/src/prover/smt/solver/muz/substitution.ts +203 -0
  377. package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
  378. package/src/prover/smt/solver/nlqsat.ts +484 -0
  379. package/src/prover/smt/solver/nlsat/algebraic.ts +177 -160
  380. package/src/prover/smt/solver/nlsat/atoms.ts +24 -24
  381. package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
  382. package/src/prover/smt/solver/nlsat/explain.ts +65 -69
  383. package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
  384. package/src/prover/smt/solver/nlsat/levelwise.ts +48 -135
  385. package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
  386. package/src/prover/smt/solver/nlsat/polynomial.ts +29 -161
  387. package/src/prover/smt/solver/nlsat/solver.ts +241 -110
  388. package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
  389. package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
  390. package/src/prover/smt/solver/nlsat/types.ts +0 -9
  391. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -47
  392. package/src/prover/smt/solver/nlsat/upolynomial.ts +10 -93
  393. package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
  394. package/src/prover/smt/solver/nnf.ts +107 -60
  395. package/src/prover/smt/solver/normalize-bounds.ts +53 -0
  396. package/src/prover/smt/solver/occf.ts +97 -0
  397. package/src/prover/smt/solver/opt-context.ts +787 -0
  398. package/src/prover/smt/solver/opt-nlsat.ts +375 -0
  399. package/src/prover/smt/solver/opt-pareto.ts +282 -0
  400. package/src/prover/smt/solver/opt-preprocess.ts +101 -0
  401. package/src/prover/smt/solver/opt-solver.ts +308 -0
  402. package/src/prover/smt/solver/opt-value.ts +55 -0
  403. package/src/prover/smt/solver/optsmt.ts +692 -0
  404. package/src/prover/smt/solver/parallel-tactic.ts +299 -0
  405. package/src/prover/smt/solver/pattern-inference.ts +21 -26
  406. package/src/prover/smt/solver/pb-rewriter.ts +284 -0
  407. package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
  408. package/src/prover/smt/solver/poly-rewriter.ts +204 -79
  409. package/src/prover/smt/solver/probes.ts +512 -0
  410. package/src/prover/smt/solver/propagate-values.ts +37 -30
  411. package/src/prover/smt/solver/proto-model.ts +650 -66
  412. package/src/prover/smt/solver/pull-quant.ts +28 -23
  413. package/src/prover/smt/solver/purify-arith.ts +632 -0
  414. package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
  415. package/src/prover/smt/solver/qe-lite-der.ts +2 -31
  416. package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
  417. package/src/prover/smt/solver/qe-lite.ts +39 -49
  418. package/src/prover/smt/solver/qe-mbp.ts +270 -0
  419. package/src/prover/smt/solver/qe.ts +1498 -0
  420. package/src/prover/smt/solver/qel.ts +25 -0
  421. package/src/prover/smt/solver/qi-queue.ts +0 -16
  422. package/src/prover/smt/solver/qsat.ts +814 -0
  423. package/src/prover/smt/solver/quant-hoist.ts +196 -0
  424. package/src/prover/smt/solver/quant-tactics.ts +17 -74
  425. package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
  426. package/src/prover/smt/solver/quantifier-manager.ts +8 -23
  427. package/src/prover/smt/solver/quasi-macros.ts +243 -0
  428. package/src/prover/smt/solver/random-gen.ts +0 -2
  429. package/src/prover/smt/solver/rational.ts +45 -8
  430. package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
  431. package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
  432. package/src/prover/smt/solver/reduce-args.ts +225 -0
  433. package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
  434. package/src/prover/smt/solver/ref-vector.ts +0 -6
  435. package/src/prover/smt/solver/relevancy.ts +2 -16
  436. package/src/prover/smt/solver/rewriter-tpl.ts +52 -129
  437. package/src/prover/smt/solver/rewriter.ts +477 -120
  438. package/src/prover/smt/solver/rlimit.ts +39 -21
  439. package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
  440. package/src/prover/smt/solver/sat/big.ts +177 -0
  441. package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
  442. package/src/prover/smt/solver/sat/clause.ts +203 -0
  443. package/src/prover/smt/solver/sat/cleaner.ts +94 -0
  444. package/src/prover/smt/solver/sat/config.ts +122 -0
  445. package/src/prover/smt/solver/sat/consequences.ts +203 -0
  446. package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
  447. package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
  448. package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
  449. package/src/prover/smt/solver/sat/model-converter.ts +136 -0
  450. package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
  451. package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
  452. package/src/prover/smt/solver/sat/probing.ts +170 -0
  453. package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
  454. package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
  455. package/src/prover/smt/solver/sat/scc.ts +142 -0
  456. package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
  457. package/src/prover/smt/solver/sat/solver.ts +2127 -0
  458. package/src/prover/smt/solver/sat/var-queue.ts +117 -0
  459. package/src/prover/smt/solver/sat/watch-list.ts +140 -0
  460. package/src/prover/smt/solver/search-tree.ts +284 -0
  461. package/src/prover/smt/solver/seq-axioms.ts +1010 -0
  462. package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
  463. package/src/prover/smt/solver/seq-derive.ts +1301 -0
  464. package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
  465. package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
  466. package/src/prover/smt/solver/seq-factory.ts +89 -0
  467. package/src/prover/smt/solver/seq-monadic.ts +728 -0
  468. package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
  469. package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
  470. package/src/prover/smt/solver/seq-re-util.ts +758 -0
  471. package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
  472. package/src/prover/smt/solver/seq-regex-live.ts +200 -0
  473. package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
  474. package/src/prover/smt/solver/seq-skolem.ts +317 -0
  475. package/src/prover/smt/solver/seq-subset.ts +165 -0
  476. package/src/prover/smt/solver/seq-view-witness.ts +353 -0
  477. package/src/prover/smt/solver/smt-consequences.ts +297 -0
  478. package/src/prover/smt/solver/smt-kernel.ts +83 -0
  479. package/src/prover/smt/solver/smt-logics.ts +66 -0
  480. package/src/prover/smt/solver/smt-setup.ts +496 -0
  481. package/src/prover/smt/solver/smt2-printer.ts +765 -0
  482. package/src/prover/smt/solver/smtlib-parser.ts +3140 -365
  483. package/src/prover/smt/solver/smtlib-script.ts +1631 -0
  484. package/src/prover/smt/solver/solve-eqs.ts +929 -0
  485. package/src/prover/smt/solver/solver.ts +119 -39
  486. package/src/prover/smt/solver/sort.ts +1 -5
  487. package/src/prover/smt/solver/static-features.ts +314 -0
  488. package/src/prover/smt/solver/sticky-generations.ts +0 -6
  489. package/src/prover/smt/solver/tactic.ts +1986 -0
  490. package/src/prover/smt/solver/term-enumeration.ts +205 -0
  491. package/src/prover/smt/solver/theory-array.ts +1240 -0
  492. package/src/prover/smt/solver/theory-bv.ts +1200 -0
  493. package/src/prover/smt/solver/theory-char.ts +355 -0
  494. package/src/prover/smt/solver/theory-datatype.ts +598 -0
  495. package/src/prover/smt/solver/theory-finite-set.ts +30 -0
  496. package/src/prover/smt/solver/theory-fpa.ts +389 -0
  497. package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
  498. package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
  499. package/src/prover/smt/solver/theory-lra-final-check.ts +59 -91
  500. package/src/prover/smt/solver/theory-lra-internalize.ts +94 -53
  501. package/src/prover/smt/solver/theory-lra-model.ts +23 -53
  502. package/src/prover/smt/solver/theory-lra-propagate.ts +24 -40
  503. package/src/prover/smt/solver/theory-lra-state.ts +6 -27
  504. package/src/prover/smt/solver/theory-lra.ts +188 -8
  505. package/src/prover/smt/solver/theory-pb.ts +934 -0
  506. package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
  507. package/src/prover/smt/solver/theory-recfun.ts +307 -0
  508. package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
  509. package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
  510. package/src/prover/smt/solver/theory-seq-state.ts +871 -0
  511. package/src/prover/smt/solver/theory-seq.ts +961 -0
  512. package/src/prover/smt/solver/theory.ts +189 -0
  513. package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
  514. package/src/prover/smt/solver/var-subst.ts +37 -39
  515. package/src/prover/smt/table.ts +3 -10
  516. package/src/prover/smt/types.ts +146 -0
  517. package/src/prover/tlapm/cache.ts +67 -41
  518. package/src/prover/tlapm/ocaml-marshal.ts +19 -21
  519. package/src/prover/tlapm/tlapm.ts +21 -20
  520. package/src/prover/tlapm-library.ts +3208 -0
  521. package/src/prover/verdict.ts +9 -2
  522. package/src/prover/zenon/check/check.ts +1 -11
  523. package/src/prover/zenon/check/definitions.ts +5 -15
  524. package/src/prover/zenon/check/equality.ts +0 -8
  525. package/src/prover/zenon/check/functions.ts +0 -4
  526. package/src/prover/zenon/check/keys.ts +0 -7
  527. package/src/prover/zenon/check/propositional.ts +0 -3
  528. package/src/prover/zenon/check/records.ts +1 -6
  529. package/src/prover/zenon/check/relations.ts +2 -14
  530. package/src/prover/zenon/check/rewrites.ts +2 -21
  531. package/src/prover/zenon/check/sets.ts +40 -61
  532. package/src/prover/zenon/check/terms.ts +1 -19
  533. package/src/prover/zenon/check/tla.ts +0 -6
  534. package/src/prover/zenon/decide.ts +10 -19
  535. package/src/prover/zenon/encode.ts +0 -9
  536. package/src/prover/zenon/eqrel.ts +2 -15
  537. package/src/prover/zenon/equality-rules.ts +0 -6
  538. package/src/prover/zenon/expr.ts +8 -28
  539. package/src/prover/zenon/index-table.ts +26 -59
  540. package/src/prover/zenon/isar-case.ts +8 -20
  541. package/src/prover/zenon/isar.ts +35 -65
  542. package/src/prover/zenon/limits.ts +0 -4
  543. package/src/prover/zenon/llproof.ts +2 -22
  544. package/src/prover/zenon/mltoll.ts +66 -106
  545. package/src/prover/zenon/node.ts +20 -15
  546. package/src/prover/zenon/ocaml.ts +1 -17
  547. package/src/prover/zenon/parse.ts +9 -13
  548. package/src/prover/zenon/phrase.ts +1 -13
  549. package/src/prover/zenon/proof.ts +0 -11
  550. package/src/prover/zenon/propositional-rules.ts +0 -7
  551. package/src/prover/zenon/rules.ts +2 -8
  552. package/src/prover/zenon/search.ts +11 -35
  553. package/src/prover/zenon/tla/functions.ts +59 -33
  554. package/src/prover/zenon/tla/llproof.ts +67 -78
  555. package/src/prover/zenon/tla/records.ts +57 -35
  556. package/src/prover/zenon/tla/rewrites.ts +12 -21
  557. package/src/prover/zenon/tla/sets.ts +88 -59
  558. package/src/prover/zenon/tla/terms.ts +0 -8
  559. package/src/prover/zenon/tla/tla.ts +66 -66
  560. package/src/randomization.ts +81 -35
  561. package/src/resolve.ts +67 -185
  562. package/src/runtime.ts +26 -22
  563. package/src/sany/builtins.ts +2 -5
  564. package/src/sany/generation.ts +394 -0
  565. package/src/sany/generator-def-entries.ts +210 -0
  566. package/src/sany/generator-definitions.ts +686 -0
  567. package/src/sany/generator-expressions.ts +1100 -0
  568. package/src/sany/generator-proofs.ts +662 -0
  569. package/src/sany/generator.ts +191 -2764
  570. package/src/sany/levels.ts +5 -35
  571. package/src/sany/lexer.ts +58 -77
  572. package/src/sany/linter.ts +0 -10
  573. package/src/sany/modules.ts +1 -5
  574. package/src/sany/nodes.ts +5 -43
  575. package/src/sany/parse-error.ts +39 -117
  576. package/src/sany/report.ts +32 -69
  577. package/src/sany/selectors.ts +49 -76
  578. package/src/sany/source.ts +1 -17
  579. package/src/sany/xml.ts +35 -117
  580. package/src/search.ts +671 -169
  581. package/src/simulate.ts +712 -0
  582. package/src/spec-description.ts +192 -100
  583. package/src/standard-definitions.ts +4 -4
  584. package/src/standard-modules.ts +264 -95
  585. package/src/state-graph.ts +52 -33
  586. package/src/subexpressions.ts +69 -52
  587. package/src/substitution-levels.ts +7 -7
  588. package/src/successors.ts +267 -100
  589. package/src/symmetry.ts +35 -27
  590. package/src/tableau.ts +29 -26
  591. package/src/tlc/fingerprint.ts +267 -79
  592. package/src/tlc/jar-data.ts +112 -6
  593. package/src/tlc/messages.ts +125 -54
  594. package/src/tlc/order.ts +39 -69
  595. package/src/tlc/random.ts +37 -49
  596. package/src/tlc/replay.ts +553 -228
  597. package/src/tlc/summary.ts +64 -60
  598. package/src/tlc/tlc-operators.ts +78 -44
  599. package/src/tlc/tlcext-operators.ts +171 -122
  600. package/src/tlc/trace-spec.ts +249 -0
  601. package/src/tlc/value-stream.ts +139 -0
  602. package/src/tlc/version.ts +1 -4
  603. package/src/transfer.ts +22 -25
  604. package/src/typed-tier.ts +6535 -0
  605. package/src/typescript/actions.ts +479 -0
  606. package/src/typescript/collections.ts +614 -0
  607. package/src/typescript/compile.ts +63 -0
  608. package/src/typescript/context.ts +94 -0
  609. package/src/typescript/emit.ts +121 -0
  610. package/src/typescript/expressions.ts +496 -0
  611. package/src/typescript/formula.ts +154 -0
  612. package/src/typescript/functions.ts +284 -0
  613. package/src/typescript/model.ts +162 -0
  614. package/src/typescript/names.ts +114 -0
  615. package/src/typescript/program.ts +48 -0
  616. package/src/typescript/properties.ts +139 -0
  617. package/src/typescript/scope.ts +112 -0
  618. package/src/typescript/steps.ts +167 -0
  619. package/src/typescript/types.ts +171 -0
  620. package/src/values.ts +832 -484
  621. package/src/worker.ts +7 -8
  622. package/src/prover/isabelle/isar/statement.ts +0 -57
  623. package/src/prover/smt/solver/z3-license.txt +0 -10
  624. package/src/prover/tlaps-module.ts +0 -510
  625. package/src/prover/zenon/LICENSE +0 -32
@@ -0,0 +1,196 @@
1
+ import {
2
+ type AstManager,
3
+ KIND_APP,
4
+ KIND_QUANTIFIER,
5
+ OP_AND,
6
+ OP_EQ,
7
+ OP_IMPLIES,
8
+ OP_ITE,
9
+ OP_OR,
10
+ SORT_BOOL,
11
+ QUANTIFIER_FORALL,
12
+ QUANTIFIER_LAMBDA,
13
+ } from "./ast";
14
+ import { isAppOf } from "./ast-util";
15
+ import { RefVector } from "./ref-vector";
16
+ import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
17
+ import { ExprSafeReplace } from "./expr-safe-replace";
18
+ import { InvVarShifter } from "./rewriter-tpl";
19
+ import { VarSubst } from "./var-subst";
20
+
21
+ const Q_FORALL_POS = 0x10;
22
+ const Q_EXISTS_POS = 0x20;
23
+ const Q_NONE_POS = 0x40;
24
+ const Q_FORALL_NEG = 0x11;
25
+ const Q_EXISTS_NEG = 0x21;
26
+ const Q_NONE_NEG = 0x41;
27
+
28
+ interface QuantifierType {
29
+ value: number;
30
+ }
31
+
32
+ const negate = (type: QuantifierType) => {
33
+ type.value ^= 0x1;
34
+ return type;
35
+ };
36
+
37
+ const isCompatible = (type: number, isForall: boolean) =>
38
+ type === Q_FORALL_POS || type === Q_EXISTS_NEG
39
+ ? isForall
40
+ : type === Q_EXISTS_POS || type === Q_FORALL_NEG
41
+ ? !isForall
42
+ : true;
43
+
44
+ const setQuantifierType = (type: QuantifierType, isForall: boolean) => {
45
+ if (type.value === Q_NONE_POS) type.value = isForall ? Q_FORALL_POS : Q_EXISTS_POS;
46
+ else if (type.value === Q_NONE_NEG) type.value = isForall ? Q_EXISTS_NEG : Q_FORALL_NEG;
47
+ };
48
+
49
+ // Brings the quantifiers of one kind into prenex form, with fresh constants for their variables.
50
+ export class QuantifierHoister {
51
+ private rewriter: Rewriter;
52
+ private trail: RefVector;
53
+
54
+ constructor(private manager: AstManager) {
55
+ this.rewriter = new Rewriter(manager, TACTIC_REWRITER_OPTIONS);
56
+ this.trail = new RefVector(manager);
57
+ }
58
+
59
+ release() {
60
+ this.rewriter.release();
61
+ this.trail.reset();
62
+ }
63
+
64
+ // The result comes with a reference, which the caller releases.
65
+ pullQuantifier(isForall: boolean, formula: number, vars: RefVector) {
66
+ const result = this.pull(formula, { value: isForall ? Q_FORALL_POS : Q_EXISTS_POS }, vars);
67
+ this.manager.incRef(result);
68
+ this.trail.reset();
69
+ return result;
70
+ }
71
+
72
+ // The overload with sorts and names: the variables of the pulled quantifiers stay bound, numbered
73
+ // after the free ones, and their sorts and names go in front of those of the prefix. The result
74
+ // comes with a reference, which the caller releases.
75
+ pullQuantifierBound(isForall: boolean, formula: number, sorts: number[], names: string[]) {
76
+ const manager = this.manager;
77
+ let index = manager.freeVarBounds[formula];
78
+ let current = formula;
79
+ while (
80
+ manager.kinds[current] === KIND_QUANTIFIER &&
81
+ (manager.getQuantifier(current).kind === QUANTIFIER_FORALL) === isForall
82
+ ) {
83
+ const data = manager.getQuantifier(current);
84
+ index += data.sorts.length;
85
+ names.push(...data.names.map(String));
86
+ sorts.push(...data.sorts);
87
+ current = data.body;
88
+ }
89
+ if (!manager.hasQuantifierFlags[current]) {
90
+ manager.incRef(current);
91
+ return current;
92
+ }
93
+ const vars = new RefVector(manager);
94
+ const pulled = this.pullQuantifier(isForall, current, vars);
95
+ if (vars.size === 0) {
96
+ vars.reset();
97
+ return pulled;
98
+ }
99
+ const replace = new ExprSafeReplace(manager);
100
+ for (const variable of vars.items)
101
+ replace.insert(variable, manager.mkVar(index++, manager.sorts[variable]));
102
+ const result = replace.apply(pulled);
103
+ replace.release();
104
+ manager.decRef(pulled);
105
+ names.unshift(...vars.items.map((variable) => manager.getDeclName(variable)).reverse());
106
+ sorts.unshift(...vars.items.map((variable) => manager.sorts[variable]).reverse());
107
+ vars.reset();
108
+ return result;
109
+ }
110
+
111
+ private pin(expr: number) {
112
+ this.trail.push(expr);
113
+ return expr;
114
+ }
115
+
116
+ private pinOwned(expr: number) {
117
+ this.trail.pushOwned(expr);
118
+ return expr;
119
+ }
120
+
121
+ private extractQuantifier(quantifier: number, vars: RefVector) {
122
+ const manager = this.manager;
123
+ const data = manager.getQuantifier(quantifier);
124
+ const fresh = data.sorts.map((sort, index) =>
125
+ this.pin(manager.mkFreshConst(String(data.names[index]), sort)),
126
+ );
127
+ for (const expr of fresh) vars.push(expr);
128
+ const subst = new VarSubst(manager, true);
129
+ const substituted = this.pinOwned(subst.apply(data.body, fresh));
130
+ subst.release();
131
+ const shifter = new InvVarShifter(manager);
132
+ const result = this.pinOwned(shifter.shift(substituted, fresh.length));
133
+ shifter.release();
134
+ return result;
135
+ }
136
+
137
+ private pull(formula: number, type: QuantifierType, vars: RefVector): number {
138
+ const manager = this.manager;
139
+ if (!manager.hasQuantifierFlags[formula]) return formula;
140
+ const kind = manager.kinds[formula];
141
+ if (kind === KIND_QUANTIFIER) {
142
+ const data = manager.getQuantifier(formula);
143
+ if (data.kind === QUANTIFIER_LAMBDA) return formula;
144
+ if (!isCompatible(type.value, data.kind === QUANTIFIER_FORALL)) return formula;
145
+ setQuantifierType(type, data.kind === QUANTIFIER_FORALL);
146
+ return this.pull(this.extractQuantifier(formula, vars), type, vars);
147
+ }
148
+ if (kind !== KIND_APP) return formula;
149
+ const args = manager.getArgs(formula);
150
+ const mkNot = (expr: number) => this.pin(manager.mkNot(expr));
151
+ const mkOr = (first: number, second: number) => this.pin(manager.mkOr([first, second]));
152
+ if (isAppOf(manager, formula, OP_AND) || isAppOf(manager, formula, OP_OR)) {
153
+ const pulled = args.map((arg) => this.pull(arg, type, vars));
154
+ const isAnd = isAppOf(manager, formula, OP_AND);
155
+ return this.pinOwned(
156
+ manager.withTemporaries(() =>
157
+ isAnd ? this.rewriter.mkAnd(pulled) : this.rewriter.mkOr(pulled),
158
+ ),
159
+ );
160
+ }
161
+ if (manager.isNot(formula)) {
162
+ const pulled = this.pull(args[0], negate(type), vars);
163
+ negate(type);
164
+ return mkNot(pulled);
165
+ }
166
+ if (isAppOf(manager, formula, OP_IMPLIES)) {
167
+ const premise = this.pull(args[0], negate(type), vars);
168
+ negate(type);
169
+ const conclusion = this.pull(args[1], type, vars);
170
+ return this.pin(manager.mkApp(OP_IMPLIES, [premise, conclusion], SORT_BOOL));
171
+ }
172
+ if (isAppOf(manager, formula, OP_ITE)) {
173
+ const [condition, thenExpr, elseExpr] = args;
174
+ const pulledThen = this.pull(thenExpr, type, vars);
175
+ const pulledElse = this.pull(elseExpr, type, vars);
176
+ if (!manager.hasQuantifierFlags[condition])
177
+ return this.pin(
178
+ manager.mkApp(OP_ITE, [condition, pulledThen, pulledElse], manager.sorts[formula]),
179
+ );
180
+ const pulledCondition = this.pull(condition, type, vars);
181
+ const pulledNegated = this.pull(mkNot(condition), type, vars);
182
+ return this.pin(
183
+ manager.mkAnd([mkOr(pulledNegated, pulledThen), mkOr(pulledCondition, pulledElse)]),
184
+ );
185
+ }
186
+ if (isAppOf(manager, formula, OP_EQ) && manager.sorts[args[0]] === SORT_BOOL) {
187
+ const pulled1 = this.pull(args[0], type, vars);
188
+ const pulled2 = this.pull(args[1], type, vars);
189
+ const negated1 = this.pull(mkNot(args[0]), type, vars);
190
+ const negated2 = this.pull(mkNot(args[1]), type, vars);
191
+ return this.pin(manager.mkAnd([mkOr(negated1, pulled2), mkOr(negated2, pulled1)]));
192
+ }
193
+ // The formula has a quantifier, but out of reach.
194
+ return formula;
195
+ }
196
+ }
@@ -1,61 +1,36 @@
1
- // Ported from Z3 (src/tactic/smtlogics/quant_tactics.cpp, src/tactic/core/simplify_tactic.cpp), MIT
2
- // license, see z3-license.txt. With (set-logic UFNIA), Z3's strategic solver runs the ufnia tactic:
3
- // a preprocessor, then qe-lite, then the SMT kernel. Of the preprocessor, elim-uncnstr's
4
- // elimination and the simplifier's local_ctx option are not ported, as they change almost none of
5
- // tlapm's obligations.
6
- import { type AstManager, KIND_APP, KIND_QUANTIFIER } from "./ast";
1
+ // This strategy skips elim-uncnstr's elimination and the simplifier's local_ctx option, as they
2
+ // change almost none of tlapm's obligations.
3
+ import type { AstManager } from "./ast";
7
4
  import { ctxSimplify } from "./ctx-simplify";
5
+ import { collectUnconstrained, disableQuantified } from "./elim-uncnstr";
8
6
  import { Goal } from "./goal";
9
7
  import { propagateValues } from "./propagate-values";
10
8
  import { applyQeLite } from "./qe-lite";
11
- import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
9
+ import { Rewriter, type RewriterOptions, TACTIC_REWRITER_OPTIONS } from "./rewriter";
10
+ import { RefVector } from "./ref-vector";
12
11
  import { RewriterTpl } from "./rewriter-tpl";
13
12
 
14
- // The simplify tactic, with pull_cheap_ite where the preprocessor sets it.
15
- const simplify = (manager: AstManager, goal: Goal, isPullingCheapIte = false) => {
13
+ export const simplifyGoal = (manager: AstManager, goal: Goal, options: RewriterOptions) => {
14
+ goal.depth++;
16
15
  if (goal.isInconsistent) return;
17
- const rewriter = new Rewriter(manager, { ...TACTIC_REWRITER_OPTIONS, isPullingCheapIte });
16
+ const rewriter = new Rewriter(manager, options);
18
17
  const size = goal.forms.size;
19
18
  let rewritten = -1;
20
19
  for (let index = 0; index < size && !goal.isInconsistent; index++) {
21
20
  const result = rewriter.rewrite(goal.forms.items[index]);
22
21
  if (rewritten !== -1) manager.decRef(rewritten);
23
22
  rewritten = result;
24
- goal.update(index, rewritten);
23
+ goal.update(index, rewritten, goal.getDependency(index));
25
24
  }
26
25
  if (rewritten !== -1) manager.decRef(rewritten);
27
26
  goal.elimRedundancies();
28
27
  rewriter.release();
29
28
  };
30
29
 
31
- // collect_occs: whether an uninterpreted constant occurs only once, where a term is visited once and
32
- // a quantifier's patterns are not visited.
33
- const hasUnconstrainedConst = (manager: AstManager, goal: Goal) => {
34
- const visited = new Set<number>();
35
- const consts: number[] = [];
36
- const repeated = new Set<number>();
37
- const todo = [...goal.forms.items];
38
- while (todo.length > 0) {
39
- const expr = todo.pop() as number;
40
- const isConst = manager.isUninterpretedConst(expr);
41
- if (visited.has(expr)) {
42
- if (isConst) repeated.add(expr);
43
- continue;
44
- }
45
- visited.add(expr);
46
- if (isConst) consts.push(expr);
47
- else if (manager.kinds[expr] === KIND_APP) manager.pushArgs(expr, todo);
48
- else if (manager.kinds[expr] === KIND_QUANTIFIER) todo.push(manager.getQuantifier(expr).body);
49
- }
50
- return consts.some((expr) => !repeated.has(expr));
51
- };
52
-
53
- // elim_uncnstr_tactic::run without the elimination. Its rewriter still runs over the formulas when
54
- // some constant is unconstrained, and counts its steps. The rewriter starts as if the formulas had
55
- // changed, so it makes a second round.
30
+ // Z3's elim_uncnstr rewriter runs twice over the formulas and counts its steps, though the elimination is not ported.
56
31
  const elimUncnstr = (manager: AstManager, goal: Goal) => {
57
- const isRewriting = hasUnconstrainedConst(manager, goal);
58
- pinQuantifierBodies(manager, goal);
32
+ const isRewriting = collectUnconstrained(manager, goal).size > 0;
33
+ disableQuantified(manager, goal, new RefVector(manager));
59
34
  if (!isRewriting) return;
60
35
  const rewriter = new RewriterTpl(manager);
61
36
  for (let round = 0; round < 2; round++) {
@@ -65,48 +40,16 @@ const elimUncnstr = (manager: AstManager, goal: Goal) => {
65
40
  rewriter.release();
66
41
  };
67
42
 
68
- // elim_uncnstr_tactic::disable_quantified: the tactic holds the body of each quantifier until it is
69
- // destroyed after the search.
70
- const pinQuantifierBodies = (manager: AstManager, goal: Goal) => {
71
- const visited = new Set<number>();
72
- const disabled = new Set<number>();
73
- const disable = (body: number) => {
74
- if (disabled.has(body)) return;
75
- manager.incRef(body);
76
- const todo = [body];
77
- while (todo.length > 0) {
78
- const expr = todo.pop() as number;
79
- if (disabled.has(expr)) continue;
80
- disabled.add(expr);
81
- if (manager.kinds[expr] === KIND_APP) manager.pushArgs(expr, todo);
82
- }
83
- };
84
- const todo = [...goal.forms.items];
85
- while (todo.length > 0) {
86
- const expr = todo.pop() as number;
87
- if (visited.has(expr)) continue;
88
- visited.add(expr);
89
- if (manager.kinds[expr] === KIND_QUANTIFIER) {
90
- const body = manager.getQuantifier(expr).body;
91
- disable(body);
92
- todo.push(body);
93
- } else if (manager.kinds[expr] === KIND_APP) manager.pushArgs(expr, todo);
94
- }
95
- };
96
-
97
- // mk_ufnia_tactic, up to the SMT kernel: mk_quant_preprocessor without solve-eqs, then qe-lite.
98
43
  export const applyUfniaTactic = (manager: AstManager, assertions: number[]) => {
99
44
  const goal = new Goal(manager);
100
45
  for (const assertion of assertions) goal.assert(assertion);
101
- simplify(manager, goal);
102
- // and_then runs the next tactic only on a goal that is not decided: one that is consistent and
103
- // has formulas left.
46
+ simplifyGoal(manager, goal, TACTIC_REWRITER_OPTIONS);
104
47
  const steps = [
105
48
  () => propagateValues(manager, goal),
106
- () => ctxSimplify(manager, goal),
107
- () => simplify(manager, goal, true),
49
+ () => ctxSimplify(manager, goal, 30, 5000000),
50
+ () => simplifyGoal(manager, goal, { ...TACTIC_REWRITER_OPTIONS, isPullingCheapIte: true }),
108
51
  () => elimUncnstr(manager, goal),
109
- () => simplify(manager, goal),
52
+ () => simplifyGoal(manager, goal, TACTIC_REWRITER_OPTIONS),
110
53
  () => applyQeLite(manager, goal),
111
54
  ];
112
55
  for (const step of steps) {
@@ -1,6 +1,3 @@
1
- // Ported from Z3 (src/smt/smt_model_finder.cpp, src/ast/macros/quantifier_macro_info.cpp), MIT
2
- // license, see z3-license.txt. The quantifier analyzer of the model finder, which collects how the
3
- // variables of each quantifier occur, and the quantifier info where it records what it learns.
4
1
  import {
5
2
  KIND_APP,
6
3
  KIND_VAR,
@@ -25,11 +22,6 @@ import { Rational } from "./rational";
25
22
  import { Rewriter } from "./rewriter";
26
23
  import { AufSolver, type Evaluate, InstantiationSet, Node } from "./auf-solver";
27
24
 
28
- // smt_params' mbqi_force_template: macros of quantifiers with at least this weight are used even
29
- // in the AUF fragment.
30
- export const MBQI_FORCE_TEMPLATE = 10;
31
-
32
- // qinfo: a bit of information about how a variable occurs in a quantifier.
33
25
  type QInfo =
34
26
  | { kind: "f_var"; decl: number; argIndex: number; varIndex: number }
35
27
  | { kind: "f_var_plus_offset"; decl: number; argIndex: number; varIndex: number; offset: number }
@@ -42,31 +34,29 @@ const isSameQInfo = (first: QInfo, second: QInfo) =>
42
34
  const mkVarPair = (kind: "x_eq_y" | "x_neq_y" | "x_leq_y", first: number, second: number): QInfo =>
43
35
  first > second ? { kind, first: second, second: first } : { kind, first, second };
44
36
 
45
- // quantifier_info: what the analyzer learned about one quantifier.
46
37
  export class QuantifierInfo {
38
+ private manager: AstManager;
47
39
  readonly flatQ: number;
48
40
  qinfos: QInfo[] = [];
49
41
  isAuf = true;
50
- hasXEqY = false;
51
42
  readonly ngDecls = new Set<number>();
52
43
  theOne: number | null = null;
53
44
  private uvarInstSets: (InstantiationSet | null)[] | null = null;
54
45
  readonly condMacros;
55
46
 
56
47
  constructor(
57
- private manager: AstManager,
58
48
  private context: Context,
59
49
  readonly quantifier: number,
60
50
  macroRewriter: Rewriter,
61
51
  ) {
62
- // m_flat_q, which holds a reference.
52
+ const manager = context.manager;
53
+ this.manager = manager;
63
54
  const isNested = manager.hasQuantifierFlags[manager.getQuantifier(quantifier).body];
64
55
  this.flatQ = isNested ? pullQuant(manager, quantifier) : quantifier;
65
56
  if (!isNested) manager.incRef(quantifier);
66
57
  this.condMacros = collectMacroCandidates(manager, macroRewriter, this.flatQ);
67
58
  }
68
59
 
69
- // ~quantifier_info: the conditional macros go before the flat quantifier.
70
60
  release() {
71
61
  releaseCondMacros(this.manager, this.condMacros);
72
62
  this.manager.decRef(this.flatQ);
@@ -141,7 +131,6 @@ export class QuantifierInfo {
141
131
  const aFI = solver.getAFI(info.decl, info.argIndex).getRoot();
142
132
  const sJ = solver.getUvar(flatQ, info.varIndex).getRoot();
143
133
  if (aFI === sJ) {
144
- // There is no finite fixpoint, so the arguments minus the offset join the set.
145
134
  for (const enode of context.enodesOf(info.decl))
146
135
  if (context.isRelevant(enode.owner)) {
147
136
  const arg = enode.getArg(info.argIndex);
@@ -161,7 +150,6 @@ export class QuantifierInfo {
161
150
  case "x_eq_t": {
162
151
  const sort = sorts[sorts.length - info.varIndex - 1];
163
152
  if (manager.isUninterpretedSort(sort)) {
164
- // Every term of the sort joins the set, see Section 4.1 of the paper.
165
153
  const node = solver.getUvar(flatQ, info.varIndex);
166
154
  for (const enode of context.enodes)
167
155
  if (context.isRelevant(enode.owner) && manager.sorts[enode.owner] === sort)
@@ -177,7 +165,6 @@ export class QuantifierInfo {
177
165
  break;
178
166
  }
179
167
  }
180
- // The second pass for the offsets: A_f_i - k is in S_j and S_j + k is in A_f_i.
181
168
  for (const info of this.qinfos) {
182
169
  if (info.kind !== "f_var_plus_offset") continue;
183
170
  const aFI = solver.getAFI(info.decl, info.argIndex).getRoot();
@@ -197,7 +184,6 @@ export class QuantifierInfo {
197
184
  );
198
185
  }
199
186
 
200
- // populate_macro_based_inst_sets: the sets of a quantifier that a macro satisfies.
201
187
  getMacroBasedInstSet(varIndex: number, evaluate: Evaluate) {
202
188
  const theOne = this.theOne;
203
189
  if (theOne === null) return null;
@@ -227,8 +213,6 @@ export class QuantifierInfo {
227
213
 
228
214
  type Polarity = "pos" | "neg";
229
215
 
230
- // quantifier_analyzer.
231
- // One analyzer runs per quantifier and records what it learns in the quantifier's info.
232
216
  export class QuantifierAnalyzer {
233
217
  private posCache = new Set<number>();
234
218
  private negCache = new Set<number>();
@@ -241,18 +225,13 @@ export class QuantifierAnalyzer {
241
225
  private info: QuantifierInfo,
242
226
  ) {}
243
227
 
244
- private isGround(expr: number) {
245
- return this.manager.isGround(expr);
246
- }
247
-
248
228
  private isVar(expr: number) {
249
229
  return this.manager.kinds[expr] === KIND_VAR;
250
230
  }
251
231
 
252
- // poly_rewriter::is_var_plus_ground.
253
232
  private isVarPlusGround(expr: number) {
254
233
  const manager = this.manager;
255
- if (manager.getOp(expr) !== OP_ADD || this.isGround(expr)) return undefined;
234
+ if (manager.getOp(expr) !== OP_ADD || manager.isGroundApp(expr)) return undefined;
256
235
  const args: number[] = [];
257
236
  let variable: number | undefined;
258
237
  let isInverted = false;
@@ -267,7 +246,7 @@ export class QuantifierAnalyzer {
267
246
  isStopped = true;
268
247
  }
269
248
  const negated = this.manager.getTimesMinusOneArg(arg);
270
- if (this.isGround(arg)) args.push(arg);
249
+ if (this.manager.isGroundApp(arg)) args.push(arg);
271
250
  else if (this.isVar(arg)) {
272
251
  if (variable !== undefined) return undefined;
273
252
  variable = arg;
@@ -282,31 +261,31 @@ export class QuantifierAnalyzer {
282
261
  return { variable, term, isInverted };
283
262
  }
284
263
 
285
- private mkSub(first: number, second: number) {
286
- return this.rewriter.mkSub(first, second);
287
- }
288
-
289
264
  private mkAdd(first: number, second: number) {
290
265
  return this.rewriter.mkAdd([first, second]);
291
266
  }
292
267
 
293
268
  private isVarAndGround(lhs: number, rhs: number) {
294
- if (this.isVar(lhs) && this.isGround(rhs))
269
+ if (this.isVar(lhs) && this.manager.isGroundApp(rhs))
295
270
  return { variable: lhs, term: rhs, isInverted: false };
296
- if (this.isVar(rhs) && this.isGround(lhs))
271
+ if (this.isVar(rhs) && this.manager.isGroundApp(lhs))
297
272
  return { variable: rhs, term: lhs, isInverted: false };
298
273
  const left = this.isVarPlusGround(lhs);
299
- if (left !== undefined && this.isGround(rhs))
274
+ if (left !== undefined && this.manager.isGroundApp(rhs))
300
275
  return {
301
276
  variable: left.variable,
302
- term: left.isInverted ? this.mkSub(left.term, rhs) : this.mkSub(rhs, left.term),
277
+ term: left.isInverted
278
+ ? this.rewriter.mkSub(left.term, rhs)
279
+ : this.rewriter.mkSub(rhs, left.term),
303
280
  isInverted: left.isInverted,
304
281
  };
305
282
  const right = this.isVarPlusGround(rhs);
306
- if (right !== undefined && this.isGround(lhs))
283
+ if (right !== undefined && this.manager.isGroundApp(lhs))
307
284
  return {
308
285
  variable: right.variable,
309
- term: right.isInverted ? this.mkSub(right.term, lhs) : this.mkSub(lhs, right.term),
286
+ term: right.isInverted
287
+ ? this.rewriter.mkSub(right.term, lhs)
288
+ : this.rewriter.mkSub(lhs, right.term),
310
289
  isInverted: right.isInverted,
311
290
  };
312
291
  return undefined;
@@ -352,12 +331,12 @@ export class QuantifierAnalyzer {
352
331
  const one = manager.mkNumeralOfSort(Rational.one, manager.sorts[found.term]);
353
332
  return {
354
333
  variable: found.variable,
355
- term: isLe ? this.mkAdd(found.term, one) : this.mkSub(found.term, one),
334
+ term: isLe ? this.mkAdd(found.term, one) : this.rewriter.mkSub(found.term, one),
356
335
  };
357
336
  }
358
337
 
359
338
  private visitFormula(expr: number, polarity: Polarity) {
360
- if (this.isGround(expr)) return;
339
+ if (this.manager.isGroundApp(expr)) return;
361
340
  const cache = polarity === "pos" ? this.posCache : this.negCache;
362
341
  if (cache.has(expr)) return;
363
342
  this.ftodo.push([expr, polarity]);
@@ -365,7 +344,7 @@ export class QuantifierAnalyzer {
365
344
  }
366
345
 
367
346
  private visitTerm(expr: number) {
368
- if (this.isGround(expr) || this.posCache.has(expr)) return;
347
+ if (this.manager.isGroundApp(expr) || this.posCache.has(expr)) return;
369
348
  this.ttodo.push(expr);
370
349
  this.posCache.add(expr);
371
350
  }
@@ -446,12 +425,13 @@ export class QuantifierAnalyzer {
446
425
  ? this.isVarAndVar(manager.getArg(atom, 0), manager.getArg(atom, 1))
447
426
  : undefined;
448
427
  if (xEqY !== undefined) {
449
- if (isNegated)
450
- info.insertQInfo(mkVarPair("x_neq_y", manager.values[xEqY[0]], manager.values[xEqY[1]]));
451
- else {
452
- info.hasXEqY = true;
453
- info.insertQInfo(mkVarPair("x_eq_y", manager.values[xEqY[0]], manager.values[xEqY[1]]));
454
- }
428
+ info.insertQInfo(
429
+ mkVarPair(
430
+ isNegated ? "x_neq_y" : "x_eq_y",
431
+ manager.values[xEqY[0]],
432
+ manager.values[xEqY[1]],
433
+ ),
434
+ );
455
435
  return;
456
436
  }
457
437
  const xLeY =
@@ -532,7 +512,6 @@ export class QuantifierAnalyzer {
532
512
  }
533
513
  }
534
514
 
535
- // is_clause: a disjunction of literals.
536
515
  private isLiteral(expr: number) {
537
516
  const manager = this.manager;
538
517
  const atom = manager.isNot(expr) ? manager.getArg(expr, 0) : expr;
@@ -551,7 +530,7 @@ export class QuantifierAnalyzer {
551
530
  for (const literal of literals) {
552
531
  const isNegated = manager.isNot(literal);
553
532
  const atom = isNegated ? manager.getArg(literal, 0) : literal;
554
- if (!this.isGround(atom)) this.processLiteral(atom, isNegated);
533
+ if (!this.manager.isGroundApp(atom)) this.processLiteral(atom, isNegated);
555
534
  }
556
535
  } else this.visitFormula(body, "pos");
557
536
  while (this.ftodo.length > 0 || this.ttodo.length > 0) {
@@ -1,19 +1,7 @@
1
- // Ported from Z3 (src/smt/smt_quantifier.cpp), MIT license, see
2
- // z3-license.txt. Z3's default quantifier plugin: patterns go to an eager matcher, except that a
3
- // quantifier with only multi-patterns keeps one of them eager and sends the rest to a lazy matcher
4
- // that runs in the final check. With MBQI, the model finder and the model checker turn candidate
5
- // models into instances.
6
- import {
7
- CHECK_MODEL_RESTART,
8
- CHECK_MODEL_SAT,
9
- CHECK_MODEL_UNKNOWN,
10
- FC_CONTINUE,
11
- FC_DONE,
12
- type Context,
13
- } from "./context";
1
+ import { CHECK_MODEL_RESTART, CHECK_MODEL_SAT, CHECK_MODEL_UNKNOWN, type Context } from "./context";
2
+ import { FC_CONTINUE, FC_DONE } from "./theory";
14
3
  import { Mam } from "./e-matching";
15
4
  import type { Enode } from "./enode";
16
- import { FingerprintSet } from "./fingerprints";
17
5
  import { ModelChecker } from "./model-checker";
18
6
  import { ModelFinder } from "./model-finder";
19
7
  import type { ProtoModel } from "./proto-model";
@@ -22,8 +10,6 @@ import { QiQueue } from "./qi-queue";
22
10
  const QI_MAX_EAGER_MULTIPATTERNS = 0;
23
11
  const QI_MAX_LAZY_MULTIPATTERN_MATCHING = 2;
24
12
 
25
- // Model-based quantifier instantiation: the finder completes candidate models, the checker refutes
26
- // them with instances.
27
13
  interface Mbqi {
28
14
  finder: ModelFinder;
29
15
  checker: ModelChecker;
@@ -35,7 +21,6 @@ export class DefaultQuantifierManager {
35
21
  private qiQueue: QiQueue;
36
22
  private mam: Mam;
37
23
  private lazyMam: Mam;
38
- private fingerprints: FingerprintSet;
39
24
  private isActive = false;
40
25
  private lazyMatchingIndex = 0;
41
26
  private mbqi: Mbqi | null = null;
@@ -45,13 +30,12 @@ export class DefaultQuantifierManager {
45
30
  isMbqi: boolean,
46
31
  ) {
47
32
  this.qiQueue = new QiQueue(context);
48
- this.fingerprints = new FingerprintSet(context.manager);
49
33
  const onMatch = (quantifier: number, bindings: Enode[], maxGeneration: number) =>
50
34
  this.addInstance(quantifier, bindings, maxGeneration);
51
35
  this.mam = new Mam(context, onMatch);
52
36
  this.lazyMam = new Mam(context, onMatch);
53
37
  if (!isMbqi) return;
54
- const finder = new ModelFinder(context.manager, context);
38
+ const finder = new ModelFinder(context);
55
39
  this.mbqi = { finder, checker: new ModelChecker(context, finder, this) };
56
40
  }
57
41
 
@@ -96,7 +80,6 @@ export class DefaultQuantifierManager {
96
80
  }
97
81
  }
98
82
 
99
- // is_shared: a ground term of a pattern, once a quantifier was asserted.
100
83
  isShared(node: Enode) {
101
84
  return this.isActive && (this.mam.isShared(node) || this.lazyMam.isShared(node));
102
85
  }
@@ -116,7 +99,6 @@ export class DefaultQuantifierManager {
116
99
  this.lazyMam.pushScope();
117
100
  this.mbqi?.finder.pushScope();
118
101
  this.qiQueue.push();
119
- this.fingerprints.push();
120
102
  }
121
103
 
122
104
  pop(numScopes: number) {
@@ -124,7 +106,6 @@ export class DefaultQuantifierManager {
124
106
  this.lazyMam.popScope(numScopes);
125
107
  this.mbqi?.finder.popScope(numScopes);
126
108
  this.qiQueue.pop(numScopes);
127
- this.fingerprints.pop(numScopes);
128
109
  }
129
110
 
130
111
  canPropagate() {
@@ -138,7 +119,11 @@ export class DefaultQuantifierManager {
138
119
 
139
120
  addInstance(quantifier: number, bindings: Enode[], maxGeneration: number) {
140
121
  const generation = Math.max(maxGeneration, this.getGeneration(quantifier));
141
- const roots = this.fingerprints.insert(quantifier, bindings);
122
+ const roots = this.context.fingerprints.insert(
123
+ quantifier,
124
+ this.context.manager.ids[quantifier],
125
+ bindings,
126
+ );
142
127
  if (roots !== null) this.qiQueue.insert(quantifier, roots, generation);
143
128
  }
144
129