tla-ts 0.0.8-dev.d9bffda → 0.0.9-dev.0493be549

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 (390) hide show
  1. package/README.md +30 -0
  2. package/dist/compile.cjs +23 -0
  3. package/dist/compile.js +23 -0
  4. package/dist/deciders.cjs +28 -28
  5. package/dist/deciders.js +43 -43
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +80 -10
  8. package/dist/index.d.ts +80 -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 +116 -36
  15. package/dist/prove.js +116 -36
  16. package/dist/run.cjs +143 -31
  17. package/dist/run.js +143 -31
  18. package/dist/tlapm.cjs +2 -2
  19. package/dist/tlapm.js +2 -2
  20. package/dist/transfer.cjs +128 -103
  21. package/dist/transfer.js +128 -103
  22. package/dist/worker.cjs +7 -7
  23. package/dist/worker.js +7 -7
  24. package/package.json +3 -1
  25. package/src/ast.ts +7 -21
  26. package/src/bags.ts +99 -99
  27. package/src/builtins.ts +44 -75
  28. package/src/bundled-modules.ts +1 -8
  29. package/src/check.ts +605 -311
  30. package/src/cli/options.ts +12 -6
  31. package/src/cli/run.ts +2 -2
  32. package/src/cli/runtime-invariants.ts +135 -0
  33. package/src/cli/shared.ts +20 -9
  34. package/src/cli/tlapm.ts +0 -12
  35. package/src/cli/tlc-arguments.ts +646 -0
  36. package/src/cli/tlc-usage.ts +362 -0
  37. package/src/cli/tlc.ts +545 -218
  38. package/src/cli/typescript.ts +23 -0
  39. package/src/cli/xml-exporter.ts +4 -16
  40. package/src/cli.ts +0 -1
  41. package/src/codegen.ts +191 -64
  42. package/src/config.ts +140 -109
  43. package/src/coverage.ts +837 -0
  44. package/src/dependencies.ts +6 -40
  45. package/src/dfid.ts +618 -0
  46. package/src/environment.ts +240 -118
  47. package/src/errors.ts +70 -55
  48. package/src/evaluate.ts +632 -298
  49. package/src/exit-codes.ts +37 -3
  50. package/src/fingerprints.ts +10 -10
  51. package/src/index.ts +3 -0
  52. package/src/instances.ts +79 -11
  53. package/src/java-overrides.ts +2 -12
  54. package/src/json-reader.ts +456 -0
  55. package/src/json.ts +262 -139
  56. package/src/levels.ts +2 -3
  57. package/src/lexer.ts +17 -26
  58. package/src/liveness-checker.ts +10 -18
  59. package/src/liveness.ts +121 -49
  60. package/src/obligations/action.ts +4 -28
  61. package/src/obligations/anonymize.ts +84 -80
  62. package/src/obligations/equality.ts +1 -1
  63. package/src/obligations/expression.ts +2 -19
  64. package/src/obligations/format.ts +1 -9
  65. package/src/obligations/generate.ts +1 -11
  66. package/src/obligations/index.ts +0 -11
  67. package/src/obligations/levels.ts +4 -8
  68. package/src/obligations/module.ts +1 -15
  69. package/src/obligations/normalize.ts +5 -24
  70. package/src/obligations/operators.ts +1 -2
  71. package/src/obligations/pragma.ts +1 -10
  72. package/src/obligations/printer.ts +47 -46
  73. package/src/obligations/proof.ts +1 -5
  74. package/src/obligations/regroup.ts +1 -4
  75. package/src/obligations/simplify.ts +3 -14
  76. package/src/obligations/source.ts +1 -21
  77. package/src/obligations/subexpression.ts +5 -11
  78. package/src/obligations/substitution.ts +1 -3
  79. package/src/obligations/temporal.ts +8 -14
  80. package/src/obligations/tuples.ts +3 -9
  81. package/src/parallel-worker.ts +31 -38
  82. package/src/parallel.ts +41 -17
  83. package/src/parser.ts +436 -90
  84. package/src/pcal/ast.ts +7 -28
  85. package/src/pcal/parse.ts +11 -39
  86. package/src/pcal/tokenize.ts +4 -20
  87. package/src/pcal/translate.ts +10 -42
  88. package/src/pcal/validate.ts +3 -21
  89. package/src/pretty-print.ts +1 -2
  90. package/src/prover/decide-pool.ts +5 -10
  91. package/src/prover/deciders.ts +0 -4
  92. package/src/prover/first-order.ts +0 -11
  93. package/src/prover/isabelle/decide.ts +0 -6
  94. package/src/prover/isabelle/encode.ts +11 -23
  95. package/src/prover/isabelle/isar/inner-syntax.ts +108 -114
  96. package/src/prover/isabelle/isar/method.ts +25 -38
  97. package/src/prover/isabelle/isar/proof.ts +1 -10
  98. package/src/prover/isabelle/isar/statement.ts +1 -6
  99. package/src/prover/isabelle/isar/theory.ts +15 -26
  100. package/src/prover/isabelle/isar/type-check.ts +11 -25
  101. package/src/prover/isabelle/provers/blast/blast.ts +10 -41
  102. package/src/prover/isabelle/provers/blast/branch.ts +1 -32
  103. package/src/prover/isabelle/provers/blast/prove.ts +1 -35
  104. package/src/prover/isabelle/provers/blast/rules.ts +6 -44
  105. package/src/prover/isabelle/provers/blast/state.ts +2 -28
  106. package/src/prover/isabelle/provers/blast/term.ts +9 -36
  107. package/src/prover/isabelle/provers/clasimp.ts +1 -13
  108. package/src/prover/isabelle/provers/classical.ts +14 -42
  109. package/src/prover/isabelle/provers/hypsubst.ts +11 -25
  110. package/src/prover/isabelle/pure/bicompose.ts +16 -13
  111. package/src/prover/isabelle/pure/consts.ts +1 -7
  112. package/src/prover/isabelle/pure/conv.ts +1 -9
  113. package/src/prover/isabelle/pure/drule.ts +24 -40
  114. package/src/prover/isabelle/pure/envir.ts +3 -52
  115. package/src/prover/isabelle/pure/goal.ts +1 -7
  116. package/src/prover/isabelle/pure/interrupt.ts +0 -5
  117. package/src/prover/isabelle/pure/list.ts +0 -3
  118. package/src/prover/isabelle/pure/logic.ts +1 -14
  119. package/src/prover/isabelle/pure/name.ts +2 -9
  120. package/src/prover/isabelle/pure/net.ts +3 -59
  121. package/src/prover/isabelle/pure/object-logic.ts +3 -10
  122. package/src/prover/isabelle/pure/pattern.ts +2 -19
  123. package/src/prover/isabelle/pure/raw-simplifier.ts +13 -49
  124. package/src/prover/isabelle/pure/rewriter.ts +26 -58
  125. package/src/prover/isabelle/pure/search.ts +3 -10
  126. package/src/prover/isabelle/pure/seq.ts +1 -10
  127. package/src/prover/isabelle/pure/simplifier.ts +4 -12
  128. package/src/prover/isabelle/pure/table.ts +1 -31
  129. package/src/prover/isabelle/pure/tactic.ts +12 -22
  130. package/src/prover/isabelle/pure/tactical.ts +6 -12
  131. package/src/prover/isabelle/pure/term-ord.ts +2 -6
  132. package/src/prover/isabelle/pure/term.ts +2 -43
  133. package/src/prover/isabelle/pure/thm.ts +13 -36
  134. package/src/prover/isabelle/pure/type.ts +2 -15
  135. package/src/prover/isabelle/pure/unify.ts +20 -30
  136. package/src/prover/isabelle/pure/variable.ts +3 -7
  137. package/src/prover/isabelle/tla/classical-setup.ts +9 -19
  138. package/src/prover/isabelle/tla/context.ts +8 -16
  139. package/src/prover/isabelle/tla/logic.ts +4 -11
  140. package/src/prover/isabelle/tla/simpdata.ts +46 -34
  141. package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
  142. package/src/prover/ocaml.ts +0 -6
  143. package/src/prover/prep/action.ts +4 -36
  144. package/src/prover/prep/enabled-axioms.ts +12 -19
  145. package/src/prover/prep/fingerprint.ts +0 -16
  146. package/src/prover/prep/level-comparison.ts +8 -12
  147. package/src/prover/prep/md5.ts +0 -2
  148. package/src/prover/prep/methods.ts +9 -36
  149. package/src/prover/prep/normalize.ts +4 -28
  150. package/src/prover/prove-worker.ts +0 -2
  151. package/src/prover/prove.ts +0 -36
  152. package/src/prover/ptl/decide.ts +7 -12
  153. package/src/prover/ptl/encode.ts +14 -36
  154. package/src/prover/ptl/sat.ts +24 -32
  155. package/src/prover/ptl/tableau.ts +12 -26
  156. package/src/prover/smt/axioms.ts +0 -7
  157. package/src/prover/smt/context.ts +19 -26
  158. package/src/prover/smt/data.ts +51 -54
  159. package/src/prover/smt/encode.ts +14 -35
  160. package/src/prover/smt/extensionality.ts +0 -10
  161. package/src/prover/smt/flatten.ts +3 -22
  162. package/src/prover/smt/format.ts +5 -10
  163. package/src/prover/smt/instances.ts +0 -10
  164. package/src/prover/smt/rewrite.ts +66 -101
  165. package/src/prover/smt/solver/act-cache.ts +0 -15
  166. package/src/prover/smt/solver/arith-rewriter.ts +3 -48
  167. package/src/prover/smt/solver/array.ts +1 -3
  168. package/src/prover/smt/solver/asserted-formulas.ts +1 -43
  169. package/src/prover/smt/solver/ast-lt.ts +1 -11
  170. package/src/prover/smt/solver/ast-util.ts +1 -6
  171. package/src/prover/smt/solver/ast.ts +1 -143
  172. package/src/prover/smt/solver/auf-solver.ts +6 -39
  173. package/src/prover/smt/solver/case-split-queue.ts +1 -9
  174. package/src/prover/smt/solver/cg-table.ts +1 -18
  175. package/src/prover/smt/solver/clause.ts +1 -27
  176. package/src/prover/smt/solver/conflict-resolution.ts +0 -9
  177. package/src/prover/smt/solver/context.ts +4 -61
  178. package/src/prover/smt/solver/ctx-simplify.ts +14 -41
  179. package/src/prover/smt/solver/der.ts +2 -21
  180. package/src/prover/smt/solver/dyn-ack.ts +1 -11
  181. package/src/prover/smt/solver/e-matching.ts +3 -34
  182. package/src/prover/smt/solver/enode.ts +1 -21
  183. package/src/prover/smt/solver/expr-ref.ts +1 -5
  184. package/src/prover/smt/solver/expr-safe-replace.ts +0 -5
  185. package/src/prover/smt/solver/fingerprints.ts +1 -12
  186. package/src/prover/smt/solver/flat-literals.ts +1 -9
  187. package/src/prover/smt/solver/goal.ts +2 -14
  188. package/src/prover/smt/solver/hash.ts +0 -8
  189. package/src/prover/smt/solver/hashtable.ts +1 -12
  190. package/src/prover/smt/solver/internalizer.ts +6 -98
  191. package/src/prover/smt/solver/lbool.ts +1 -2
  192. package/src/prover/smt/solver/literal.ts +0 -3
  193. package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
  194. package/src/prover/smt/solver/lp/constraints.ts +2 -8
  195. package/src/prover/smt/solver/lp/containers.ts +12 -30
  196. package/src/prover/smt/solver/lp/core-solver.ts +10 -31
  197. package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
  198. package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
  199. package/src/prover/smt/solver/lp/dependency.ts +1 -4
  200. package/src/prover/smt/solver/lp/dioph-eq.ts +12 -98
  201. package/src/prover/smt/solver/lp/explanation.ts +1 -6
  202. package/src/prover/smt/solver/lp/gomory.ts +9 -22
  203. package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
  204. package/src/prover/smt/solver/lp/hnf.ts +11 -26
  205. package/src/prover/smt/solver/lp/int-cube.ts +15 -36
  206. package/src/prover/smt/solver/lp/int-solver.ts +4 -34
  207. package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
  208. package/src/prover/smt/solver/lp/lar-term.ts +1 -5
  209. package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
  210. package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
  211. package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
  212. package/src/prover/smt/solver/lp/nex.ts +1 -6
  213. package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
  214. package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
  215. package/src/prover/smt/solver/lp/nla-core.ts +35 -130
  216. package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
  217. package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
  218. package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
  219. package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
  220. package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
  221. package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
  222. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
  223. package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
  224. package/src/prover/smt/solver/lp/nla-order.ts +2 -13
  225. package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
  226. package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
  227. package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
  228. package/src/prover/smt/solver/lp/nla-types.ts +1 -11
  229. package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
  230. package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
  231. package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
  232. package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
  233. package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
  234. package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
  235. package/src/prover/smt/solver/lp/pdd.ts +7 -70
  236. package/src/prover/smt/solver/lp/random-updater.ts +1 -8
  237. package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
  238. package/src/prover/smt/solver/lp/union-find.ts +1 -6
  239. package/src/prover/smt/solver/mam-compiler.ts +14 -56
  240. package/src/prover/smt/solver/mam-interpreter.ts +1 -21
  241. package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
  242. package/src/prover/smt/solver/model-checker.ts +2 -36
  243. package/src/prover/smt/solver/model-evaluator.ts +3 -29
  244. package/src/prover/smt/solver/model-finder.ts +3 -15
  245. package/src/prover/smt/solver/model-generator.ts +1 -12
  246. package/src/prover/smt/solver/model-macro-solver.ts +12 -69
  247. package/src/prover/smt/solver/nlsat/algebraic.ts +55 -151
  248. package/src/prover/smt/solver/nlsat/atoms.ts +5 -19
  249. package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
  250. package/src/prover/smt/solver/nlsat/explain.ts +3 -47
  251. package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
  252. package/src/prover/smt/solver/nlsat/levelwise.ts +48 -129
  253. package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
  254. package/src/prover/smt/solver/nlsat/polynomial.ts +17 -156
  255. package/src/prover/smt/solver/nlsat/solver.ts +7 -67
  256. package/src/prover/smt/solver/nlsat/types.ts +1 -8
  257. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -44
  258. package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
  259. package/src/prover/smt/solver/nnf.ts +3 -38
  260. package/src/prover/smt/solver/pattern-inference.ts +2 -15
  261. package/src/prover/smt/solver/poly-rewriter.ts +3 -23
  262. package/src/prover/smt/solver/propagate-values.ts +1 -10
  263. package/src/prover/smt/solver/proto-model.ts +3 -48
  264. package/src/prover/smt/solver/pull-quant.ts +1 -12
  265. package/src/prover/smt/solver/qe-lite-der.ts +1 -29
  266. package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
  267. package/src/prover/smt/solver/qe-lite.ts +3 -33
  268. package/src/prover/smt/solver/qi-queue.ts +1 -16
  269. package/src/prover/smt/solver/quant-tactics.ts +5 -22
  270. package/src/prover/smt/solver/quantifier-analyzer.ts +17 -37
  271. package/src/prover/smt/solver/quantifier-manager.ts +1 -8
  272. package/src/prover/smt/solver/random-gen.ts +1 -2
  273. package/src/prover/smt/solver/rational.ts +1 -8
  274. package/src/prover/smt/solver/ref-vector.ts +1 -6
  275. package/src/prover/smt/solver/relevancy.ts +2 -15
  276. package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
  277. package/src/prover/smt/solver/rewriter.ts +3 -85
  278. package/src/prover/smt/solver/rlimit.ts +2 -20
  279. package/src/prover/smt/solver/smtlib-parser.ts +2 -37
  280. package/src/prover/smt/solver/solver.ts +23 -34
  281. package/src/prover/smt/solver/sort.ts +1 -5
  282. package/src/prover/smt/solver/sticky-generations.ts +0 -5
  283. package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
  284. package/src/prover/smt/solver/theory-lra-bounds.ts +0 -5
  285. package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
  286. package/src/prover/smt/solver/theory-lra-internalize.ts +1 -27
  287. package/src/prover/smt/solver/theory-lra-model.ts +4 -19
  288. package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
  289. package/src/prover/smt/solver/theory-lra-state.ts +3 -8
  290. package/src/prover/smt/solver/theory-lra.ts +1 -8
  291. package/src/prover/smt/solver/var-subst.ts +2 -26
  292. package/src/prover/smt/table.ts +0 -8
  293. package/src/prover/tlapm/cache.ts +20 -25
  294. package/src/prover/tlapm/ocaml-marshal.ts +19 -21
  295. package/src/prover/tlapm/tlapm.ts +12 -17
  296. package/src/prover/verdict.ts +0 -2
  297. package/src/prover/zenon/check/check.ts +0 -9
  298. package/src/prover/zenon/check/definitions.ts +5 -15
  299. package/src/prover/zenon/check/equality.ts +0 -8
  300. package/src/prover/zenon/check/functions.ts +0 -4
  301. package/src/prover/zenon/check/keys.ts +0 -7
  302. package/src/prover/zenon/check/propositional.ts +0 -3
  303. package/src/prover/zenon/check/records.ts +0 -5
  304. package/src/prover/zenon/check/relations.ts +0 -13
  305. package/src/prover/zenon/check/rewrites.ts +0 -6
  306. package/src/prover/zenon/check/sets.ts +0 -3
  307. package/src/prover/zenon/check/terms.ts +0 -17
  308. package/src/prover/zenon/check/tla.ts +0 -6
  309. package/src/prover/zenon/decide.ts +0 -12
  310. package/src/prover/zenon/encode.ts +1 -8
  311. package/src/prover/zenon/eqrel.ts +0 -13
  312. package/src/prover/zenon/equality-rules.ts +0 -4
  313. package/src/prover/zenon/expr.ts +1 -26
  314. package/src/prover/zenon/index-table.ts +17 -38
  315. package/src/prover/zenon/isar-case.ts +9 -19
  316. package/src/prover/zenon/isar.ts +1 -29
  317. package/src/prover/zenon/limits.ts +0 -4
  318. package/src/prover/zenon/llproof.ts +0 -9
  319. package/src/prover/zenon/mltoll.ts +54 -76
  320. package/src/prover/zenon/node.ts +1 -11
  321. package/src/prover/zenon/ocaml.ts +1 -17
  322. package/src/prover/zenon/parse.ts +2 -7
  323. package/src/prover/zenon/phrase.ts +1 -11
  324. package/src/prover/zenon/proof.ts +0 -9
  325. package/src/prover/zenon/propositional-rules.ts +0 -5
  326. package/src/prover/zenon/rules.ts +2 -6
  327. package/src/prover/zenon/search.ts +1 -17
  328. package/src/prover/zenon/tla/functions.ts +57 -29
  329. package/src/prover/zenon/tla/llproof.ts +63 -70
  330. package/src/prover/zenon/tla/records.ts +56 -27
  331. package/src/prover/zenon/tla/rewrites.ts +12 -19
  332. package/src/prover/zenon/tla/sets.ts +68 -39
  333. package/src/prover/zenon/tla/terms.ts +0 -6
  334. package/src/prover/zenon/tla/tla.ts +59 -58
  335. package/src/randomization.ts +84 -35
  336. package/src/resolve.ts +18 -60
  337. package/src/runtime.ts +11 -4
  338. package/src/sany/builtins.ts +3 -4
  339. package/src/sany/generator.ts +128 -176
  340. package/src/sany/levels.ts +6 -30
  341. package/src/sany/lexer.ts +7 -23
  342. package/src/sany/linter.ts +31 -29
  343. package/src/sany/modules.ts +1 -5
  344. package/src/sany/nodes.ts +0 -31
  345. package/src/sany/parse-error.ts +39 -117
  346. package/src/sany/report.ts +29 -63
  347. package/src/sany/selectors.ts +15 -39
  348. package/src/sany/source.ts +1 -17
  349. package/src/sany/xml.ts +13 -63
  350. package/src/search.ts +533 -174
  351. package/src/simulate.ts +694 -0
  352. package/src/spec-description.ts +166 -48
  353. package/src/standard-definitions.ts +2 -3
  354. package/src/standard-modules.ts +264 -68
  355. package/src/state-graph.ts +51 -18
  356. package/src/subexpressions.ts +31 -5
  357. package/src/substitution-levels.ts +2 -3
  358. package/src/successors.ts +267 -77
  359. package/src/symmetry.ts +31 -8
  360. package/src/tableau.ts +27 -24
  361. package/src/tlc/fingerprint.ts +183 -61
  362. package/src/tlc/jar-data.ts +113 -6
  363. package/src/tlc/messages.ts +122 -37
  364. package/src/tlc/order.ts +33 -38
  365. package/src/tlc/random.ts +16 -16
  366. package/src/tlc/replay.ts +563 -211
  367. package/src/tlc/summary.ts +2 -4
  368. package/src/tlc/tlc-operators.ts +81 -36
  369. package/src/tlc/tlcext-operators.ts +138 -117
  370. package/src/tlc/trace-spec.ts +273 -0
  371. package/src/tlc/value-stream.ts +143 -0
  372. package/src/tlc/version.ts +2 -4
  373. package/src/transfer.ts +22 -25
  374. package/src/typescript/actions.ts +481 -0
  375. package/src/typescript/collections.ts +600 -0
  376. package/src/typescript/compile.ts +65 -0
  377. package/src/typescript/context.ts +94 -0
  378. package/src/typescript/emit.ts +121 -0
  379. package/src/typescript/expressions.ts +496 -0
  380. package/src/typescript/formula.ts +152 -0
  381. package/src/typescript/functions.ts +284 -0
  382. package/src/typescript/model.ts +163 -0
  383. package/src/typescript/names.ts +114 -0
  384. package/src/typescript/program.ts +48 -0
  385. package/src/typescript/properties.ts +139 -0
  386. package/src/typescript/scope.ts +112 -0
  387. package/src/typescript/steps.ts +165 -0
  388. package/src/typescript/types.ts +171 -0
  389. package/src/values.ts +832 -255
  390. package/src/worker.ts +7 -8
@@ -1,9 +1,4 @@
1
- // Ported from Z3 (src/model/model_evaluator.cpp), MIT license, see z3-license.txt. Evaluates an
2
- // expression in a model with rewriter_tpl and evaluator_cfg: uninterpreted symbols take their
3
- // interpretations, the interpretation of a function is expanded like a macro, and the rewriters fold
4
- // the interpreted operators. With model completion, a symbol without an interpretation gets some
5
- // value, so a ground expression always evaluates to a value. The cache persists between evaluations
6
- // until the model completion flag changes.
1
+ // Ported from Z3 (src/model/model_evaluator.cpp), MIT license, see z3-license.txt.
7
2
  import {
8
3
  FAMILY_ARITH,
9
4
  FAMILY_USER,
@@ -30,19 +25,15 @@ import type { Rewrite } from "./rewriter-tpl";
30
25
  import { Rational } from "./rational";
31
26
  import { VarSubst } from "./var-subst";
32
27
 
33
- // The division by zero that a division stands for when its divisor is zero.
34
28
  const BY_ZERO_OPS = new Map([
35
29
  [OP_DIV, OP_DIV0],
36
30
  [OP_IDIV, OP_IDIV0],
37
31
  [OP_MOD, OP_MOD0],
38
32
  ]);
39
33
 
40
- // A th_rewriter with the default parameters.
41
34
  export class ModelEvaluator extends RewriterTpl {
42
- // m_b_rw and m_a_rw, whose reductions evaluator_cfg applies.
43
35
  private rewriter: Rewriter;
44
36
  private isModelCompletion = false;
45
- // The arguments of a reduced arithmetic term, reused across evaluations.
46
37
  private reducedArgs: number[] = [];
47
38
 
48
39
  constructor(
@@ -54,7 +45,6 @@ export class ModelEvaluator extends RewriterTpl {
54
45
  this.rewriter.releaseResult = () => this.setLastResult(-1);
55
46
  }
56
47
 
57
- // set_model_completion: the cache is reset when the flag changes.
58
48
  setModelCompletion(isModelCompletion: boolean) {
59
49
  if (this.isModelCompletion === isModelCompletion) return;
60
50
  this.reset();
@@ -76,7 +66,6 @@ export class ModelEvaluator extends RewriterTpl {
76
66
  return result;
77
67
  }
78
68
 
79
- // evaluator_cfg::reduce_app_core. -1 is BR_FAILED.
80
69
  private reduceAppCore(decl: number, args: number[], sort: number): number | Rewrite {
81
70
  const manager = this.manager;
82
71
  const model = this.model;
@@ -117,8 +106,6 @@ export class ModelEvaluator extends RewriterTpl {
117
106
  return result === undefined ? reduced : { expr: result, depth: 1 };
118
107
  }
119
108
 
120
- // evaluate and eval_fi: the result of the entry for the arguments when they are values. Otherwise
121
- // get_macro expands the interpretation.
122
109
  private evaluate(decl: number, args: number[]) {
123
110
  const manager = this.manager;
124
111
  const interp = this.model.funcInterps.get(decl);
@@ -131,9 +118,6 @@ export class ModelEvaluator extends RewriterTpl {
131
118
  return interp.getEntry(args)?.result;
132
119
  }
133
120
 
134
- // evaluate_partial_theory_func: div0, idiv0 and mod0 take their interpretations, or 0 without
135
- // one, and so does a division by zero. A division by a term is its interpretation when the term
136
- // is zero.
137
121
  private evaluatePartialTheoryFunc(decl: number, args: number[], sort: number): number | Rewrite {
138
122
  const manager = this.manager;
139
123
  const model = this.model;
@@ -161,7 +145,6 @@ export class ModelEvaluator extends RewriterTpl {
161
145
  return { expr: this.substitute(interp.getInterp() as number, args), depth: Infinity };
162
146
  }
163
147
 
164
- // var_subst without the standard order, whose result the temporaries hold.
165
148
  private substitute(expr: number, args: number[]) {
166
149
  const subst = new VarSubst(this.manager, false);
167
150
  const result = subst.apply(expr, args);
@@ -170,14 +153,12 @@ export class ModelEvaluator extends RewriterTpl {
170
153
  return result;
171
154
  }
172
155
 
173
- // contains_redex: whether a constant's value has an equality to evaluate.
174
156
  private containsRedex(expr: number) {
175
157
  const manager = this.manager;
176
158
  if (manager.kinds[expr] !== KIND_APP || manager.getNumArgs(expr) === 0) return false;
177
159
  const visited = new Set<number>();
178
160
  const todo = [expr];
179
- while (todo.length > 0) {
180
- const current = todo.pop() as number;
161
+ for (let current = todo.pop(); current !== undefined; current = todo.pop()) {
181
162
  if (visited.has(current)) continue;
182
163
  visited.add(current);
183
164
  if (manager.getOp(current) === OP_EQ) return true;
@@ -190,10 +171,7 @@ export class ModelEvaluator extends RewriterTpl {
190
171
  return false;
191
172
  }
192
173
 
193
- // arith_rewriter::mk_and_core: of lower bounds (<= a y) and (<= b y) on the same term, the
194
- // conjunction keeps the greatest. Z3 compares each bound with the first rather than with the
195
- // greatest so far, which drops the greatest when a smaller one follows it. This port keeps the
196
- // greatest.
174
+ // Z3 compares each bound with the first rather than the greatest so far, where this keeps the greatest.
197
175
  private mkArithAndCore(args: number[]): Rewrite | undefined {
198
176
  const manager = this.manager;
199
177
  if (args.length <= 1 || manager.getOp(args[0]) !== OP_LE) return undefined;
@@ -220,8 +198,6 @@ export class ModelEvaluator extends RewriterTpl {
220
198
  return { expr: manager.mkApp(OP_AND, rest, SORT_BOOL), depth: 1 };
221
199
  }
222
200
 
223
- // get_macro: the interpretation of an uninterpreted function. With model completion, a partial
224
- // interpretation gets an else value, and a function without one gets a constant interpretation.
225
201
  getMacro(decl: number) {
226
202
  const manager = this.manager;
227
203
  const model = this.model;
@@ -246,7 +222,6 @@ export class ModelEvaluator extends RewriterTpl {
246
222
  return true;
247
223
  }
248
224
 
249
- // evaluator_cfg::reduce_quantifier: a th_rewriter of its own reduces the quantifier.
250
225
  reduceQuantifier(expr: number, body: number, patterns: number[]) {
251
226
  const rewriter = new Rewriter(this.manager, TACTIC_REWRITER_OPTIONS);
252
227
  const result = rewriter.reduceQuantifier(expr, body, patterns);
@@ -254,7 +229,6 @@ export class ModelEvaluator extends RewriterTpl {
254
229
  return result;
255
230
  }
256
231
 
257
- // ~imp: evaluator_cfg goes before the caches of rewriter_tpl.
258
232
  release() {
259
233
  this.rewriter.release();
260
234
  super.release();
@@ -1,8 +1,4 @@
1
- // Ported from Z3 (src/smt/smt_model_finder.cpp), MIT license, see z3-license.txt. Completes the
2
- // model of the ground formulas so that it may satisfy the universal quantifiers, following
3
- // "Complete instantiation for quantified SMT formulas": the quantifier analyzer collects how the
4
- // variables occur, and the AUF solver gives each group of argument positions and variables a
5
- // projection function onto its instantiation set.
1
+ // Ported from Z3 (src/smt/smt_model_finder.cpp), MIT license, see z3-license.txt.
6
2
  import { OP_OR, SORT_BOOL, type AstManager } from "./ast";
7
3
  import type { Context } from "./context";
8
4
  import { L_TRUE } from "./lbool";
@@ -19,8 +15,7 @@ export class ModelFinder {
19
15
  private quantifiers: number[] = [];
20
16
  private scopes: number[] = [];
21
17
  private rewriter: Rewriter;
22
- // m_mutil of quantifier_analyzer: macro_util's rewriting, kept apart from the rewriter above so that
23
- // its last result is never released early.
18
+ // macro_util's rewriter stays apart from the one above, so that its last result is never released early.
24
19
  private macroRewriter: Rewriter;
25
20
  readonly aufSolver: AufSolver;
26
21
  private newConstraints: number[] = [];
@@ -60,8 +55,6 @@ export class ModelFinder {
60
55
  shrink(this.scopes, this.scopes.length - numScopes);
61
56
  }
62
57
 
63
- // fix_model: tries to satisfy the relevant quantifiers by changing the model while keeping the
64
- // ground formulas satisfied.
65
58
  fixModel(model: ProtoModel) {
66
59
  const context = this.context;
67
60
  if (this.quantifiers.length === 0) return;
@@ -92,7 +85,6 @@ export class ModelFinder {
92
85
  return this.getQuantifierInfo(quantifier).flatQ;
93
86
  }
94
87
 
95
- // get_uvar_inst_set: the set of variable index of the quantifier before flattening.
96
88
  getUvarInstSet(quantifier: number, index: number) {
97
89
  const manager = this.manager;
98
90
  const flatQ = this.getFlatQuantifier(quantifier);
@@ -105,7 +97,6 @@ export class ModelFinder {
105
97
  );
106
98
  }
107
99
 
108
- // get_inv: a term of the instantiation set whose value is value.
109
100
  getInv(quantifier: number, index: number, value: number, model: ProtoModel) {
110
101
  const set = this.getUvarInstSet(quantifier, index);
111
102
  if (set === null) return null;
@@ -115,7 +106,6 @@ export class ModelFinder {
115
106
  return term === undefined ? null : { term, generation: set.getGeneration(term) };
116
107
  }
117
108
 
118
- // restrict_sks_to_inst_set: each Skolem constant must take the value of a term in its set.
119
109
  restrictSksToInstSet(quantifier: number, sks: number[], assert: (expr: number) => void) {
120
110
  const manager = this.manager;
121
111
  const numDecls = manager.getQuantifier(quantifier).sorts.length;
@@ -124,12 +114,11 @@ export class ModelFinder {
124
114
  const sk = sks[sks.length - index - 1];
125
115
  const set = this.getUvarInstSet(quantifier, index);
126
116
  if (set === null || set.inv.size === 0) continue;
127
- // eqs and new_cnstr hold their terms until the restriction is asserted. ast_manager::mk_or keeps
128
- // a single disjunct in an or.
129
117
  const eqs = new RefVector(manager);
130
118
  for (const value of set.inv.keys())
131
119
  if (manager.sorts[value] === manager.sorts[sk]) eqs.push(manager.mkEq(sk, value));
132
120
  if (eqs.size > 0) {
121
+ // ast_manager::mk_or keeps a single disjunct in an or.
133
122
  const constraint = manager.mkApp(OP_OR, eqs.items, SORT_BOOL);
134
123
  manager.incRef(constraint);
135
124
  assert(constraint);
@@ -141,7 +130,6 @@ export class ModelFinder {
141
130
  return isAsserted;
142
131
  }
143
132
 
144
- // restart_eh: the constraints of the last model become axioms.
145
133
  restartEh() {
146
134
  const context = this.context;
147
135
  for (const constraint of this.newConstraints) {
@@ -1,7 +1,4 @@
1
- // Ported from Z3 (src/smt/smt_model_generator.cpp), MIT license, see z3-license.txt. Builds a
2
- // model from the current assignment: every relevant equivalence class gets a value, Booleans from
3
- // the assignment, integers from the arithmetic theory and other sorts from fresh model values, and
4
- // each congruence root of an uninterpreted function becomes an entry of its interpretation.
1
+ // Ported from Z3 (src/smt/smt_model_generator.cpp), MIT license, see z3-license.txt.
5
2
  import {
6
3
  FAMILY_MODEL_VALUE,
7
4
  FAMILY_USER,
@@ -21,8 +18,6 @@ export interface GeneratedModel {
21
18
  root2value: Map<Enode, number>;
22
19
  }
23
20
 
24
- // include_func_interp: the model interprets uninterpreted functions, theory_lra's divisions by zero,
25
- // and the decls of a family without a theory, such as model values, which stand for themselves.
26
21
  const isIncludedFuncInterp = (decl: FuncDecl) =>
27
22
  decl.family === FAMILY_USER ||
28
23
  decl.family === FAMILY_MODEL_VALUE ||
@@ -34,11 +29,9 @@ export const mkModel = (context: Context): GeneratedModel => {
34
29
  const manager = context.manager;
35
30
  const model = new ProtoModel(manager);
36
31
  context.theory?.initModel(model);
37
- // register_existing_model_values.
38
32
  for (const node of context.enodes)
39
33
  if (node.root === node && context.isRelevant(node.owner) && manager.isModelValue(node.owner))
40
34
  model.registerValue(node.owner);
41
- // mk_bool_model.
42
35
  for (let boolVar = 0; boolVar < context.numBoolVars; boolVar++) {
43
36
  const expr = context.boolVar2Expr[boolVar];
44
37
  if (manager.isUninterpretedConst(expr) && context.isRelevant(expr))
@@ -47,9 +40,6 @@ export const mkModel = (context: Context): GeneratedModel => {
47
40
  context.findAssignment(expr) > 0 ? manager.trueExpr : manager.falseExpr,
48
41
  );
49
42
  }
50
- // mk_values: the values of the arithmetic classes that the theory does not know are fresh, so
51
- // they come after all the other values. Like Z3, that includes the class of a numeral without a
52
- // theory variable, such as a coefficient.
53
43
  const root2value = new Map<Enode, number>();
54
44
  const freshRoots: Enode[] = [];
55
45
  for (const node of context.enodes) {
@@ -76,7 +66,6 @@ export const mkModel = (context: Context): GeneratedModel => {
76
66
  for (const node of context.enodes)
77
67
  if (manager.isUninterpretedConst(node.owner) && context.isRelevant(node.owner))
78
68
  model.registerConst(manager.decls[node.owner], getValue(node));
79
- // mk_func_interps.
80
69
  for (const node of context.enodes) {
81
70
  const expr = node.owner;
82
71
  if (!context.isRelevant(expr) || !isIncludedFuncInterp(manager.funcDecls[node.decl])) continue;
@@ -1,7 +1,4 @@
1
- // Ported from Z3 (src/model/model_macro_solver.cpp, src/ast/macros/macro_util.cpp,
2
- // src/ast/func_decl_dependencies.cpp), MIT license, see z3-license.txt. Collects the conditional
3
- // macros of a quantifier, f(x) = def when cond, and satisfies quantifiers by taking such a def as the
4
- // else case of the interpretation of f.
1
+ // Ported from Z3 (src/model/model_macro_solver.cpp, src/ast/macros/macro_util.cpp, src/ast/func_decl_dependencies.cpp), MIT license, see z3-license.txt.
5
2
  import {
6
3
  FAMILY_BASIC,
7
4
  FAMILY_USER,
@@ -24,12 +21,10 @@ import { Rational } from "./rational";
24
21
  import type { Rewriter } from "./rewriter";
25
22
  import { replaceFreeVars } from "./var-subst";
26
23
 
27
- // cond_macro: f(x_0, ..., x_n) = def whenever cond holds. A hint has no condition.
28
24
  export interface CondMacro {
29
25
  decl: number;
30
26
  def: number;
31
27
  cond: number | null;
32
- isIneq: boolean;
33
28
  isSatisfyAtom: boolean;
34
29
  isHint: boolean;
35
30
  weight: number;
@@ -136,18 +131,12 @@ const isPolyHint = (manager: AstManager, poly: number, head: number, exception:
136
131
  );
137
132
  };
138
133
 
139
- // quantifier_macro_info::collect_macro_candidates, with an empty forbidden set. Each candidate holds
140
- // a reference to its definition and condition, which releaseCondMacros releases. Like macro_util,
141
- // the expressions of each step live until the step returns. The rewriter does macro_util's Boolean
142
- // and arithmetic rewriting, which keeps nothing between calls.
143
134
  export const collectMacroCandidates = (
144
135
  manager: AstManager,
145
136
  rewriter: Rewriter,
146
137
  quantifier: number,
147
138
  ) => {
148
139
  const data = manager.getQuantifier(quantifier);
149
- // qa: an existential quantifier becomes a universal one of the negated body until the candidates
150
- // are collected.
151
140
  const qa = data.isForall
152
141
  ? quantifier
153
142
  : manager.withTemporaries(() =>
@@ -160,7 +149,6 @@ export const collectMacroCandidates = (
160
149
  return candidates;
161
150
  };
162
151
 
163
- // ~cond_macro, for each candidate in order.
164
152
  export const releaseCondMacros = (manager: AstManager, candidates: CondMacro[]) => {
165
153
  for (const candidate of candidates) {
166
154
  if (candidate.cond !== null) manager.decRef(candidate.cond);
@@ -168,12 +156,10 @@ export const releaseCondMacros = (manager: AstManager, candidates: CondMacro[])
168
156
  }
169
157
  };
170
158
 
171
- // macro_util::collect_macro_candidates.
172
159
  const collectCandidates = (manager: AstManager, rewriter: Rewriter, quantifier: number) => {
173
160
  const data = manager.getQuantifier(quantifier);
174
161
  const body = data.body;
175
162
  const candidates: CondMacro[] = [];
176
- // The expressions of a step without a reference live until the step returns.
177
163
  const scope = (step: () => void) => manager.withTemporaries(step, () => []);
178
164
  const mkNot = (expr: number) => rewriter.mkAppCore(OP_NOT, [expr], SORT_BOOL);
179
165
  const mkAnd = (args: number[]) =>
@@ -182,7 +168,6 @@ const collectCandidates = (manager: AstManager, rewriter: Rewriter, quantifier:
182
168
  : args.length === 1
183
169
  ? args[0]
184
170
  : rewriter.mkAppCore(OP_AND, args, SORT_BOOL);
185
- const mkSub = (first: number, second: number) => rewriter.mkSub(first, second);
186
171
  const mkAdd = (args: number[], sort: number) =>
187
172
  args.length === 0
188
173
  ? manager.mkNumeralOfSort(Rational.zero, sort)
@@ -198,7 +183,6 @@ const collectCandidates = (manager: AstManager, rewriter: Rewriter, quantifier:
198
183
  clause !== null &&
199
184
  clause.some((literal) => literal !== exceptLiteral && manager.isOccurring(decl, literal));
200
185
 
201
- // get_rest_clause_as_cond: the condition comes with a reference, which the caller releases.
202
186
  const getRestClauseAsCond = (exceptLiteral: number) =>
203
187
  clause === null
204
188
  ? null
@@ -212,14 +196,12 @@ const collectCandidates = (manager: AstManager, rewriter: Rewriter, quantifier:
212
196
  (cond) => (cond === null ? [] : [cond]),
213
197
  );
214
198
 
215
- // A step with the rest of the clause as its condition, which it holds until it returns.
216
199
  const withRestClauseAsCond = (exceptLiteral: number, step: (cond: number | null) => void) => {
217
200
  const cond = getRestClauseAsCond(exceptLiteral);
218
201
  step(cond);
219
202
  if (cond !== null) manager.decRef(cond);
220
203
  };
221
204
 
222
- // normalize_expr: the variables of the head become (:var 0) ... (:var n-1) in order.
223
205
  const normalize = (head: number, expr: number) => {
224
206
  const mapping = new Map<number, number>();
225
207
  for (let index = 0; index < manager.getNumArgs(head); index++)
@@ -234,14 +216,7 @@ const collectCandidates = (manager: AstManager, rewriter: Rewriter, quantifier:
234
216
  });
235
217
  };
236
218
 
237
- // insert_macro: the candidate holds references to the normalized definition and condition.
238
- const insertMacro = (
239
- head: number,
240
- def: number,
241
- cond: number | null,
242
- isIneq: boolean,
243
- isHint: boolean,
244
- ) =>
219
+ const insertMacro = (head: number, def: number, cond: number | null, isHint: boolean) =>
245
220
  scope(() => {
246
221
  const normDef = normalize(head, def);
247
222
  const normCond = cond !== null ? normalize(head, cond) : isHint ? null : manager.trueExpr;
@@ -251,30 +226,23 @@ const collectCandidates = (manager: AstManager, rewriter: Rewriter, quantifier:
251
226
  decl: manager.decls[head],
252
227
  def: normDef,
253
228
  cond: normCond,
254
- isIneq,
255
229
  isSatisfyAtom: true,
256
230
  isHint,
257
231
  weight: data.weight,
258
232
  });
259
233
  });
260
234
 
261
- // insert_quasi_macro: a head whose arguments are not distinct variables gets fresh variables,
262
- // and for a macro the equalities between them and the arguments join the condition. new_head,
263
- // extra_cond and new_cond hold references until it returns, and are released in the reverse
264
- // order of their declarations.
265
235
  const insertQuasiMacro = (
266
236
  head: number,
267
237
  numDecls: number,
268
238
  def: number,
269
239
  cond: number | null,
270
- isIneq: boolean,
271
240
  isHint: boolean,
272
241
  ) => {
273
242
  if (isMacroHead(manager, head, manager.getNumArgs(head))) {
274
- insertMacro(head, def, cond, isIneq, isHint);
243
+ insertMacro(head, def, cond, isHint);
275
244
  return;
276
245
  }
277
- // quasi_macro_head_to_macro_head and hint_to_macro_head: the condition comes before the head.
278
246
  const converted = manager.withTemporaries(
279
247
  () => {
280
248
  const seen = new Set<number>();
@@ -310,19 +278,13 @@ const collectCandidates = (manager: AstManager, rewriter: Rewriter, quantifier:
310
278
  ? extraCond
311
279
  : manager.withTemporaries(() => mkAnd([cond, extraCond]));
312
280
  if (newCond === extraCond && extraCond !== null) manager.incRef(extraCond);
313
- insertMacro(converted.newHead, def, newCond, isIneq, isHint);
281
+ insertMacro(converted.newHead, def, newCond, isHint);
314
282
  if (newCond !== null) manager.decRef(newCond);
315
283
  if (extraCond !== null) manager.decRef(extraCond);
316
284
  manager.decRef(converted.newHead);
317
285
  };
318
286
 
319
- const collectArith = (
320
- lhs: number,
321
- rhs: number,
322
- atom: number,
323
- numDecls: number,
324
- isIneq: boolean,
325
- ) => {
287
+ const collectArith = (lhs: number, rhs: number, atom: number, numDecls: number) => {
326
288
  if (manager.getOp(lhs) !== OP_ADD && manager.getOp(atom) === OP_EQ) return;
327
289
  const lhsArgs = getPolyArgs(manager, lhs);
328
290
  const tryHead = (head: number, monomial: number, isNegated: boolean) => {
@@ -339,15 +301,11 @@ const collectCandidates = (manager: AstManager, rewriter: Rewriter, quantifier:
339
301
  lhsArgs.filter((arg) => arg !== monomial),
340
302
  manager.sorts[lhs],
341
303
  );
342
- const def = isNegated ? mkSub(rest, rhs) : mkSub(rhs, rest);
343
- // A hint's right-hand side may contain variables that are not arguments of the head.
304
+ const def = isNegated ? rewriter.mkSub(rest, rhs) : rewriter.mkSub(rhs, rest);
344
305
  if (isHint && !isPolyHint(manager, def, head, null)) return;
345
- // add_arith_macro_candidate.
346
- if (isHint) insertQuasiMacro(head, numDecls, def, null, isIneq, true);
306
+ if (isHint) insertQuasiMacro(head, numDecls, def, null, true);
347
307
  else
348
- withRestClauseAsCond(atom, (cond) =>
349
- insertQuasiMacro(head, numDecls, def, cond, isIneq, false),
350
- );
308
+ withRestClauseAsCond(atom, (cond) => insertQuasiMacro(head, numDecls, def, cond, false));
351
309
  });
352
310
  return true;
353
311
  };
@@ -367,13 +325,11 @@ const collectCandidates = (manager: AstManager, rewriter: Rewriter, quantifier:
367
325
  isRestContainingDecl(manager.decls[lhs], atom)
368
326
  )
369
327
  return false;
370
- withRestClauseAsCond(atom, (cond) =>
371
- insertQuasiMacro(lhs, numDecls, rhs, cond, false, false),
372
- );
328
+ withRestClauseAsCond(atom, (cond) => insertQuasiMacro(lhs, numDecls, rhs, cond, false));
373
329
  return true;
374
330
  };
375
331
  const insertHint = (lhs: number, rhs: number) => {
376
- if (isHintAtom(manager, lhs, rhs)) insertQuasiMacro(lhs, numDecls, rhs, null, false, true);
332
+ if (isHintAtom(manager, lhs, rhs)) insertQuasiMacro(lhs, numDecls, rhs, null, true);
377
333
  };
378
334
  const op = manager.getOp(atom);
379
335
  if (op === OP_EQ) {
@@ -397,8 +353,8 @@ const collectCandidates = (manager: AstManager, rewriter: Rewriter, quantifier:
397
353
  if (op === OP_EQ || op === OP_LE || op === OP_GE) {
398
354
  const lhs = manager.getArg(atom, 0);
399
355
  const rhs = manager.getArg(atom, 1);
400
- collectArith(lhs, rhs, atom, numDecls, op !== OP_EQ);
401
- collectArith(rhs, lhs, atom, numDecls, op !== OP_EQ);
356
+ collectArith(lhs, rhs, atom, numDecls);
357
+ collectArith(rhs, lhs, atom, numDecls);
402
358
  }
403
359
  };
404
360
 
@@ -417,8 +373,6 @@ const setElseInterp = (manager: AstManager, model: ProtoModel, decl: number, els
417
373
 
418
374
  type Process = (qs: number[], newQs: number[], residue: number[]) => boolean;
419
375
 
420
- // base_macro_solver::operator(): runs the solver until it removes no more quantifiers, and leaves
421
- // in qs the quantifiers of its last round.
422
376
  const runMacroSolver = (qs: number[], residue: number[], process: Process) => {
423
377
  let current = qs;
424
378
  let next: number[] = [];
@@ -429,7 +383,6 @@ const runMacroSolver = (qs: number[], residue: number[], process: Process) => {
429
383
  return next;
430
384
  };
431
385
 
432
- // simple_macro_solver: a macro for f satisfies its quantifier when no other quantifier uses f.
433
386
  const simpleMacroSolver =
434
387
  (manager: AstManager, model: ProtoModel, getInfo: GetInfo): Process =>
435
388
  (qs, newQs) => {
@@ -445,8 +398,6 @@ const simpleMacroSolver =
445
398
  newQs.push(quantifier);
446
399
  continue;
447
400
  }
448
- // The conditions of the macro can be ignored: the partial interpretation of f satisfies the
449
- // ground part, and MBQI adds instances when it does not satisfy the quantifier.
450
401
  info.theOne = macro.decl;
451
402
  setElseInterp(manager, model, macro.decl, macro.def);
452
403
  isRemoved = true;
@@ -456,8 +407,6 @@ const simpleMacroSolver =
456
407
 
457
408
  const GREEDY_MAX_DEPTH = 10;
458
409
 
459
- // hint_macro_solver: searches greedily for a set of hints and macros, one per function symbol,
460
- // that satisfies a set of quantifiers without cyclic definitions.
461
410
  const hintMacroSolver =
462
411
  (manager: AstManager, model: ProtoModel, getInfo: GetInfo): Process =>
463
412
  (qs, newQs) => {
@@ -548,7 +497,6 @@ const hintMacroSolver =
548
497
  const savedSatisfied = [...satisfied];
549
498
  const savedResidue = [...residue];
550
499
  fs.set(decl, entry[0]);
551
- // update_satisfied_residue.
552
500
  let isUseful = false;
553
501
  for (const quantifier of entry[1]) {
554
502
  if (satisfied.has(quantifier)) continue;
@@ -583,7 +531,6 @@ const hintMacroSolver =
583
531
  return false;
584
532
  };
585
533
 
586
- // collect_func_decls with ng_only: the uninterpreted functions applied in non-ground terms.
587
534
  const collectNgFuncDecls = (manager: AstManager, expr: number) => {
588
535
  const decls = new Set<number>();
589
536
  const visited = new Set<number>();
@@ -608,8 +555,6 @@ const collectNgFuncDecls = (manager: AstManager, expr: number) => {
608
555
  return decls;
609
556
  };
610
557
 
611
- // non_auf_macro_solver: satisfies quantifiers outside the AUF fragment with their macros, even when
612
- // other quantifiers use the defined symbol.
613
558
  const nonAufMacroSolver =
614
559
  (
615
560
  manager: AstManager,
@@ -619,7 +564,6 @@ const nonAufMacroSolver =
619
564
  forceTemplate: number,
620
565
  ): Process =>
621
566
  (qs, newQs, residue) => {
622
- // func_decl_dependencies::insert: fails when f has a definition or the new one is cyclic.
623
567
  const addMacro = (decl: number, elseExpr: number) => {
624
568
  if (dependencies.has(decl)) return false;
625
569
  dependencies.set(decl, collectNgFuncDecls(manager, elseExpr));
@@ -707,7 +651,6 @@ const nonAufMacroSolver =
707
651
  return removed.size > 0;
708
652
  };
709
653
 
710
- // The macro part of model_finder::fix_model: returns the quantifiers left for the AUF solver.
711
654
  export const solveMacros = (
712
655
  manager: AstManager,
713
656
  model: ProtoModel,