tla-ts 0.0.10-dev.cb7650c54 → 0.0.10-dev.d166e0ae9

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 (522) hide show
  1. package/dist/compile.cjs +3 -3
  2. package/dist/compile.js +1 -1
  3. package/dist/deciders.cjs +36 -36
  4. package/dist/deciders.js +53 -53
  5. package/dist/index.cjs +1 -1
  6. package/dist/index.d.cts +14 -4
  7. package/dist/index.d.ts +14 -4
  8. package/dist/index.js +1 -1
  9. package/dist/parallel-worker.cjs +1 -1
  10. package/dist/parallel-worker.js +1 -1
  11. package/dist/prove-worker.cjs +1 -1
  12. package/dist/prove-worker.js +1 -1
  13. package/dist/prove.cjs +69 -69
  14. package/dist/prove.js +79 -79
  15. package/dist/run.cjs +42 -44
  16. package/dist/run.js +44 -46
  17. package/dist/tlapm.cjs +1 -1
  18. package/dist/tlapm.js +2 -2
  19. package/dist/transfer.cjs +46 -44
  20. package/dist/transfer.js +42 -40
  21. package/dist/worker.cjs +7 -7
  22. package/dist/worker.js +7 -7
  23. package/package.json +1 -1
  24. package/src/ast.ts +11 -1
  25. package/src/bags.ts +50 -29
  26. package/src/builtins.ts +4 -3
  27. package/src/check-failure.ts +9 -6
  28. package/src/check-trace.ts +116 -78
  29. package/src/check.ts +474 -209
  30. package/src/cli/runtime-invariants.ts +20 -56
  31. package/src/cli/tlc-arguments.ts +2 -2
  32. package/src/cli/tlc-output.ts +5 -5
  33. package/src/cli/tlc-usage.ts +0 -1
  34. package/src/cli/tlc.ts +29 -9
  35. package/src/cli/xml-exporter.ts +1 -1
  36. package/src/codegen.ts +34 -13
  37. package/src/coverage.ts +3 -0
  38. package/src/dependencies.ts +61 -13
  39. package/src/dfid.ts +22 -10
  40. package/src/environment.ts +96 -37
  41. package/src/errors.ts +7 -0
  42. package/src/evaluate.ts +152 -55
  43. package/src/exit-codes.ts +29 -13
  44. package/src/instances.ts +16 -6
  45. package/src/java-hash.ts +14 -0
  46. package/src/java-overrides.ts +2 -2
  47. package/src/levels.ts +186 -97
  48. package/src/liveness-checker.ts +172 -83
  49. package/src/liveness.ts +52 -11
  50. package/src/obligations/action.ts +0 -2
  51. package/src/obligations/anonymize.ts +0 -2
  52. package/src/obligations/equality.ts +0 -2
  53. package/src/obligations/expression.ts +0 -2
  54. package/src/obligations/format.ts +0 -2
  55. package/src/obligations/generate.ts +0 -2
  56. package/src/obligations/index.ts +1 -1
  57. package/src/obligations/levels.ts +0 -2
  58. package/src/obligations/module.ts +0 -2
  59. package/src/obligations/normalize.ts +1 -6
  60. package/src/obligations/operators.ts +0 -2
  61. package/src/obligations/printer.ts +5 -7
  62. package/src/obligations/proof.ts +0 -2
  63. package/src/obligations/regroup.ts +0 -2
  64. package/src/obligations/simplify.ts +0 -2
  65. package/src/obligations/source.ts +2 -0
  66. package/src/obligations/subexpression.ts +0 -2
  67. package/src/obligations/substitution.ts +0 -2
  68. package/src/obligations/temporal.ts +0 -2
  69. package/src/obligations/tuples.ts +0 -2
  70. package/src/parallel-worker.ts +8 -2
  71. package/src/parallel.ts +5 -0
  72. package/src/parser.ts +115 -145
  73. package/src/pretty-print.ts +1 -1
  74. package/src/prover/isabelle/encode.ts +0 -2
  75. package/src/prover/isabelle/isar/attrib.ts +4 -8
  76. package/src/prover/isabelle/isar/context.ts +0 -4
  77. package/src/prover/isabelle/isar/induct.ts +0 -4
  78. package/src/prover/isabelle/isar/method.ts +0 -2
  79. package/src/prover/isabelle/isar/proof.ts +0 -2
  80. package/src/prover/isabelle/isar/rule-cases.ts +8 -8
  81. package/src/prover/isabelle/isar/toplevel.ts +0 -4
  82. package/src/prover/isabelle/isar/type-check.ts +0 -2
  83. package/src/prover/isabelle/provers/blast/blast.ts +0 -2
  84. package/src/prover/isabelle/provers/blast/branch.ts +0 -2
  85. package/src/prover/isabelle/provers/blast/prove.ts +0 -2
  86. package/src/prover/isabelle/provers/blast/rules.ts +0 -2
  87. package/src/prover/isabelle/provers/blast/state.ts +0 -2
  88. package/src/prover/isabelle/provers/blast/term.ts +0 -2
  89. package/src/prover/isabelle/provers/clasimp.ts +1 -3
  90. package/src/prover/isabelle/provers/classical.ts +0 -2
  91. package/src/prover/isabelle/provers/hypsubst.ts +2 -4
  92. package/src/prover/isabelle/pure/bicompose.ts +0 -2
  93. package/src/prover/isabelle/pure/consts.ts +0 -2
  94. package/src/prover/isabelle/pure/conv.ts +0 -2
  95. package/src/prover/isabelle/pure/drule.ts +0 -2
  96. package/src/prover/isabelle/pure/envir.ts +0 -2
  97. package/src/prover/isabelle/pure/goal.ts +0 -2
  98. package/src/prover/isabelle/pure/logic.ts +0 -2
  99. package/src/prover/isabelle/pure/name.ts +0 -2
  100. package/src/prover/isabelle/pure/net.ts +0 -2
  101. package/src/prover/isabelle/pure/object-logic.ts +0 -2
  102. package/src/prover/isabelle/pure/pattern.ts +0 -2
  103. package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
  104. package/src/prover/isabelle/pure/rewriter.ts +3 -5
  105. package/src/prover/isabelle/pure/search.ts +0 -2
  106. package/src/prover/isabelle/pure/seq.ts +0 -2
  107. package/src/prover/isabelle/pure/simplifier.ts +0 -2
  108. package/src/prover/isabelle/pure/table.ts +0 -2
  109. package/src/prover/isabelle/pure/tactic.ts +0 -2
  110. package/src/prover/isabelle/pure/tactical.ts +0 -2
  111. package/src/prover/isabelle/pure/term-ord.ts +0 -2
  112. package/src/prover/isabelle/pure/term.ts +3 -5
  113. package/src/prover/isabelle/pure/thm.ts +0 -2
  114. package/src/prover/isabelle/pure/type.ts +0 -2
  115. package/src/prover/isabelle/pure/unify.ts +0 -2
  116. package/src/prover/isabelle/pure/variable.ts +0 -2
  117. package/src/prover/isabelle/tla/classical-setup.ts +0 -2
  118. package/src/prover/isabelle/tla/simpdata.ts +0 -2
  119. package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
  120. package/src/prover/prep/md5.ts +26 -29
  121. package/src/prover/smt/rewrite.ts +2 -7
  122. package/src/prover/smt/simplify.ts +1 -1
  123. package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
  124. package/src/prover/smt/solver/ackr-helper.ts +0 -3
  125. package/src/prover/smt/solver/ackr-model-converter.ts +0 -1
  126. package/src/prover/smt/solver/act-cache.ts +0 -1
  127. package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
  128. package/src/prover/smt/solver/aig-tactic.ts +0 -1
  129. package/src/prover/smt/solver/aig.ts +2 -3
  130. package/src/prover/smt/solver/arith-rewriter.ts +11 -4
  131. package/src/prover/smt/solver/arith-terms.ts +0 -2
  132. package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
  133. package/src/prover/smt/solver/array-rewriter.ts +12 -3
  134. package/src/prover/smt/solver/asserted-formulas.ts +169 -59
  135. package/src/prover/smt/solver/ast-lt.ts +1 -2
  136. package/src/prover/smt/solver/ast-util.ts +0 -2
  137. package/src/prover/smt/solver/ast.ts +63 -15
  138. package/src/prover/smt/solver/auf-solver.ts +23 -13
  139. package/src/prover/smt/solver/bit-blast-tactic.ts +26 -3
  140. package/src/prover/smt/solver/bit-blaster.ts +0 -3
  141. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  142. package/src/prover/smt/solver/bound-manager.ts +0 -1
  143. package/src/prover/smt/solver/bound-simplifier.ts +11 -15
  144. package/src/prover/smt/solver/bv-bound-chk.ts +0 -2
  145. package/src/prover/smt/solver/bv-decl-plugin.ts +13 -11
  146. package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
  147. package/src/prover/smt/solver/bv-rewriter.ts +1 -3
  148. package/src/prover/smt/solver/bv1-blast.ts +0 -2
  149. package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
  150. package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
  151. package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
  152. package/src/prover/smt/solver/card2bv.ts +35 -20
  153. package/src/prover/smt/solver/case-split-queue.ts +0 -2
  154. package/src/prover/smt/solver/cg-table.ts +0 -2
  155. package/src/prover/smt/solver/check-logic.ts +0 -1
  156. package/src/prover/smt/solver/clause.ts +0 -1
  157. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -26
  158. package/src/prover/smt/solver/conflict-resolution.ts +0 -1
  159. package/src/prover/smt/solver/context.ts +67 -14
  160. package/src/prover/smt/solver/ctx-simplify.ts +1 -3
  161. package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
  162. package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -8
  163. package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
  164. package/src/prover/smt/solver/demodulator.ts +0 -3
  165. package/src/prover/smt/solver/dependent-expr-state.ts +26 -18
  166. package/src/prover/smt/solver/der.ts +0 -1
  167. package/src/prover/smt/solver/diff-neq.ts +1 -3
  168. package/src/prover/smt/solver/distribute-forall.ts +0 -1
  169. package/src/prover/smt/solver/dom-simplify.ts +0 -2
  170. package/src/prover/smt/solver/dt2bv-tactic.ts +36 -22
  171. package/src/prover/smt/solver/dyn-ack.ts +0 -1
  172. package/src/prover/smt/solver/e-matching.ts +0 -1
  173. package/src/prover/smt/solver/elim-bounds.ts +89 -0
  174. package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
  175. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  176. package/src/prover/smt/solver/elim-uncnstr.ts +5 -10
  177. package/src/prover/smt/solver/enode.ts +0 -1
  178. package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
  179. package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
  180. package/src/prover/smt/solver/euf/arith-internalize.ts +1 -3
  181. package/src/prover/smt/solver/euf/arith-solver.ts +0 -1
  182. package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
  183. package/src/prover/smt/solver/euf/array-internalize.ts +1 -3
  184. package/src/prover/smt/solver/euf/array-solver.ts +0 -2
  185. package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
  186. package/src/prover/smt/solver/euf/bv-internalize.ts +1 -3
  187. package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
  188. package/src/prover/smt/solver/euf/dt-solver.ts +0 -2
  189. package/src/prover/smt/solver/euf/egraph.ts +4 -12
  190. package/src/prover/smt/solver/euf/euf-solver.ts +1 -5
  191. package/src/prover/smt/solver/euf/fpa-solver.ts +0 -2
  192. package/src/prover/smt/solver/euf/mam.ts +1 -7
  193. package/src/prover/smt/solver/euf/q-ematch.ts +1 -4
  194. package/src/prover/smt/solver/euf/q-mbi.ts +0 -2
  195. package/src/prover/smt/solver/euf/q-model-fixer.ts +0 -3
  196. package/src/prover/smt/solver/euf/q-solver.ts +0 -2
  197. package/src/prover/smt/solver/euf/th-solver.ts +0 -9
  198. package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
  199. package/src/prover/smt/solver/expr-ref.ts +0 -1
  200. package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
  201. package/src/prover/smt/solver/expr2polynomial.ts +204 -80
  202. package/src/prover/smt/solver/factor.ts +36 -15
  203. package/src/prover/smt/solver/fd-solver.ts +148 -42
  204. package/src/prover/smt/solver/fingerprints.ts +0 -1
  205. package/src/prover/smt/solver/fix-dl-var.ts +1 -3
  206. package/src/prover/smt/solver/flat-literals.ts +0 -1
  207. package/src/prover/smt/solver/fm-tactic.ts +0 -1
  208. package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
  209. package/src/prover/smt/solver/fpa-rewriter.ts +1 -3
  210. package/src/prover/smt/solver/fpa2bv-converter.ts +3 -2
  211. package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -1
  212. package/src/prover/smt/solver/fpa2bv-tactic.ts +0 -2
  213. package/src/prover/smt/solver/goal.ts +6 -4
  214. package/src/prover/smt/solver/goal2nlsat.ts +57 -32
  215. package/src/prover/smt/solver/guard-set.ts +0 -1
  216. package/src/prover/smt/solver/hash.ts +0 -1
  217. package/src/prover/smt/solver/hashtable.ts +4 -1
  218. package/src/prover/smt/solver/inf-eps.ts +1 -2
  219. package/src/prover/smt/solver/inj-axiom.ts +0 -1
  220. package/src/prover/smt/solver/internalizer.ts +1 -2
  221. package/src/prover/smt/solver/lackr.ts +0 -2
  222. package/src/prover/smt/solver/lbool.ts +0 -1
  223. package/src/prover/smt/solver/lia2card.ts +0 -1
  224. package/src/prover/smt/solver/lia2pb.ts +0 -1
  225. package/src/prover/smt/solver/literal.ts +0 -1
  226. package/src/prover/smt/solver/logic-tactics.ts +9 -6
  227. package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
  228. package/src/prover/smt/solver/lp/constraints.ts +0 -1
  229. package/src/prover/smt/solver/lp/containers.ts +7 -2
  230. package/src/prover/smt/solver/lp/core-solver.ts +0 -3
  231. package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
  232. package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
  233. package/src/prover/smt/solver/lp/dependency.ts +0 -2
  234. package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
  235. package/src/prover/smt/solver/lp/explanation.ts +0 -1
  236. package/src/prover/smt/solver/lp/gomory.ts +0 -1
  237. package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
  238. package/src/prover/smt/solver/lp/hnf.ts +0 -3
  239. package/src/prover/smt/solver/lp/int-cube.ts +0 -1
  240. package/src/prover/smt/solver/lp/int-solver.ts +0 -2
  241. package/src/prover/smt/solver/lp/lar-solver.ts +0 -1
  242. package/src/prover/smt/solver/lp/lar-term.ts +0 -1
  243. package/src/prover/smt/solver/lp/lp-settings.ts +5 -2
  244. package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
  245. package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
  246. package/src/prover/smt/solver/lp/nex.ts +2 -2
  247. package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
  248. package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
  249. package/src/prover/smt/solver/lp/nla-core.ts +26 -7
  250. package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
  251. package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
  252. package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
  253. package/src/prover/smt/solver/lp/nla-grobner.ts +158 -82
  254. package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
  255. package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
  256. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
  257. package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
  258. package/src/prover/smt/solver/lp/nla-order.ts +0 -2
  259. package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
  260. package/src/prover/smt/solver/lp/nla-powers.ts +0 -1
  261. package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
  262. package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
  263. package/src/prover/smt/solver/lp/nla-transcendentals.ts +0 -2
  264. package/src/prover/smt/solver/lp/nla-types.ts +0 -2
  265. package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
  266. package/src/prover/smt/solver/lp/nra-solver.ts +138 -97
  267. package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
  268. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
  269. package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
  270. package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
  271. package/src/prover/smt/solver/lp/pdd.ts +725 -290
  272. package/src/prover/smt/solver/lp/random-updater.ts +0 -2
  273. package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
  274. package/src/prover/smt/solver/lp/union-find.ts +1 -2
  275. package/src/prover/smt/solver/macro-finder.ts +0 -3
  276. package/src/prover/smt/solver/mam-compiler.ts +1 -2
  277. package/src/prover/smt/solver/mam-interpreter.ts +0 -1
  278. package/src/prover/smt/solver/max-bv-sharing-tactic.ts +0 -2
  279. package/src/prover/smt/solver/max-cliques.ts +0 -2
  280. package/src/prover/smt/solver/maxcore.ts +3 -3
  281. package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -1
  282. package/src/prover/smt/solver/maxlex.ts +0 -1
  283. package/src/prover/smt/solver/maxsmt-base.ts +1 -1
  284. package/src/prover/smt/solver/maxsmt.ts +0 -1
  285. package/src/prover/smt/solver/mbp/mbp-arith.ts +0 -1
  286. package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
  287. package/src/prover/smt/solver/mbp/mbp-plugin.ts +0 -2
  288. package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
  289. package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +0 -1
  290. package/src/prover/smt/solver/mbp/mbp-term-graph.ts +0 -1
  291. package/src/prover/smt/solver/model-based-opt.ts +1 -2
  292. package/src/prover/smt/solver/model-checker.ts +1 -2
  293. package/src/prover/smt/solver/model-evaluator.ts +2 -1
  294. package/src/prover/smt/solver/model-finder.ts +0 -1
  295. package/src/prover/smt/solver/model-generator.ts +85 -44
  296. package/src/prover/smt/solver/model-macro-solver.ts +0 -1
  297. package/src/prover/smt/solver/model-printer.ts +0 -1
  298. package/src/prover/smt/solver/mpf.ts +2 -5
  299. package/src/prover/smt/solver/mus.ts +2 -4
  300. package/src/prover/smt/solver/muz/dl-context.ts +22 -46
  301. package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
  302. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -3
  303. package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +0 -2
  304. package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -2
  305. package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +0 -1
  306. package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -4
  307. package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +0 -2
  308. package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -1
  309. package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -2
  310. package/src/prover/smt/solver/muz/dl-rule.ts +8 -11
  311. package/src/prover/smt/solver/muz/hnf.ts +2 -3
  312. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -3
  313. package/src/prover/smt/solver/muz/horn-tactic.ts +15 -4
  314. package/src/prover/smt/solver/muz/rule-properties.ts +22 -1
  315. package/src/prover/smt/solver/muz/spacer-context.ts +2 -5
  316. package/src/prover/smt/solver/muz/spacer-dl-interface.ts +0 -1
  317. package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
  318. package/src/prover/smt/solver/muz/spacer-manager.ts +0 -2
  319. package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -1
  320. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +2 -3
  321. package/src/prover/smt/solver/muz/spacer-util.ts +0 -1
  322. package/src/prover/smt/solver/muz/substitution.ts +0 -2
  323. package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
  324. package/src/prover/smt/solver/nlqsat.ts +3 -3
  325. package/src/prover/smt/solver/nlsat/algebraic.ts +196 -94
  326. package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
  327. package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
  328. package/src/prover/smt/solver/nlsat/explain.ts +375 -218
  329. package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
  330. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
  331. package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
  332. package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
  333. package/src/prover/smt/solver/nlsat/solver.ts +77 -75
  334. package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
  335. package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
  336. package/src/prover/smt/solver/nlsat/types.ts +0 -2
  337. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
  338. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
  339. package/src/prover/smt/solver/nlsat-tactic.ts +1 -2
  340. package/src/prover/smt/solver/nnf.ts +6 -3
  341. package/src/prover/smt/solver/normalize-bounds.ts +0 -1
  342. package/src/prover/smt/solver/occf.ts +0 -1
  343. package/src/prover/smt/solver/opt-context.ts +22 -9
  344. package/src/prover/smt/solver/opt-nlsat.ts +29 -19
  345. package/src/prover/smt/solver/opt-pareto.ts +19 -2
  346. package/src/prover/smt/solver/opt-preprocess.ts +1 -2
  347. package/src/prover/smt/solver/opt-solver.ts +10 -7
  348. package/src/prover/smt/solver/opt-value.ts +0 -1
  349. package/src/prover/smt/solver/optsmt.ts +1 -3
  350. package/src/prover/smt/solver/parallel-tactic.ts +1 -3
  351. package/src/prover/smt/solver/pattern-inference.ts +0 -1
  352. package/src/prover/smt/solver/pb-rewriter.ts +1 -7
  353. package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
  354. package/src/prover/smt/solver/poly-rewriter.ts +75 -19
  355. package/src/prover/smt/solver/probes.ts +90 -27
  356. package/src/prover/smt/solver/propagate-values.ts +0 -1
  357. package/src/prover/smt/solver/proto-model.ts +8 -9
  358. package/src/prover/smt/solver/pull-quant.ts +0 -1
  359. package/src/prover/smt/solver/purify-arith.ts +0 -1
  360. package/src/prover/smt/solver/push-app-ite.ts +37 -0
  361. package/src/prover/smt/solver/qe-arith-plugin.ts +2 -6
  362. package/src/prover/smt/solver/qe-lite-der.ts +0 -1
  363. package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
  364. package/src/prover/smt/solver/qe-lite.ts +2 -3
  365. package/src/prover/smt/solver/qe-mbp.ts +0 -1
  366. package/src/prover/smt/solver/qe.ts +3 -4
  367. package/src/prover/smt/solver/qel.ts +0 -1
  368. package/src/prover/smt/solver/qi-queue.ts +0 -1
  369. package/src/prover/smt/solver/qsat.ts +23 -9
  370. package/src/prover/smt/solver/quant-hoist.ts +0 -1
  371. package/src/prover/smt/solver/quant-tactics.ts +0 -1
  372. package/src/prover/smt/solver/quantifier-analyzer.ts +0 -1
  373. package/src/prover/smt/solver/quantifier-manager.ts +14 -10
  374. package/src/prover/smt/solver/quasi-macros.ts +0 -2
  375. package/src/prover/smt/solver/random-gen.ts +0 -1
  376. package/src/prover/smt/solver/rational.ts +0 -1
  377. package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -2
  378. package/src/prover/smt/solver/recfun-rewriter.ts +0 -1
  379. package/src/prover/smt/solver/reduce-args.ts +0 -1
  380. package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
  381. package/src/prover/smt/solver/ref-vector.ts +0 -1
  382. package/src/prover/smt/solver/relevancy.ts +0 -1
  383. package/src/prover/smt/solver/rewriter-tpl.ts +7 -7
  384. package/src/prover/smt/solver/rewriter.ts +31 -26
  385. package/src/prover/smt/solver/rlimit.ts +17 -1
  386. package/src/prover/smt/solver/sat/asymm-branch.ts +0 -2
  387. package/src/prover/smt/solver/sat/big.ts +0 -1
  388. package/src/prover/smt/solver/sat/clause-use-list.ts +0 -2
  389. package/src/prover/smt/solver/sat/clause.ts +0 -3
  390. package/src/prover/smt/solver/sat/cleaner.ts +0 -2
  391. package/src/prover/smt/solver/sat/config.ts +1 -4
  392. package/src/prover/smt/solver/sat/consequences.ts +0 -1
  393. package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
  394. package/src/prover/smt/solver/sat/goal2sat.ts +0 -3
  395. package/src/prover/smt/solver/sat/inc-sat-solver.ts +81 -29
  396. package/src/prover/smt/solver/sat/model-converter.ts +1 -3
  397. package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
  398. package/src/prover/smt/solver/sat/pb-solver.ts +1 -3
  399. package/src/prover/smt/solver/sat/probing.ts +0 -2
  400. package/src/prover/smt/solver/sat/sat-tactic.ts +17 -8
  401. package/src/prover/smt/solver/sat/sat2goal.ts +10 -9
  402. package/src/prover/smt/solver/sat/scc.ts +0 -1
  403. package/src/prover/smt/solver/sat/simplifier.ts +1 -4
  404. package/src/prover/smt/solver/sat/solver.ts +25 -49
  405. package/src/prover/smt/solver/sat/var-queue.ts +0 -2
  406. package/src/prover/smt/solver/sat/watch-list.ts +0 -3
  407. package/src/prover/smt/solver/search-tree.ts +0 -1
  408. package/src/prover/smt/solver/seq-axioms.ts +20 -36
  409. package/src/prover/smt/solver/seq-decl-plugin.ts +1 -2
  410. package/src/prover/smt/solver/seq-derive.ts +4 -9
  411. package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
  412. package/src/prover/smt/solver/seq-eq-solver.ts +2 -3
  413. package/src/prover/smt/solver/seq-factory.ts +0 -1
  414. package/src/prover/smt/solver/seq-monadic.ts +7 -7
  415. package/src/prover/smt/solver/seq-range-predicate.ts +0 -2
  416. package/src/prover/smt/solver/seq-re-rewriter.ts +2 -2
  417. package/src/prover/smt/solver/seq-re-util.ts +1 -3
  418. package/src/prover/smt/solver/seq-regex-bisim.ts +1 -2
  419. package/src/prover/smt/solver/seq-regex-live.ts +2 -4
  420. package/src/prover/smt/solver/seq-rewriter.ts +31 -31
  421. package/src/prover/smt/solver/seq-skolem.ts +0 -24
  422. package/src/prover/smt/solver/seq-subset.ts +0 -1
  423. package/src/prover/smt/solver/seq-view-witness.ts +4 -6
  424. package/src/prover/smt/solver/smt-consequences.ts +1 -3
  425. package/src/prover/smt/solver/smt-kernel.ts +48 -9
  426. package/src/prover/smt/solver/smt-logics.ts +0 -1
  427. package/src/prover/smt/solver/smt-setup.ts +99 -15
  428. package/src/prover/smt/solver/smt2-printer.ts +0 -2
  429. package/src/prover/smt/solver/smtlib-parser.ts +589 -226
  430. package/src/prover/smt/solver/smtlib-script.ts +674 -197
  431. package/src/prover/smt/solver/solve-eqs.ts +36 -39
  432. package/src/prover/smt/solver/solver.ts +19 -5
  433. package/src/prover/smt/solver/static-features.ts +0 -2
  434. package/src/prover/smt/solver/sticky-generations.ts +0 -1
  435. package/src/prover/smt/solver/tactic.ts +332 -191
  436. package/src/prover/smt/solver/term-enumeration.ts +0 -1
  437. package/src/prover/smt/solver/theory-array.ts +0 -2
  438. package/src/prover/smt/solver/theory-bv.ts +13 -5
  439. package/src/prover/smt/solver/theory-char.ts +0 -1
  440. package/src/prover/smt/solver/theory-datatype.ts +0 -1
  441. package/src/prover/smt/solver/theory-finite-set.ts +2 -2
  442. package/src/prover/smt/solver/theory-fpa.ts +1 -2
  443. package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
  444. package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
  445. package/src/prover/smt/solver/theory-lra-final-check.ts +1 -1
  446. package/src/prover/smt/solver/theory-lra-internalize.ts +10 -1
  447. package/src/prover/smt/solver/theory-lra-model.ts +0 -1
  448. package/src/prover/smt/solver/theory-lra-propagate.ts +11 -4
  449. package/src/prover/smt/solver/theory-lra-state.ts +0 -1
  450. package/src/prover/smt/solver/theory-lra.ts +1 -2
  451. package/src/prover/smt/solver/theory-pb.ts +24 -9
  452. package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
  453. package/src/prover/smt/solver/theory-recfun.ts +0 -1
  454. package/src/prover/smt/solver/theory-seq-regex.ts +0 -1
  455. package/src/prover/smt/solver/theory-seq-solve.ts +1 -3
  456. package/src/prover/smt/solver/theory-seq-state.ts +2 -23
  457. package/src/prover/smt/solver/theory-seq.ts +0 -1
  458. package/src/prover/smt/solver/theory.ts +0 -1
  459. package/src/prover/smt/solver/tseitin-cnf.ts +1 -2
  460. package/src/prover/smt/solver/var-subst.ts +0 -1
  461. package/src/prover/tlapm/cache.ts +8 -8
  462. package/src/prover/zenon/decide.ts +0 -2
  463. package/src/prover/zenon/encode.ts +0 -2
  464. package/src/prover/zenon/eqrel.ts +0 -2
  465. package/src/prover/zenon/equality-rules.ts +24 -2
  466. package/src/prover/zenon/expr.ts +21 -2
  467. package/src/prover/zenon/index-table.ts +7 -4
  468. package/src/prover/zenon/isar-case.ts +1 -3
  469. package/src/prover/zenon/isar.ts +2 -4
  470. package/src/prover/zenon/llproof.ts +0 -2
  471. package/src/prover/zenon/mltoll.ts +0 -2
  472. package/src/prover/zenon/node.ts +0 -2
  473. package/src/prover/zenon/parse.ts +0 -2
  474. package/src/prover/zenon/phrase.ts +1 -3
  475. package/src/prover/zenon/proof.ts +0 -2
  476. package/src/prover/zenon/propositional-rules.ts +0 -2
  477. package/src/prover/zenon/rules.ts +2 -3
  478. package/src/prover/zenon/search.ts +0 -2
  479. package/src/prover/zenon/tla/functions.ts +0 -2
  480. package/src/prover/zenon/tla/llproof.ts +0 -2
  481. package/src/prover/zenon/tla/records.ts +0 -2
  482. package/src/prover/zenon/tla/rewrites.ts +0 -2
  483. package/src/prover/zenon/tla/sets.ts +0 -2
  484. package/src/prover/zenon/tla/terms.ts +0 -2
  485. package/src/prover/zenon/tla/tla.ts +0 -2
  486. package/src/resolve.ts +1072 -253
  487. package/src/runtime.ts +11 -1
  488. package/src/sany/builtins.ts +10 -10
  489. package/src/sany/generation.ts +2 -13
  490. package/src/sany/generator-definitions.ts +3 -1
  491. package/src/sany/generator-expressions.ts +38 -30
  492. package/src/sany/generator-proofs.ts +6 -3
  493. package/src/sany/generator.ts +2 -1
  494. package/src/sany/levels.ts +0 -2
  495. package/src/sany/lexer.ts +3 -3
  496. package/src/sany/linter.ts +0 -2
  497. package/src/sany/modules.ts +4 -2
  498. package/src/sany/nodes.ts +1 -1
  499. package/src/sany/selectors.ts +11 -6
  500. package/src/sany/xml.ts +2 -3
  501. package/src/search.ts +262 -144
  502. package/src/simulate.ts +168 -102
  503. package/src/spec-description.ts +8 -6
  504. package/src/standard-definitions.ts +4 -0
  505. package/src/standard-modules.ts +56 -22
  506. package/src/state-graph.ts +0 -2
  507. package/src/subexpressions.ts +518 -123
  508. package/src/successors.ts +10 -3
  509. package/src/symmetry.ts +2 -1
  510. package/src/tlc/jar-data.ts +10 -0
  511. package/src/tlc/messages.ts +3 -3
  512. package/src/tlc/order.ts +14 -3
  513. package/src/tlc/random.ts +2 -1
  514. package/src/tlc/replay.ts +27 -14
  515. package/src/tlc/tlc-operators.ts +10 -8
  516. package/src/tlc/tlcext-operators.ts +87 -26
  517. package/src/tlc/trace-spec.ts +11 -25
  518. package/src/typed-tier.ts +44 -27
  519. package/src/typescript/types.ts +2 -2
  520. package/src/values.ts +135 -78
  521. package/src/prover/smt/solver/z3-license.txt +0 -10
  522. package/src/prover/zenon/LICENSE +0 -32
@@ -1,6 +1,9 @@
1
- // Ported from Z3 (src/parsers/smt2/smt2scanner.cpp, src/parsers/smt2/smt2parser.cpp,
2
- // src/cmd_context/cmd_context.cpp), MIT license, see z3-license.txt.
3
- import { SmtParseError, SmtUnsupportedError } from "../../../errors";
1
+ import {
2
+ SmtDefaultError,
3
+ SmtParseError,
4
+ type SmtPosition,
5
+ SmtUnsupportedError,
6
+ } from "../../../errors";
4
7
  import {
5
8
  type AstManager,
6
9
  getSymbolHash,
@@ -29,10 +32,12 @@ import {
29
32
  OP_GT,
30
33
  OP_IDIV,
31
34
  OP_IMPLIES,
35
+ OP_INT2BV,
32
36
  OP_IS_INT,
33
37
  OP_ITE,
34
38
  OP_LE,
35
39
  OP_LT,
40
+ OP_MKBV,
36
41
  OP_MOD,
37
42
  OP_REM,
38
43
  OP_MUL,
@@ -74,7 +79,7 @@ import {
74
79
  QUANTIFIER_LAMBDA,
75
80
  } from "./ast";
76
81
  import { getArraySignature, getMapSignature, mkAsArray } from "./array-decl-plugin";
77
- import { BV_OP_NAMES, getBvSignature } from "./bv-decl-plugin";
82
+ import { BV_OP_NAMES, getBvSignature, getMismatchedArgument } from "./bv-decl-plugin";
78
83
  import {
79
84
  type ConstructorDef,
80
85
  type DatatypeDef,
@@ -90,6 +95,7 @@ import {
90
95
  mkDatatypes,
91
96
  mkUpdateField,
92
97
  removeDatatype,
98
+ resetDatatypePlugin,
93
99
  substituteSort,
94
100
  } from "./datatype-decl-plugin";
95
101
  import {
@@ -122,6 +128,7 @@ import {
122
128
  } from "./smt-logics";
123
129
  import { setRecFunDefinition } from "./recfun-decl-plugin";
124
130
  import { DEFAULT_PRINT_OPTIONS, printExpr } from "./smt2-printer";
131
+ import { InvVarShifter } from "./rewriter-tpl";
125
132
  import { replaceFreeVars, VarSubst } from "./var-subst";
126
133
  import { UpolynomialManager } from "./nlsat/upolynomial";
127
134
 
@@ -133,12 +140,13 @@ const DEFAULT_PARSER_OPTIONS: ParserOptions = { isIgnoringBadPatterns: true };
133
140
 
134
141
  // Z3 counts the columns of the first line from 1 and of the others from 0.
135
142
  export interface SmtToken {
136
- kind: "(" | ")" | "symbol" | "keyword" | "string" | "numeral" | "decimal" | "bitvector";
143
+ kind: "(" | ")" | "symbol" | "keyword" | "string" | "numeral" | "decimal" | "bitvector" | "eof";
137
144
  text: string;
138
145
  line: number;
139
146
  column: number;
140
147
  offset: number;
141
148
  endOffset: number;
149
+ lastId: string;
142
150
  }
143
151
 
144
152
  export interface SmtList {
@@ -147,6 +155,7 @@ export interface SmtList {
147
155
  line: number;
148
156
  column: number;
149
157
  offset: number;
158
+ lastId: string;
150
159
  // Z3 reports an error in making an application at its closing parenthesis.
151
160
  end: SmtToken;
152
161
  // The token after a root-obj or an indexed or qualified identifier, where Z3 reports an error in
@@ -210,8 +219,6 @@ type SortDecl = ConstantSortDecl | UserSortDecl | DatatypeSortDecl | DefinedSort
210
219
 
211
220
  const NO_BINDINGS: ReadonlyMap<string, number> = new Map();
212
221
 
213
- const UPOLYNOMIALS = new UpolynomialManager();
214
-
215
222
  interface SmtProblem {
216
223
  assertions: number[];
217
224
  hasCheckSat: boolean;
@@ -291,6 +298,17 @@ interface PatternFrame {
291
298
  next: number;
292
299
  }
293
300
 
301
+ interface MatchFrame {
302
+ kind: "match";
303
+ list: SmtList;
304
+ cases: SExpr[];
305
+ isCaseForm: boolean;
306
+ depth: number;
307
+ isTail: boolean;
308
+ start: number;
309
+ next: number;
310
+ }
311
+
294
312
  // smt2parser.cpp's expr_frame.
295
313
  type TermFrame =
296
314
  | ApplicationFrame
@@ -299,7 +317,8 @@ type TermFrame =
299
317
  | LetDeclFrame
300
318
  | QuantifierFrame
301
319
  | AttributeFrame
302
- | PatternFrame;
320
+ | PatternFrame
321
+ | MatchFrame;
303
322
 
304
323
  const QUANTIFIER_KINDS = new Map([
305
324
  ["forall", QUANTIFIER_FORALL],
@@ -520,6 +539,8 @@ const REAL_FUNCTION_OPS = new Set([
520
539
 
521
540
  // The arity of each builtin declaration but distinct, which takes the arguments it is given.
522
541
  const ARITIES = new Map<number, number>([
542
+ [OP_TRUE, 0],
543
+ [OP_FALSE, 0],
523
544
  [OP_ITE, 3],
524
545
  ...[OP_NOT, OP_UMINUS, OP_ABS, OP_TO_REAL, OP_TO_INT, OP_IS_INT, ...REAL_FUNCTION_OPS]
525
546
  .filter((op) => op !== OP_ATAN2)
@@ -590,6 +611,14 @@ const ARRAY_OPS = new Map([
590
611
  ]);
591
612
  const ARRAY_EXTENSION_OPS = new Map([["default", OP_ARRAY_DEFAULT]]);
592
613
 
614
+ const isPortedTheoryOperator = (name: string) =>
615
+ BV_OP_NAMES.has(name) ||
616
+ FPA_OP_NAMES.has(name) ||
617
+ SEQ_OP_NAMES.has(name) ||
618
+ CHAR_OP_NAMES.has(name) ||
619
+ ARRAY_OPS.has(name) ||
620
+ ARRAY_EXTENSION_OPS.has(name);
621
+
593
622
  const UNARY_BOOL_REFS = new Map([["not", OP_NOT]]);
594
623
  const BINARY_BOOL_REFS = new Map([
595
624
  ["and", OP_AND],
@@ -644,12 +673,14 @@ const FF_LITERAL = /^#f-?[0-9]+m[0-9]+$/;
644
673
  const FF_LOGICS = new Set(["QF_FF", "QF_FFA", "ALL", "HO_ALL"]);
645
674
 
646
675
  // rational::is_unsigned of a numeral token.
647
- const isUnsigned = (numeral: string) => BigInt(numeral) >= 0n && BigInt(numeral) <= 0xffffffffn;
676
+ export const isUnsigned = (numeral: string) =>
677
+ BigInt(numeral) >= 0n && BigInt(numeral) <= 0xffffffffn;
648
678
 
649
679
  const SYMBOL_CHARACTER = /[A-Za-z0-9~!@$%^&*_\-+=<>.?/,]/;
650
680
 
651
681
  const createScanner = (text: string) => {
652
- const state = { index: 0, line: 1, lineStart: -1 };
682
+ // Z3 prints the null symbol its scanner starts with as null.
683
+ const state = { index: 0, line: 1, lineStart: -1, lastId: "null" };
653
684
  const getColumn = () => state.index - state.lineStart - (state.line === 1 ? 0 : 1);
654
685
  const advance = () => {
655
686
  if (text[state.index] === "\n") {
@@ -675,13 +706,17 @@ const createScanner = (text: string) => {
675
706
  }
676
707
  const start = state.index;
677
708
  const position = { line: state.line, column: getColumn() };
678
- const getToken = (kind: SmtToken["kind"], tokenText = text.slice(start, state.index)) => ({
679
- kind,
680
- text: tokenText,
681
- ...position,
682
- offset: start,
683
- endOffset: state.index,
684
- });
709
+ const getToken = (kind: SmtToken["kind"], tokenText = text.slice(start, state.index)) => {
710
+ if (kind === "symbol" || kind === "keyword") state.lastId = tokenText;
711
+ return {
712
+ kind,
713
+ text: tokenText,
714
+ ...position,
715
+ offset: start,
716
+ endOffset: state.index,
717
+ lastId: state.lastId,
718
+ };
719
+ };
685
720
  if (character === "(" || character === ")") {
686
721
  advance();
687
722
  return getToken(character);
@@ -705,6 +740,9 @@ const createScanner = (text: string) => {
705
740
  // string, so the columns of the rest of the line count one more.
706
741
  if (current === "\n") state.lineStart--;
707
742
  if (current !== character) continue;
743
+ // Z3's scanner rereads the last character at the end of the file, as if the quote were doubled.
744
+ if (character === '"' && state.index === text.length)
745
+ throw new SmtParseError("unexpected end of file", position);
708
746
  if (character !== '"' || text[state.index] !== '"') break;
709
747
  advance();
710
748
  }
@@ -735,25 +773,23 @@ const createScanner = (text: string) => {
735
773
  }
736
774
  continue;
737
775
  }
738
- if (radix === "f") {
739
- advance();
740
- readWhile(/[0-9m-]/);
741
- return getToken("symbol");
742
- }
743
- if (radix !== "x" && radix !== "b")
776
+ if (radix !== "f" && radix !== "x" && radix !== "b")
744
777
  throw new SmtParseError("invalid bit-vector literal, expecting 'x' or 'b'", {
745
778
  line: state.line,
746
779
  column: getColumn(),
747
780
  });
748
781
  advance();
749
782
  const digitsStart = state.index;
750
- readWhile(radix === "x" ? /[0-9a-fA-F]/ : /[01]/);
751
- if (state.index === digitsStart)
783
+ readWhile(radix === "f" ? /[0-9m-]/ : radix === "x" ? /[0-9a-fA-F]/ : /[01]/);
784
+ if (state.index === digitsStart && radix !== "f")
752
785
  throw new SmtParseError("invalid empty bit-vector literal", {
753
786
  line: state.line,
754
787
  column: getColumn(),
755
788
  });
756
- return getToken("bitvector");
789
+ // Z3's scanner rereads the last digit at the end of the file.
790
+ if (state.index === text.length && state.index !== digitsStart)
791
+ throw new SmtParseError("unexpected end of file", position);
792
+ return getToken(radix === "f" ? "symbol" : "bitvector");
757
793
  }
758
794
  if (character === ":" || SYMBOL_CHARACTER.test(character)) {
759
795
  advance();
@@ -764,7 +800,11 @@ const createScanner = (text: string) => {
764
800
  throw new SmtParseError("unexpected character", position);
765
801
  }
766
802
  };
767
- return { next, getPosition: () => ({ line: state.line, column: getColumn() }) };
803
+ return {
804
+ next,
805
+ getPosition: () => ({ line: state.line, column: getColumn() }),
806
+ getLastId: () => state.lastId,
807
+ };
768
808
  };
769
809
 
770
810
  export const createCommandReader = (text: string) => {
@@ -786,13 +826,29 @@ export const createCommandReader = (text: string) => {
786
826
  line: open.line,
787
827
  column: open.column,
788
828
  offset: open.offset,
829
+ lastId: open.lastId,
789
830
  end: open,
790
831
  };
791
832
  let followed: SmtList | undefined;
792
833
  for (let current = root; ;) {
793
834
  const token = take();
794
- if (token === undefined)
795
- throw new SmtParseError("unexpected end of file", scanner.getPosition());
835
+ if (token === undefined) {
836
+ // Z3 parses a command as it reads it, and sees the end of the file where it wants a token.
837
+ const eof: SmtToken = {
838
+ kind: "eof",
839
+ text: "",
840
+ ...scanner.getPosition(),
841
+ offset: text.length,
842
+ endOffset: text.length,
843
+ lastId: scanner.getLastId(),
844
+ };
845
+ if (followed !== undefined) followed.follower = eof;
846
+ current.items.push(eof);
847
+ const end = { ...eof };
848
+ current.end = end;
849
+ for (const list of stack) list.end = end;
850
+ return root;
851
+ }
796
852
  if (followed !== undefined) followed.follower = token;
797
853
  followed = undefined;
798
854
  if (token.kind === "(") {
@@ -802,6 +858,7 @@ export const createCommandReader = (text: string) => {
802
858
  line: token.line,
803
859
  column: token.column,
804
860
  offset: token.offset,
861
+ lastId: token.lastId,
805
862
  end: token,
806
863
  root,
807
864
  };
@@ -824,12 +881,28 @@ export const createCommandReader = (text: string) => {
824
881
  current = parent;
825
882
  }
826
883
  };
827
- const read = (): SmtList | undefined => {
884
+ const readOpen = () => {
828
885
  const token = take();
829
886
  if (token === undefined) return undefined;
830
887
  if (token.kind !== "(") throw new SmtParseError("invalid command, '(' expected", token);
831
888
  state.depth = 1;
832
- return readList(token);
889
+ return token;
890
+ };
891
+ const read = () => {
892
+ const open = readOpen();
893
+ return open === undefined ? undefined : readList(open);
894
+ };
895
+ // parse_cmd checks the head of a command before it reads the rest.
896
+ const readCommand = () => {
897
+ const open = readOpen();
898
+ if (open === undefined) return undefined;
899
+ state.lookahead = take();
900
+ if (!isSymbol(state.lookahead))
901
+ throw new SmtParseError(
902
+ "invalid command, symbol expected",
903
+ state.lookahead ?? scanner.getPosition(),
904
+ );
905
+ return readList(open);
833
906
  };
834
907
  const skip = (report: (error: SmtParseError) => void) => {
835
908
  for (;;) {
@@ -848,27 +921,17 @@ export const createCommandReader = (text: string) => {
848
921
  }
849
922
  }
850
923
  };
851
- return { read, skip };
924
+ return { read, readCommand, skip };
852
925
  };
853
926
 
854
- export const isSymbol = (sexpr: SExpr | undefined, text?: string): sexpr is SmtToken =>
855
- sexpr !== undefined && sexpr.kind === "symbol" && (text === undefined || sexpr.text === text);
856
-
857
- // The identifier Z3's scanner read last, which check_next prints after "got".
858
- const getLastId = (sexpr: SExpr | undefined): string | undefined => {
859
- if (sexpr === undefined) return undefined;
860
- if (sexpr.kind !== "list")
861
- return sexpr.kind === "symbol" || sexpr.kind === "keyword" ? sexpr.text : undefined;
862
- return getLastIdBefore(sexpr.items, sexpr.items.length);
927
+ export const expectClosed = (sexpr: SExpr) => {
928
+ const end = sexpr.kind === "list" ? sexpr.end : sexpr;
929
+ if (end.kind === "eof")
930
+ throw new SmtParseError("invalid s-expression, unexpected end of file", end);
863
931
  };
864
932
 
865
- const getLastIdBefore = (items: SExpr[], end: number): string | undefined => {
866
- for (let index = end - 1; index >= 0; index--) {
867
- const id = getLastId(items[index]);
868
- if (id !== undefined) return id;
869
- }
870
- return undefined;
871
- };
933
+ export const isSymbol = (sexpr: SExpr | undefined, text?: string): sexpr is SmtToken =>
934
+ sexpr !== undefined && sexpr.kind === "symbol" && (text === undefined || sexpr.text === text);
872
935
 
873
936
  const isSimpleIndex = (index: SExpr) =>
874
937
  index.kind === "numeral" ||
@@ -881,11 +944,20 @@ const expectList = (sexpr: SExpr | undefined, message: string, at: SExpr): SmtLi
881
944
  return sexpr;
882
945
  };
883
946
 
947
+ const expectListNext = (sexpr: SExpr, message: string) => {
948
+ if (sexpr.kind !== "list") throw new SmtParseError(`${message} got ${sexpr.lastId}`, sexpr);
949
+ return sexpr;
950
+ };
951
+
884
952
  const expectSymbol = (sexpr: SExpr | undefined, message: string, at: SExpr): SmtToken => {
885
953
  if (!isSymbol(sexpr)) throw new SmtParseError(message, sexpr ?? at);
886
954
  return sexpr;
887
955
  };
888
956
 
957
+ const expectEnd = (extra: SExpr | undefined, message: string) => {
958
+ if (extra !== undefined) throw new SmtParseError(message, extra);
959
+ };
960
+
889
961
  export const createSmtlibReader = (
890
962
  manager: AstManager,
891
963
  logic?: string,
@@ -904,6 +976,10 @@ export const createSmtlibReader = (
904
976
  ]);
905
977
  const funcs = new Map<string, readonly number[]>();
906
978
  const macros = new Map<string, Macro>();
979
+ // A pop empties the macros of a name but keeps the name in the dictionary.
980
+ const macroNames: string[] = [];
981
+ const dictionaryNames = new Set<string>();
982
+ const macroDictionary = new ObjMap<string>((index) => getSymbolHash(macroNames[index]));
907
983
  const lastNamed = { name: "", expr: -1 };
908
984
  const notifiedSorts = new Set<number>();
909
985
  const undo: (() => void)[] = [];
@@ -928,6 +1004,9 @@ export const createSmtlibReader = (
928
1004
  const unrooted: number[] = [];
929
1005
  const pending: number[] = [];
930
1006
 
1007
+ const scopedFuncs: number[] = [];
1008
+ const scopedFuncStarts: number[] = [];
1009
+
931
1010
  const declare = <Value>(names: Map<string, Value>, name: string, value: Value) => {
932
1011
  const previous = names.get(name);
933
1012
  undo.push(() => {
@@ -937,6 +1016,14 @@ export const createSmtlibReader = (
937
1016
  names.set(name, value);
938
1017
  };
939
1018
 
1019
+ const insertMacro = (name: string, macro: Macro) => {
1020
+ if (!dictionaryNames.has(name)) {
1021
+ dictionaryNames.add(name);
1022
+ macroDictionary.set(macroNames.push(name) - 1, name);
1023
+ }
1024
+ declare(macros, name, macro);
1025
+ };
1026
+
940
1027
  const hasArrays = logic === undefined || logicHasArray(logic);
941
1028
  const hasFpa = logic === undefined || logicHasFpa(logic);
942
1029
  const hasArrayExtensions = logic === undefined || ARRAY_EXTENSION_LOGICS.has(logic);
@@ -976,6 +1063,7 @@ export const createSmtlibReader = (
976
1063
  at,
977
1064
  );
978
1065
  declare(funcs, name, [...existing, decl]);
1066
+ scopedFuncs.push(decl);
979
1067
  };
980
1068
 
981
1069
  const insertDatatypeDecls = (sort: number, at: SExpr) => {
@@ -1032,38 +1120,40 @@ export const createSmtlibReader = (
1032
1120
  ? decl.parameters.length
1033
1121
  : decl.arity;
1034
1122
 
1123
+ const registerList = () => {
1124
+ const element = manager.mkTypeParameter(0);
1125
+ mkDatatypes(manager, [
1126
+ mkDatatypeDef(
1127
+ manager,
1128
+ "List",
1129
+ [element],
1130
+ [
1131
+ { name: "nil", recognizer: "is-nil", accessors: [] },
1132
+ {
1133
+ name: "insert",
1134
+ recognizer: "is-insert",
1135
+ accessors: [
1136
+ { name: "head", range: element },
1137
+ { name: "tail", range: -1 },
1138
+ ],
1139
+ },
1140
+ ],
1141
+ ),
1142
+ ]);
1143
+ const list: DatatypeSortDecl = {
1144
+ kind: "datatype",
1145
+ name: "List",
1146
+ arity: 1,
1147
+ siblings: [],
1148
+ instances: new Map(),
1149
+ };
1150
+ sortDecls.set("List", list);
1151
+ return list;
1152
+ };
1153
+
1035
1154
  const instantiateSort = (decl: SortDecl, parameters: number[], at: SExpr): number => {
1036
1155
  if (decl.kind === "sort") return decl.sort;
1037
- if (decl.kind === "list") {
1038
- const element = manager.mkTypeParameter(0);
1039
- mkDatatypes(manager, [
1040
- mkDatatypeDef(
1041
- manager,
1042
- "List",
1043
- [element],
1044
- [
1045
- { name: "nil", recognizer: "is-nil", accessors: [] },
1046
- {
1047
- name: "insert",
1048
- recognizer: "is-insert",
1049
- accessors: [
1050
- { name: "head", range: element },
1051
- { name: "tail", range: -1 },
1052
- ],
1053
- },
1054
- ],
1055
- ),
1056
- ]);
1057
- const list: DatatypeSortDecl = {
1058
- kind: "datatype",
1059
- name: "List",
1060
- arity: 1,
1061
- siblings: [],
1062
- instances: new Map(),
1063
- };
1064
- sortDecls.set("List", list);
1065
- return instantiateSort(list, parameters, at);
1066
- }
1156
+ if (decl.kind === "list") return instantiateSort(registerList(), parameters, at);
1067
1157
  if (decl.kind === "user") return manager.mkUninterpretedSort(decl.name, parameters);
1068
1158
  if (decl.kind === "datatype") return instantiateDatatype(decl, parameters, at);
1069
1159
  return parseSort(
@@ -1079,7 +1169,11 @@ export const createSmtlibReader = (
1079
1169
  bindings: ReadonlyMap<string, number>,
1080
1170
  ): number => {
1081
1171
  const head = sexpr.items[0];
1082
- if (!isSymbol(head)) throw new SmtParseError("invalid sort, symbol or '_' expected", head);
1172
+ if (!isSymbol(head))
1173
+ throw new SmtParseError(
1174
+ `${context === "" ? "" : `${context} `}invalid sort, symbol or '_' expected`,
1175
+ head ?? sexpr.end,
1176
+ );
1083
1177
  const isArray =
1084
1178
  ARRAY_SORT_NAMES.has(head.text) || (head.text === "Set" && restricted.hasSetSort);
1085
1179
  if (isArray && hasArrays) {
@@ -1206,6 +1300,11 @@ export const createSmtlibReader = (
1206
1300
  throw new SmtParseError("bit-vector size must be greater than zero", sexpr.end);
1207
1301
  return manager.mkBvSort(Number(width.text));
1208
1302
  }
1303
+ if (sexpr.kind !== "symbol")
1304
+ throw new SmtParseError(
1305
+ `invalid sort, symbol, '_' or '(' expected got ${sexpr.lastId}`,
1306
+ sexpr,
1307
+ );
1209
1308
  const decl = sortDecls.get(sexpr.text);
1210
1309
  if (decl !== undefined) {
1211
1310
  if (getSortDeclArity(decl) !== 0)
@@ -1280,19 +1379,18 @@ export const createSmtlibReader = (
1280
1379
  shrink(exprs, 0);
1281
1380
  };
1282
1381
 
1283
- // push_local: var_shifter moves the free variables of a term that was bound under fewer binders.
1284
- // Its cache holds the terms it makes, which replaceFreeVars rebuilds.
1285
- const getLocalTerm = (local: Local) => {
1286
- if (local.level === binders.depth) return local.expr;
1287
- if (manager.kinds[local.expr] === KIND_VAR)
1288
- return manager.mkVar(
1289
- manager.values[local.expr] + binders.depth - local.level,
1290
- manager.sorts[local.expr],
1291
- );
1292
- return replaceFreeVars(manager, local.expr, (variable, index, shift) =>
1293
- manager.mkVar(index + shift + binders.depth - local.level, manager.sorts[variable]),
1294
- );
1295
- };
1382
+ // The parser's var_shifter, whose cache holds the terms it makes, which replaceFreeVars rebuilds.
1383
+ const shiftFreeVars = (expr: number, amount: number) =>
1384
+ manager.kinds[expr] === KIND_VAR
1385
+ ? manager.mkVar(manager.values[expr] + amount, manager.sorts[expr])
1386
+ : replaceFreeVars(manager, expr, (variable, index, shift) =>
1387
+ manager.mkVar(index + shift + amount, manager.sorts[variable]),
1388
+ );
1389
+
1390
+ const getLocalTerm = (local: Local) =>
1391
+ local.level === binders.depth
1392
+ ? local.expr
1393
+ : shiftFreeVars(local.expr, binders.depth - local.level);
1296
1394
 
1297
1395
  // basic_decl_plugin::join.
1298
1396
  const getJoin = (left: number, right: number, at: SExpr) => {
@@ -1471,19 +1569,19 @@ export const createSmtlibReader = (
1471
1569
  };
1472
1570
 
1473
1571
  // parse_sorted_vars: the variables are created the first declared with the largest index, and
1474
- // the stack holds them. previousId is the identifier before the list.
1475
- const bindSortedVars = (sexpr: SExpr | undefined, at: SExpr, previousId: string) => {
1572
+ // the stack holds them.
1573
+ const bindSortedVars = (sexpr: SExpr | undefined, at: SExpr) => {
1476
1574
  if (sexpr?.kind !== "list")
1477
1575
  throw new SmtParseError(
1478
- `invalid list of sorted variables, '(' expected got ${getLastId(sexpr) ?? previousId}`,
1576
+ `invalid list of sorted variables, '(' expected got ${(sexpr ?? at).lastId}`,
1479
1577
  sexpr ?? at,
1480
1578
  );
1481
1579
  const names: string[] = [];
1482
1580
  const varSorts: number[] = [];
1483
- for (const [index, declaration] of sexpr.items.entries()) {
1581
+ for (const declaration of sexpr.items) {
1484
1582
  if (declaration.kind !== "list")
1485
1583
  throw new SmtParseError(
1486
- `invalid sorted variable, '(' expected got ${getLastId(declaration) ?? getLastIdBefore(sexpr.items, index) ?? previousId}`,
1584
+ `invalid sorted variable, '(' expected got ${declaration.lastId}`,
1487
1585
  declaration,
1488
1586
  );
1489
1587
  const name = declaration.items[0];
@@ -1496,10 +1594,7 @@ export const createSmtlibReader = (
1496
1594
  varSorts.push(parseSort(declaration.items[1] ?? declaration.end, "invalid sorted variables"));
1497
1595
  const extra = declaration.items[2];
1498
1596
  if (extra !== undefined)
1499
- throw new SmtParseError(
1500
- `invalid sorted variable, ')' expected got ${getLastId(extra) ?? getLastId(declaration.items[1]) ?? name.text}`,
1501
- extra,
1502
- );
1597
+ throw new SmtParseError(`invalid sorted variable, ')' expected got ${extra.lastId}`, extra);
1503
1598
  }
1504
1599
  beginScope();
1505
1600
  binders.depth += varSorts.length;
@@ -1573,13 +1668,17 @@ export const createSmtlibReader = (
1573
1668
 
1574
1669
  const mkBvApp = (name: string, args: number[], indices: number[], at: SExpr) => {
1575
1670
  const op = BV_OP_NAMES.get(name) ?? -1;
1576
- const signature = getBvSignature(
1577
- manager,
1578
- op,
1579
- args.map((arg) => manager.sorts[arg]),
1580
- indices,
1581
- );
1671
+ const argSorts = args.map((arg) => manager.sorts[arg]);
1672
+ if (op !== OP_INT2BV && op !== OP_MKBV && (args.length === 0 || !manager.isBvSort(argSorts[0])))
1673
+ throw new SmtParseError("operator is applied to arguments of the wrong sort", at);
1674
+ const signature = getBvSignature(manager, op, argSorts, indices);
1582
1675
  if (typeof signature === "string") throw new SmtParseError(signature, at);
1676
+ const mismatched = getMismatchedArgument(signature, argSorts);
1677
+ if (mismatched !== -1)
1678
+ throw new SmtParseError(
1679
+ `Argument ${printExpr(manager, { options: DEFAULT_PRINT_OPTIONS, isUsed, isClashing }, args[mismatched])} at position ${mismatched} has sort ${manager.getSortName(argSorts[mismatched])} it does not match declaration (declare-fun ${signature.name} (${signature.domain.map((sort) => manager.getSortName(sort)).join(" ")}) ${manager.getSortName(signature.range)})`,
1680
+ at,
1681
+ );
1583
1682
  const decl = manager.mkBvDecl(op, signature.name, indices, signature.domain, signature.range);
1584
1683
  return manager.mkApp(decl, args, signature.range);
1585
1684
  };
@@ -1651,8 +1750,10 @@ export const createSmtlibReader = (
1651
1750
  return mkSeqAppOf(manager, signature, args);
1652
1751
  };
1653
1752
 
1753
+ const upolynomials = new UpolynomialManager(manager.limit);
1754
+
1654
1755
  const parseUpolynomial = (sexpr: SExpr): bigint[] => {
1655
- if (sexpr.kind === "numeral") return UPOLYNOMIALS.set([BigInt(sexpr.text)]);
1756
+ if (sexpr.kind === "numeral") return upolynomials.set([BigInt(sexpr.text)]);
1656
1757
  if (sexpr.kind === "decimal") {
1657
1758
  const parts = sexpr.text.split(".");
1658
1759
  const value = Rational.of(BigInt(parts[0] + parts[1]), 10n ** BigInt(parts[1].length));
@@ -1661,7 +1762,7 @@ export const createSmtlibReader = (
1661
1762
  "invalid univariate polynomial, integer coefficient expected",
1662
1763
  sexpr,
1663
1764
  );
1664
- return UPOLYNOMIALS.set([value.num]);
1765
+ return upolynomials.set([value.num]);
1665
1766
  }
1666
1767
  if (sexpr.kind === "symbol") {
1667
1768
  if (sexpr.text !== "x")
@@ -1686,15 +1787,15 @@ export const createSmtlibReader = (
1686
1787
  "invalid univariate polynomial, exponent must be an unsigned integer",
1687
1788
  exponent,
1688
1789
  );
1689
- return UPOLYNOMIALS.pw(parseUpolynomial(operands[0]), Number(exponent.text));
1790
+ return upolynomials.pw(parseUpolynomial(operands[0]), Number(exponent.text));
1690
1791
  }
1691
1792
  const combine =
1692
1793
  head.text === "+"
1693
- ? UPOLYNOMIALS.add
1794
+ ? upolynomials.add
1694
1795
  : head.text === "-"
1695
- ? UPOLYNOMIALS.sub
1796
+ ? upolynomials.sub
1696
1797
  : head.text === "*"
1697
- ? UPOLYNOMIALS.mul
1798
+ ? upolynomials.mul
1698
1799
  : undefined;
1699
1800
  if (combine === undefined)
1700
1801
  throw new SmtParseError(
@@ -1707,11 +1808,11 @@ export const createSmtlibReader = (
1707
1808
  sexpr,
1708
1809
  );
1709
1810
  const first = parseUpolynomial(operands[0]);
1710
- if (head.text === "-" && operands.length === 1) return UPOLYNOMIALS.neg(first);
1811
+ if (head.text === "-" && operands.length === 1) return upolynomials.neg(first);
1711
1812
  return operands
1712
1813
  .slice(1)
1713
1814
  .reduce(
1714
- (result, operand) => combine.call(UPOLYNOMIALS, result, parseUpolynomial(operand)),
1815
+ (result, operand) => combine.call(upolynomials, result, parseUpolynomial(operand)),
1715
1816
  first,
1716
1817
  );
1717
1818
  };
@@ -1729,7 +1830,10 @@ export const createSmtlibReader = (
1729
1830
  if (BigInt(index.text) === 0n)
1730
1831
  throw new SmtParseError("invalid root-obj, index must be >= 1", index);
1731
1832
  if (list.items.length > 3)
1732
- throw new SmtParseError("invalid root-obj, ')' expected", list.items[3]);
1833
+ throw new SmtParseError(
1834
+ `invalid root-obj, ')' expected got ${list.items[3].lastId}`,
1835
+ list.items[3],
1836
+ );
1733
1837
  const coeffs = parseUpolynomial(polynomial);
1734
1838
  const follower = list.follower ?? list.end;
1735
1839
  if (coeffs.length === 0)
@@ -1755,7 +1859,7 @@ export const createSmtlibReader = (
1755
1859
  if (!isSymbol(name))
1756
1860
  throw new SmtParseError("invalid indexed identifier, symbol expected", name ?? list.end);
1757
1861
  for (const index of list.items.slice(2)) {
1758
- if (index.kind === "string")
1862
+ if (index.kind === "string" || index.kind === "eof")
1759
1863
  throw new SmtParseError(
1760
1864
  "invalid indexed identifier, integer, identifier or '(' expected",
1761
1865
  index,
@@ -1780,7 +1884,7 @@ export const createSmtlibReader = (
1780
1884
  const target = list.items[1];
1781
1885
  if (target === undefined || (target.kind !== "symbol" && target.kind !== "list"))
1782
1886
  throw new SmtParseError(
1783
- `invalid (indexed) identifier, '(_' or symbol expected got ${getLastId(target) ?? "as"}`,
1887
+ `invalid (indexed) identifier, '(_' or symbol expected got ${(target ?? list.end).lastId}`,
1784
1888
  target ?? list.end,
1785
1889
  );
1786
1890
  if (target.kind === "list") {
@@ -1795,7 +1899,7 @@ export const createSmtlibReader = (
1795
1899
  const extra = list.items[3];
1796
1900
  if (extra !== undefined)
1797
1901
  throw new SmtParseError(
1798
- `invalid qualified identifier, ')' expected got ${getLastId(extra) ?? getLastIdBefore(list.items, 3) ?? "as"}`,
1902
+ `invalid qualified identifier, ')' expected got ${extra.lastId}`,
1799
1903
  extra,
1800
1904
  );
1801
1905
  return sort;
@@ -1859,18 +1963,19 @@ export const createSmtlibReader = (
1859
1963
  const sort = parseQualifierSort(list);
1860
1964
  const target = list.items[1];
1861
1965
  const local = isSymbol(target) ? locals.get(target.text) : undefined;
1862
- if (isSymbol(target) && local === undefined)
1863
- return hasArrays && target.text === "const"
1864
- ? mkArrayTerm(OP_CONST_ARRAY, [], [sort], at)
1865
- : parseApp(target, [], at, [], sort);
1966
+ if (isSymbol(target) && local === undefined && hasArrays && target.text === "const")
1967
+ return mkArrayTerm(OP_CONST_ARRAY, [], [sort], at);
1968
+ // A macro takes no range, so check_qualifier catches the sort of the term it stands for.
1866
1969
  const term =
1867
- local === undefined
1868
- ? parseIndexedTerm(
1869
- expectList(target, "invalid indexed identifier, '_' expected", list),
1870
- at,
1871
- sort,
1872
- )
1873
- : getLocalTerm(local);
1970
+ local !== undefined
1971
+ ? getLocalTerm(local)
1972
+ : isSymbol(target)
1973
+ ? parseApp(target, [], at, [], sort)
1974
+ : parseIndexedTerm(
1975
+ expectList(target, "invalid indexed identifier, '_' expected", list),
1976
+ at,
1977
+ sort,
1978
+ );
1874
1979
  if (manager.sorts[term] !== sort)
1875
1980
  throw new SmtParseError(
1876
1981
  `sort mismatch in qualified identifier, expected: ${manager.getSortName(sort)}, got: ${manager.getSortName(manager.sorts[term])}`,
@@ -2007,7 +2112,15 @@ export const createSmtlibReader = (
2007
2112
  const argSort = args.length === 1 ? manager.sorts[args[0]] : -1;
2008
2113
  if (argSort === -1 || !manager.isDatatypeSort(argSort))
2009
2114
  throw new SmtParseError(IS_PARAMETER_MESSAGE, at);
2010
- const constructor = getDatatypeConstructors(manager, argSort).find(
2115
+ const constructors = (() => {
2116
+ try {
2117
+ return getDatatypeConstructors(manager, argSort);
2118
+ } catch (error) {
2119
+ if (!(error instanceof SmtDefaultError)) throw error;
2120
+ throw new SmtParseError(error.message, at);
2121
+ }
2122
+ })();
2123
+ const constructor = constructors.find(
2011
2124
  (decl) => manager.funcDecls[decl].name === constructorName.text,
2012
2125
  );
2013
2126
  if (constructor === undefined)
@@ -2165,10 +2278,19 @@ export const createSmtlibReader = (
2165
2278
  const transcendentalOp = isTranscendental ? TRANSCENDENTAL_OPS.get(builtin) : undefined;
2166
2279
  if (isTranscendental && transcendentalOp === undefined)
2167
2280
  throw new SmtUnsupportedError(`the operator ${name}`);
2168
- const named =
2281
+ const builtinOp =
2169
2282
  builtin === "~"
2170
2283
  ? OP_UMINUS
2171
- : (CHAINABLE_OPS.get(builtin) ?? BUILTIN_OPS.get(builtin) ?? transcendentalOp);
2284
+ : builtin === "true"
2285
+ ? OP_TRUE
2286
+ : builtin === "false"
2287
+ ? OP_FALSE
2288
+ : (CHAINABLE_OPS.get(builtin) ?? BUILTIN_OPS.get(builtin) ?? transcendentalOp);
2289
+ // load_plugin registers the operators of arithmetic only for a logic that has it.
2290
+ const named =
2291
+ builtinOp !== undefined && manager.funcDecls[builtinOp].family === FAMILY_ARITH && !hasArith
2292
+ ? undefined
2293
+ : builtinOp;
2172
2294
  if (
2173
2295
  args.length === 0 &&
2174
2296
  named !== undefined &&
@@ -2179,7 +2301,17 @@ export const createSmtlibReader = (
2179
2301
  const op = named === OP_SUB && args.length === 1 ? OP_UMINUS : named;
2180
2302
  const domainSort = op === undefined ? -1 : getDomainSort(op, args, at);
2181
2303
  if (op !== undefined && domainSort !== -1) return mkApp(op, args, at, domainSort);
2182
- if (op === undefined && (THEORY_OPERATOR.test(name) || THEORY_OPERATORS.has(name)))
2304
+ if (
2305
+ op === undefined &&
2306
+ !isPortedTheoryOperator(name) &&
2307
+ ((THEORY_OPERATOR.test(name) &&
2308
+ (name.startsWith("bv")
2309
+ ? hasBv
2310
+ : name.startsWith("fp.")
2311
+ ? hasFpa
2312
+ : name.startsWith("ff.") || hasSeq)) ||
2313
+ THEORY_OPERATORS.has(name))
2314
+ )
2183
2315
  throw new SmtUnsupportedError(`the operator ${name}`);
2184
2316
  const instance = mkDatatypeInstanceApp(name, args, at);
2185
2317
  if (instance !== undefined) return instance;
@@ -2216,7 +2348,9 @@ export const createSmtlibReader = (
2216
2348
  throw new SmtParseError(
2217
2349
  sexpr.kind === "keyword"
2218
2350
  ? "invalid expression, unexpected keyword"
2219
- : "invalid expression, unexpected ')'",
2351
+ : sexpr.kind === "eof"
2352
+ ? "invalid expression, unexpected input"
2353
+ : "invalid expression, unexpected ')'",
2220
2354
  sexpr,
2221
2355
  );
2222
2356
  };
@@ -2236,8 +2370,10 @@ export const createSmtlibReader = (
2236
2370
  manager.incRef(expr);
2237
2371
  lastNamed.name = name;
2238
2372
  lastNamed.expr = expr;
2239
- manager.mkMacro(name, expr);
2240
- declare(macros, name, { domain: [], range: manager.sorts[expr], body: expr });
2373
+ const decl = manager.mkMacro(name, expr);
2374
+ declare(funcs, name, [...(funcs.get(name) ?? []), decl]);
2375
+ scopedFuncs.push(decl);
2376
+ insertMacro(name, { domain: [], range: manager.sorts[expr], body: expr });
2241
2377
  };
2242
2378
 
2243
2379
  // push_app_frame's parse_qualified_identifier_core, on a head that is (_ <symbol> <index>*) or
@@ -2297,6 +2433,106 @@ export const createSmtlibReader = (
2297
2433
  return { head: name, indices: [] };
2298
2434
  };
2299
2435
 
2436
+ const parseMatchPattern = (sexpr: SExpr, sort: number, after: SExpr) => {
2437
+ if (sexpr.kind !== "list" && sexpr.kind !== "symbol")
2438
+ throw new SmtParseError(
2439
+ "expecting a constructor, _, variable or constructor application",
2440
+ sexpr,
2441
+ );
2442
+ const name = sexpr.kind === "list" ? (sexpr.items[0] ?? sexpr.end) : sexpr;
2443
+ if (!isSymbol(name)) throw new SmtParseError("constructor symbol expected", name);
2444
+ const vars: string[] = [];
2445
+ if (sexpr.kind === "list")
2446
+ for (const [index, item] of sexpr.items.slice(1).entries()) {
2447
+ if (!isSymbol(item)) throw new SmtParseError("variable symbol expected", item);
2448
+ if (item.text !== "_" && vars.includes(item.text))
2449
+ throw new SmtParseError(
2450
+ "unexpected repeated variable in pattern expression",
2451
+ sexpr.items[index + 2] ?? sexpr.end,
2452
+ );
2453
+ vars.push(item.text);
2454
+ }
2455
+ const decl = funcs
2456
+ .get(name.text)
2457
+ ?.find(
2458
+ (candidate) =>
2459
+ manager.funcDecls[candidate].range === sort &&
2460
+ manager.funcDecls[candidate].domain.length === vars.length,
2461
+ );
2462
+ if (decl === undefined && vars.length > 0)
2463
+ throw new SmtParseError(
2464
+ `invalid function declaration reference, unknown indexed function ${name.text}`,
2465
+ after,
2466
+ );
2467
+ if (decl === undefined && (name.text === "true" || name.text === "false"))
2468
+ throw new SmtParseError("expecting a constructor", after);
2469
+ if (decl === undefined && BUILTIN_NAMES.has(name.text))
2470
+ throw new SmtUnsupportedError("a builtin name as a pattern of match");
2471
+ if (decl === undefined) {
2472
+ binders.depth++;
2473
+ const variable = manager.mkVar(0, sort);
2474
+ if (name.text !== "_") insertLocal(name.text, variable);
2475
+ return variable;
2476
+ }
2477
+ if (manager.funcDecls[decl].op !== OP_DT_CONSTRUCTOR)
2478
+ throw new SmtParseError("expecting a constructor", after);
2479
+ binders.depth += vars.length;
2480
+ const args = vars.map((variable, index) => {
2481
+ const boundVar = manager.mkVar(index, manager.funcDecls[decl].domain[index]);
2482
+ if (variable !== "_") insertLocal(variable, boundVar);
2483
+ return boundVar;
2484
+ });
2485
+ return manager.mkApp(decl, args, sort);
2486
+ };
2487
+
2488
+ const compileMatch = (term: number, patterns: number[], bodies: number[], at: SExpr) => {
2489
+ const sort = manager.sorts[term];
2490
+ if (!manager.isDatatypeSort(sort))
2491
+ throw new SmtParseError("pattern matching is only supported for algebraic datatypes", at);
2492
+ const constructors = getDatatypeConstructors(manager, sort);
2493
+ if (!patterns.some((pattern) => manager.kinds[pattern] === KIND_VAR)) {
2494
+ if (patterns.length < constructors.length)
2495
+ throw new SmtParseError("non-exhaustive pattern match", at);
2496
+ const marked = new Set(patterns.map((pattern) => manager.decls[pattern]));
2497
+ if (constructors.some((constructor) => !marked.has(constructor)))
2498
+ throw new SmtParseError("a constructor is missing from pattern match", at);
2499
+ }
2500
+ const subst = new VarSubst(manager, false);
2501
+ let result = -1;
2502
+ for (let index = patterns.length - 1; index >= 0; index--) {
2503
+ const pattern = patterns[index];
2504
+ const isVar = manager.kinds[pattern] === KIND_VAR;
2505
+ const recognizer = isVar ? -1 : getConstructorIs(manager, manager.decls[pattern]);
2506
+ const accessors = isVar ? [] : getConstructorAccessors(manager, manager.decls[pattern]);
2507
+ const shifted = shiftFreeVars(term, isVar ? 1 : accessors.length);
2508
+ manager.incRef(shifted);
2509
+ const substitution = isVar
2510
+ ? [shifted]
2511
+ : accessors.map((accessor) =>
2512
+ manager.mkApp(accessor, [shifted], manager.funcDecls[accessor].range),
2513
+ );
2514
+ for (const expr of substitution) manager.incRef(expr);
2515
+ const condition = isVar ? manager.trueExpr : manager.mkApp(recognizer, [term], SORT_BOOL);
2516
+ manager.incRef(condition);
2517
+ manager.decRef(shifted);
2518
+ const substituted = subst.apply(bodies[index], substitution);
2519
+ const shifter = new InvVarShifter(manager);
2520
+ const body = shifter.shift(substituted, substitution.length);
2521
+ manager.decRef(substituted);
2522
+ shifter.release();
2523
+ const args = [condition, body, result];
2524
+ const next = result === -1 ? body : mkApp(OP_ITE, args, at, getDomainSort(OP_ITE, args, at));
2525
+ manager.incRef(next);
2526
+ if (result !== -1) manager.decRef(result);
2527
+ result = next;
2528
+ manager.decRef(body);
2529
+ manager.decRef(condition);
2530
+ for (const expr of substitution) manager.decRef(expr);
2531
+ }
2532
+ subst.release();
2533
+ return result;
2534
+ };
2535
+
2300
2536
  // parse_expr. Z3 leaves the term on its stack until the command ends. A tail term is one whose
2301
2537
  // value is the value of the whole: it stays off the stack, in parsed, so that the caller of
2302
2538
  // parseTerm can have a term that nothing else holds without a reference of the parser's.
@@ -2331,6 +2567,7 @@ export const createSmtlibReader = (
2331
2567
  // Z3 skips a bad pattern as an s-expression, which cannot start with ')'.
2332
2568
  if (value.kind === ")")
2333
2569
  throw new SmtParseError("invalid s-expression, unexpected ')'", value);
2570
+ expectClosed(value);
2334
2571
  frame.next++;
2335
2572
  exprStack.push(-1);
2336
2573
  return;
@@ -2398,12 +2635,25 @@ export const createSmtlibReader = (
2398
2635
  deliver(parseRootObj(current), isTail, exprStack.length);
2399
2636
  return;
2400
2637
  }
2401
- if (head.text === "match") throw new SmtUnsupportedError("the expression match");
2638
+ if (head.text === "match") {
2639
+ frames.push({
2640
+ kind: "match",
2641
+ list: current,
2642
+ cases: [],
2643
+ isCaseForm: false,
2644
+ depth: -1,
2645
+ isTail,
2646
+ start: exprStack.length,
2647
+ next: -1,
2648
+ });
2649
+ enter(current.items[1] ?? current.end, false);
2650
+ return;
2651
+ }
2402
2652
  if (head.text === "let") {
2403
2653
  const bindings = current.items[1];
2404
2654
  if (bindings?.kind !== "list")
2405
2655
  throw new SmtParseError(
2406
- `invalid let declaration, '(' expected got ${getLastId(bindings) ?? "let"}`,
2656
+ `invalid let declaration, '(' expected got ${(bindings ?? current.end).lastId}`,
2407
2657
  bindings ?? current.end,
2408
2658
  );
2409
2659
  frames.push({
@@ -2446,7 +2696,7 @@ export const createSmtlibReader = (
2446
2696
  }
2447
2697
  // push_quant_frame.
2448
2698
  const start = exprStack.length;
2449
- const bound = bindSortedVars(current.items[1], current.end, head.text);
2699
+ const bound = bindSortedVars(current.items[1], current.end);
2450
2700
  if (bound.varSorts.length === 0)
2451
2701
  throw new SmtParseError(
2452
2702
  "invalid quantifier, list of sorted variables is empty",
@@ -2478,7 +2728,7 @@ export const createSmtlibReader = (
2478
2728
  // push_let_decl_frame.
2479
2729
  if (declaration.kind !== "list")
2480
2730
  throw new SmtParseError(
2481
- `invalid let declaration, '(' expected got ${getLastId(declaration) ?? getLastIdBefore(frame.bindings.items, frame.next) ?? "let"}`,
2731
+ `invalid let declaration, '(' expected got ${declaration.lastId}`,
2482
2732
  declaration,
2483
2733
  );
2484
2734
  const name = declaration.items[0];
@@ -2514,6 +2764,64 @@ export const createSmtlibReader = (
2514
2764
  continue;
2515
2765
  }
2516
2766
  const items = frame.list.items;
2767
+ if (frame.kind === "match") {
2768
+ if (frame.next === -1) {
2769
+ const bindings = items[2] ?? frame.list.end;
2770
+ if (bindings.kind !== "list")
2771
+ throw new SmtParseError(
2772
+ `pattern bindings should be enclosed in a parenthesis got ${bindings.lastId}`,
2773
+ bindings,
2774
+ );
2775
+ // curr_id_is_case reads the last identifier, which a '(' leaves as it was.
2776
+ frame.isCaseForm = (bindings.items[0] ?? bindings.end).lastId === "case";
2777
+ frame.cases = frame.isCaseForm ? items.slice(2) : bindings.items;
2778
+ frame.next = 0;
2779
+ } else if (frame.depth !== -1) {
2780
+ binders.depth = frame.depth;
2781
+ frame.depth = -1;
2782
+ endScope();
2783
+ const binding = frame.cases[frame.next - 1];
2784
+ const extra =
2785
+ binding.kind === "list" ? binding.items[frame.isCaseForm ? 3 : 2] : undefined;
2786
+ if (extra !== undefined)
2787
+ throw new SmtParseError(
2788
+ `invalid pattern binding, ')' expected got ${extra.lastId}`,
2789
+ extra,
2790
+ );
2791
+ }
2792
+ const binding = frame.cases[frame.next];
2793
+ if (binding !== undefined) {
2794
+ if (frame.isCaseForm && !(binding.kind === "list" && isSymbol(binding.items[0], "case")))
2795
+ throw new SmtUnsupportedError("the terms after the cases of match");
2796
+ if (binding.kind !== "list")
2797
+ throw new SmtParseError(
2798
+ `invalid pattern binding, '(' expected got ${binding.lastId}`,
2799
+ binding,
2800
+ );
2801
+ frame.next++;
2802
+ beginScope();
2803
+ frame.depth = binders.depth;
2804
+ const offset = frame.isCaseForm ? 1 : 0;
2805
+ const body = binding.items[offset + 1] ?? binding.end;
2806
+ const sort = manager.sorts[exprStack[frame.start]];
2807
+ pushRef(exprStack, parseMatchPattern(binding.items[offset] ?? binding.end, sort, body));
2808
+ enter(body, false);
2809
+ continue;
2810
+ }
2811
+ if (!frame.isCaseForm && items.length > 3)
2812
+ throw new SmtUnsupportedError("the terms after the cases of match");
2813
+ frames.pop();
2814
+ const term = exprStack[frame.start];
2815
+ const cases = exprStack.slice(frame.start + 1);
2816
+ const patterns = cases.filter((_expr, index) => index % 2 === 0);
2817
+ const bodies = cases.filter((_expr, index) => index % 2 === 1);
2818
+ const result = compileMatch(term, patterns, bodies, frame.list.end);
2819
+ // push_match_frame releases the bodies, then the patterns, then the term.
2820
+ exprStack.splice(frame.start, cases.length + 1, ...bodies, ...patterns, term);
2821
+ deliver(result, frame.isTail, frame.start);
2822
+ manager.decRef(result);
2823
+ continue;
2824
+ }
2517
2825
  if (frame.kind === "attribute") {
2518
2826
  // consume_attributes.
2519
2827
  if (exprStack.length === frame.start) {
@@ -2576,6 +2884,7 @@ export const createSmtlibReader = (
2576
2884
  // Z3 warns of an unknown attribute and skips its value as an s-expression.
2577
2885
  if (value.kind === ")")
2578
2886
  throw new SmtParseError("invalid s-expression, unexpected ')'", value);
2887
+ expectClosed(value);
2579
2888
  frame.next += 2;
2580
2889
  } else if (quantifier === undefined)
2581
2890
  throw new SmtParseError("invalid attribute, not in the scope of a quantifier", keyword);
@@ -2655,13 +2964,13 @@ export const createSmtlibReader = (
2655
2964
  return expr;
2656
2965
  };
2657
2966
 
2658
- const parseDomain = (sexpr: SExpr | undefined, at: SExpr) => {
2967
+ const parseDomain = (sexpr: SExpr) => {
2659
2968
  const context = "Parsing function declaration. Expecting sort list '('";
2660
- return expectList(sexpr, context, at).items.map((item) => parseSort(item, context));
2969
+ return expectListNext(sexpr, context).items.map((item) => parseSort(item, context));
2661
2970
  };
2662
2971
 
2663
- const parseSortParameters = (sexpr: SExpr | undefined, message: string, at: SExpr) =>
2664
- expectList(sexpr, "invalid sort declaration, parameters missing", at).items.map(
2972
+ const parseSortParameters = (sexpr: SExpr, message: string) =>
2973
+ expectListNext(sexpr, "invalid sort declaration, parameters missing").items.map(
2665
2974
  (item) => expectSymbol(item, message, item).text,
2666
2975
  );
2667
2976
 
@@ -2675,8 +2984,12 @@ export const createSmtlibReader = (
2675
2984
  missing: string[],
2676
2985
  ) => {
2677
2986
  if (sexpr.kind === "list") return parseSort(sexpr, "", bindings);
2987
+ if (sexpr.kind === ")") throw new SmtParseError("invalid sort, unexpected ')'", sexpr);
2678
2988
  if (sexpr.kind !== "symbol")
2679
- throw new SmtParseError("invalid sort, symbol, '_' or '(' expected", sexpr);
2989
+ throw new SmtParseError(
2990
+ `invalid sort, symbol, '_' or '(' expected got ${sexpr.lastId}`,
2991
+ sexpr,
2992
+ );
2680
2993
  if (sortDecls.has(sexpr.text) || bindings.has(sexpr.text))
2681
2994
  return parseSort(sexpr, "", bindings);
2682
2995
  const index = datatypeIndexes.get(sexpr.text);
@@ -2699,21 +3012,16 @@ export const createSmtlibReader = (
2699
3012
  );
2700
3013
  return items.map((item) => {
2701
3014
  if (isSymbol(item)) return { name: item.text, recognizer: `is-${item.text}`, accessors: [] };
2702
- const constructor = expectList(
2703
- item,
2704
- "invalid datatype declaration, '(' or ')' expected",
2705
- item,
2706
- );
3015
+ const constructor = expectListNext(item, "invalid datatype declaration, '(' or ')' expected");
2707
3016
  const name = expectSymbol(
2708
3017
  constructor.items[0],
2709
3018
  "invalid constructor declaration, symbol (constructor name) expected",
2710
3019
  constructor,
2711
3020
  ).text;
2712
3021
  const accessors = constructor.items.slice(1).map((accessorItem) => {
2713
- const accessor = expectList(
3022
+ const accessor = expectListNext(
2714
3023
  accessorItem,
2715
3024
  "invalid datatype declaration, '(' or ')' expected",
2716
- accessorItem,
2717
3025
  );
2718
3026
  const accessorName = expectSymbol(
2719
3027
  accessor.items[0],
@@ -2727,7 +3035,10 @@ export const createSmtlibReader = (
2727
3035
  missing,
2728
3036
  );
2729
3037
  if (accessor.items.length > 2)
2730
- throw new SmtParseError("invalid accessor declaration, ')' expected", accessor.items[2]);
3038
+ throw new SmtParseError(
3039
+ `invalid accessor declaration, ')' expected got ${accessor.items[2].lastId}`,
3040
+ accessor.items[2],
3041
+ );
2731
3042
  return { name: accessorName, range };
2732
3043
  });
2733
3044
  return { name, recognizer: `is-${name}`, accessors };
@@ -2735,27 +3046,29 @@ export const createSmtlibReader = (
2735
3046
  };
2736
3047
 
2737
3048
  const parseDatatypeBody = (
2738
- sexpr: SExpr | undefined,
3049
+ sexpr: SExpr,
2739
3050
  datatypeIndexes: ReadonlyMap<string, number>,
2740
3051
  missing: string[],
2741
- at: SExpr,
3052
+ name?: string,
2742
3053
  ) => {
2743
- const body = expectList(sexpr, "invalid datatype declaration, '(' expected", at);
2744
- if (!isSymbol(body.items[0], "par"))
3054
+ const body = expectListNext(sexpr, "invalid datatype declaration, '(' expected");
3055
+ if (!isSymbol(body.items[0], "par")) {
3056
+ if (name !== undefined) declareDatatypeSort(name, 0, body.items[0] ?? body.end);
2745
3057
  return {
2746
3058
  parameters: [],
2747
3059
  constructors: parseConstructors(body.items, NO_BINDINGS, datatypeIndexes, missing, body),
2748
3060
  };
3061
+ }
2749
3062
  const parameters = parseSortParameters(
2750
- body.items[1],
3063
+ body.items[1] ?? body.end,
2751
3064
  "invalid sort parameter, symbol or ')' expected",
2752
- body,
2753
3065
  );
2754
- const constructors = expectList(
2755
- body.items[2],
3066
+ const constructors = expectListNext(
3067
+ body.items[2] ?? body.end,
2756
3068
  "invalid constructor declaration after par, '(' expected",
2757
- body,
2758
3069
  );
3070
+ if (name !== undefined && parameters.length > 0)
3071
+ declareDatatypeSort(name, parameters.length, constructors.items[0] ?? constructors.end);
2759
3072
  return {
2760
3073
  parameters: parameters.map((_name, index) => manager.mkTypeParameter(index)),
2761
3074
  constructors: parseConstructors(
@@ -2795,11 +3108,17 @@ export const createSmtlibReader = (
2795
3108
  declare(sortDecls, name, decl);
2796
3109
  };
2797
3110
 
3111
+ const declareDatatypeSort = (name: string, arity: number, at: SExpr) =>
3112
+ declareSortDecl(
3113
+ name,
3114
+ { kind: "datatype", name, arity, siblings: [], instances: new Map() },
3115
+ at,
3116
+ );
3117
+
2798
3118
  const declareDatatypes = (list: SmtList) => {
2799
- const declaration = expectList(
2800
- list.items[1],
3119
+ const declaration = expectListNext(
3120
+ list.items[1] ?? list.end,
2801
3121
  "invalid sort declaration, parameters missing",
2802
- list,
2803
3122
  );
2804
3123
  const isSmt26 = declaration.items[0]?.kind === "list";
2805
3124
  const datatypeIndexes = new Map<string, number>();
@@ -2813,11 +3132,11 @@ export const createSmtlibReader = (
2813
3132
  );
2814
3133
  return;
2815
3134
  }
2816
- const sortDeclaration = expectList(item, "invalid sort declaration, '(' expected", item);
3135
+ const sortDeclaration = expectListNext(item, "invalid sort declaration, '(' expected");
2817
3136
  const name = expectSymbol(
2818
3137
  sortDeclaration.items[0],
2819
3138
  "invalid sort name, identified expected",
2820
- sortDeclaration,
3139
+ sortDeclaration.end,
2821
3140
  ).text;
2822
3141
  const arity = sortDeclaration.items[1];
2823
3142
  if (arity?.kind !== "numeral")
@@ -2825,26 +3144,25 @@ export const createSmtlibReader = (
2825
3144
  "invalid sort declaration, arity expected",
2826
3145
  arity ?? sortDeclaration.end,
2827
3146
  );
2828
- if (sortDeclaration.items.length > 2)
2829
- throw new SmtParseError("invalid sort declaration, ')' expected", sortDeclaration.items[2]);
2830
3147
  datatypeIndexes.set(name, index);
2831
3148
  names.push(name);
2832
3149
  arities.push(Number(arity.text));
2833
- declareSortDecl(
3150
+ declareDatatypeSort(
2834
3151
  name,
2835
- { kind: "datatype", name, arity: Number(arity.text), siblings: [], instances: new Map() },
2836
- sortDeclaration,
3152
+ Number(arity.text),
3153
+ sortDeclaration.items[2] ?? sortDeclaration.end,
2837
3154
  );
3155
+ if (sortDeclaration.items.length > 2)
3156
+ throw new SmtParseError("invalid sort declaration, ')' expected", sortDeclaration.items[2]);
2838
3157
  });
2839
- const bodies = expectList(list.items[2], "invalid datatype declaration, '(' expected", list);
3158
+ const bodies = expectListNext(
3159
+ list.items[2] ?? list.end,
3160
+ "invalid datatype declaration, '(' expected",
3161
+ );
2840
3162
  // A datatype of the older syntax may refer to any datatype of its declaration.
2841
3163
  if (!isSmt26)
2842
3164
  bodies.items.forEach((item, index) => {
2843
- const datatype = expectList(
2844
- item,
2845
- "invalid datatype declaration, '(' or ')' expected",
2846
- item,
2847
- );
3165
+ const datatype = expectListNext(item, "invalid datatype declaration, '(' or ')' expected");
2848
3166
  const name = expectSymbol(
2849
3167
  datatype.items[0],
2850
3168
  "invalid datatype declaration, symbol (datatype name) expected",
@@ -2869,10 +3187,10 @@ export const createSmtlibReader = (
2869
3187
  Array.from({ length: arities[index] }, (_unused, parameter) =>
2870
3188
  manager.mkTypeParameter(parameter),
2871
3189
  ),
2872
- parseDatatypeBody(item, datatypeIndexes, missing, list).constructors,
3190
+ parseDatatypeBody(item, datatypeIndexes, missing).constructors,
2873
3191
  );
2874
3192
  }
2875
- const datatype = expectList(item, "invalid datatype declaration, '(' or ')' expected", item);
3193
+ const datatype = expectListNext(item, "invalid datatype declaration, '(' or ')' expected");
2876
3194
  return mkDatatypeDef(
2877
3195
  manager,
2878
3196
  names[index],
@@ -2905,29 +3223,21 @@ export const createSmtlibReader = (
2905
3223
  };
2906
3224
 
2907
3225
  const declareDatatype = (list: SmtList) => {
2908
- const name = expectSymbol(list.items[1], "unexpected token used as datatype name", list);
3226
+ const name = expectSymbol(list.items[1], "unexpected token used as datatype name", list.end);
2909
3227
  const missing: string[] = [];
2910
- const bodyList = list.items[2];
2911
- const arity =
2912
- bodyList?.kind === "list" &&
2913
- isSymbol(bodyList.items[0], "par") &&
2914
- bodyList.items[1]?.kind === "list"
2915
- ? bodyList.items[1].items.length
2916
- : 0;
2917
- declareSortDecl(
3228
+ const body = parseDatatypeBody(
3229
+ list.items[2] ?? list.end,
3230
+ new Map([[name.text, 0]]),
3231
+ missing,
2918
3232
  name.text,
2919
- { kind: "datatype", name: name.text, arity, siblings: [], instances: new Map() },
2920
- name,
2921
3233
  );
2922
- const body = parseDatatypeBody(bodyList, new Map([[name.text, 0]]), missing, list);
2923
- if (list.items.length > 3)
2924
- throw new SmtParseError("invalid end of datatype declaration, ')' expected", list.items[3]);
2925
3234
  commitDatatypes(
2926
3235
  [mkDatatypeDef(manager, name.text, body.parameters, body.constructors)],
2927
3236
  missing,
2928
3237
  name,
2929
- list.end,
3238
+ list.items[3] ?? list.end,
2930
3239
  );
3240
+ expectEnd(list.items[3], "invalid end of datatype declaration, ')' expected");
2931
3241
  };
2932
3242
 
2933
3243
  // parse_rec_fun_decl: the variables are bound only while the range is parsed, and Z3 holds them
@@ -2938,7 +3248,7 @@ export const createSmtlibReader = (
2938
3248
  "invalid function/constant definition, symbol expected",
2939
3249
  at,
2940
3250
  );
2941
- const bound = bindSortedVars(items[1], at, symbol.text);
3251
+ const bound = bindSortedVars(items[1], at);
2942
3252
  const range = parseSort(items[2] ?? at, "Invalid recursive function definition");
2943
3253
  unbindSortedVars(bound.varSorts.length);
2944
3254
  return manager.mkRecFuncDecl(symbol.text, bound.varSorts, range);
@@ -2947,7 +3257,7 @@ export const createSmtlibReader = (
2947
3257
  // parse_rec_fun_body: Z3 reports a body of another sort at the token after it.
2948
3258
  const defineRecFun = (decl: number, variables: SExpr, body: SExpr, next: SExpr) => {
2949
3259
  const start = exprStack.length;
2950
- const bound = bindSortedVars(variables, body, "");
3260
+ const bound = bindSortedVars(variables, body);
2951
3261
  runTerm(body, false);
2952
3262
  const parsedBody = exprStack[exprStack.length - 1];
2953
3263
  unbindSortedVars(bound.varSorts.length);
@@ -2975,12 +3285,15 @@ export const createSmtlibReader = (
2975
3285
  subst.release();
2976
3286
  }
2977
3287
  for (const [index, sort] of domain.entries()) manager.incRef(manager.mkVar(index, sort));
2978
- const reversedVars = domain.map((_, index) => manager.mkVar(index, domain[count - index - 1]));
3288
+ const reversedVars = domain.map((_value, index) =>
3289
+ manager.mkVar(index, domain[count - index - 1]),
3290
+ );
2979
3291
  for (const reversedVar of reversedVars) manager.incRef(reversedVar);
2980
3292
  const decl = manager.mkRecFuncDecl(name, domain, manager.sorts[body]);
2981
3293
  for (const reversedVar of reversedVars) manager.decRef(reversedVar);
2982
3294
  setRecFunDefinition(manager, manager.recFunDefs.get(decl)!, true, body);
2983
3295
  declare(funcs, name, [...(funcs.get(name) ?? []), decl]);
3296
+ scopedFuncs.push(decl);
2984
3297
  };
2985
3298
 
2986
3299
  const declareCommand = (list: SmtList) => {
@@ -2990,6 +3303,7 @@ export const createSmtlibReader = (
2990
3303
  const decl = declareRecFun(list.items.slice(1), list.end);
2991
3304
  insertFunc(decl, list.items[4] ?? list.end);
2992
3305
  defineRecFun(decl, list.items[2], list.items[4] ?? list.end, list.items[5] ?? list.end);
3306
+ expectEnd(list.items[5], "invalid function/constant definition, ')' expected");
2993
3307
  shrinkRefs(exprStack, 0);
2994
3308
  return;
2995
3309
  }
@@ -3018,9 +3332,11 @@ export const createSmtlibReader = (
3018
3332
  bodies.items[index + 1] ?? bodies.end,
3019
3333
  );
3020
3334
  });
3021
- const extra = bodies.items[signatures.length];
3022
- if (extra !== undefined)
3023
- throw new SmtParseError("invalid recursive function definition, ')' expected", extra);
3335
+ expectEnd(
3336
+ bodies.items[signatures.length],
3337
+ "invalid recursive function definition, ')' expected",
3338
+ );
3339
+ expectEnd(list.items[3], "invalid function/constant definition, ')' expected");
3024
3340
  shrinkRefs(exprStack, 0);
3025
3341
  return;
3026
3342
  }
@@ -3032,7 +3348,26 @@ export const createSmtlibReader = (
3032
3348
  declareDatatype(list);
3033
3349
  return;
3034
3350
  }
3035
- const symbol = expectSymbol(list.items[1], "invalid declaration, symbol expected", list);
3351
+ const symbol = list.items[1];
3352
+ // check_nonreserved_identifier rejects _ and as, which define-const's check_identifier takes.
3353
+ if (
3354
+ !isSymbol(symbol) ||
3355
+ (name !== "define-const" && (symbol.text === "_" || symbol.text === "as"))
3356
+ )
3357
+ throw new SmtParseError(
3358
+ name === "declare-sort"
3359
+ ? "invalid sort declaration, symbol expected"
3360
+ : name === "define-sort"
3361
+ ? "invalid sort definition, symbol expected"
3362
+ : name === "define-fun"
3363
+ ? "invalid function/constant definition, symbol expected"
3364
+ : name === "define-const"
3365
+ ? "invalid constant definition, symbol expected"
3366
+ : name === "declare-fun"
3367
+ ? "invalid function declaration, symbol expected"
3368
+ : "invalid constant declaration, symbol expected",
3369
+ symbol ?? list.end,
3370
+ );
3036
3371
  if (name === "declare-sort") {
3037
3372
  if (sortDecls.has(symbol.text))
3038
3373
  throw new SmtParseError("invalid sort declaration, sort already declared/defined", symbol);
@@ -3042,8 +3377,6 @@ export const createSmtlibReader = (
3042
3377
  "invalid sort declaration, arity (<numeral>) or ')' expected",
3043
3378
  arity,
3044
3379
  );
3045
- if (list.items.length > 3)
3046
- throw new SmtParseError("invalid sort declaration, ')' expected", list.items[3]);
3047
3380
  declare(
3048
3381
  sortDecls,
3049
3382
  symbol.text,
@@ -3051,26 +3384,25 @@ export const createSmtlibReader = (
3051
3384
  ? { kind: "sort", sort: manager.mkSort(symbol.text) }
3052
3385
  : { kind: "user", name: symbol.text, arity: Number(arity.text) },
3053
3386
  );
3387
+ expectEnd(list.items[3], "invalid sort declaration, ')' expected");
3054
3388
  return;
3055
3389
  }
3056
3390
  if (name === "define-sort") {
3057
3391
  if (sortDecls.has(symbol.text))
3058
3392
  throw new SmtParseError("invalid sort definition, sort already declared/defined", symbol);
3059
3393
  const parameters = parseSortParameters(
3060
- list.items[2],
3394
+ list.items[2] ?? list.end,
3061
3395
  "invalid sort parameter, symbol or ')' expected",
3062
- list,
3063
3396
  );
3064
3397
  const body = list.items[3] ?? list.end;
3065
3398
  checkPsort(body, bindTypeParameters(parameters));
3066
3399
  declare(sortDecls, symbol.text, { kind: "definition", parameters, body });
3400
+ expectEnd(list.items[4], "invalid sort definition, ')' expected");
3067
3401
  return;
3068
3402
  }
3069
3403
  if (name === "define-fun" || name === "define-const") {
3070
3404
  const isConst = name === "define-const";
3071
- const bound = isConst
3072
- ? { names: [], varSorts: [] }
3073
- : bindSortedVars(list.items[2], list.end, symbol.text);
3405
+ const bound = isConst ? { names: [], varSorts: [] } : bindSortedVars(list.items[2], list.end);
3074
3406
  const range = parseSort(
3075
3407
  list.items[isConst ? 2 : 3] ?? list.end,
3076
3408
  isConst ? "Invalid constant definition" : "Invalid function definition",
@@ -3078,20 +3410,27 @@ export const createSmtlibReader = (
3078
3410
  runTerm(list.items[isConst ? 3 : 4] ?? list.end, false);
3079
3411
  const body = exprStack[exprStack.length - 1];
3080
3412
  if (!isConst) unbindSortedVars(bound.varSorts.length);
3413
+ const extra = list.items[isConst ? 4 : 5];
3081
3414
  if (manager.sorts[body] !== range)
3082
3415
  throw new SmtParseError(
3083
3416
  isConst
3084
3417
  ? "invalid constant definition, sort mismatch"
3085
3418
  : "invalid function/constant definition, sort mismatch",
3086
- list.end,
3419
+ extra ?? list.end,
3087
3420
  );
3088
3421
  manager.incRef(body);
3089
- declare(macros, symbol.text, { domain: bound.varSorts, range, body });
3422
+ insertMacro(symbol.text, { domain: bound.varSorts, range, body });
3090
3423
  defineMacroFunc(symbol.text, bound.varSorts, body);
3424
+ expectEnd(
3425
+ extra,
3426
+ isConst
3427
+ ? "invalid constant definition, ')' expected"
3428
+ : "invalid function/constant definition, ')' expected",
3429
+ );
3091
3430
  shrinkRefs(exprStack, 0);
3092
3431
  return;
3093
3432
  }
3094
- const domain = name === "declare-fun" ? parseDomain(list.items[2], list) : [];
3433
+ const domain = name === "declare-fun" ? parseDomain(list.items[2] ?? list.end) : [];
3095
3434
  const range = parseSort(
3096
3435
  list.items[name === "declare-fun" ? 3 : 2] ?? list.end,
3097
3436
  name === "declare-fun" ? "Invalid function declaration" : "Invalid constant declaration",
@@ -3103,45 +3442,60 @@ export const createSmtlibReader = (
3103
3442
  for (const domainVar of vars) manager.decRef(domainVar);
3104
3443
  }
3105
3444
  const decl = manager.mkFuncDecl(symbol.text, domain, range);
3106
- checkDecl(decl, list.end);
3445
+ const extra = list.items[name === "declare-fun" ? 4 : 3];
3446
+ checkDecl(decl, extra ?? list.end);
3107
3447
  if (macros.has(symbol.text))
3108
3448
  throw new SmtUnsupportedError(`the overloaded symbol ${symbol.text}`);
3109
3449
  const existing = funcs.get(symbol.text) ?? [];
3110
3450
  if (existing.some((other) => hasSignature(other, domain, range)))
3111
3451
  throw new SmtParseError(
3112
3452
  `invalid declaration, ${domain.length === 0 ? "constant" : "function"} '${symbol.text}' (with the given signature) already declared`,
3113
- list.end,
3453
+ extra ?? list.end,
3114
3454
  );
3115
3455
  declare(funcs, symbol.text, [...existing, decl]);
3456
+ expectEnd(
3457
+ extra,
3458
+ name === "declare-fun"
3459
+ ? "invalid function declaration, ')' expected"
3460
+ : "invalid constant declaration, ')' expected",
3461
+ );
3116
3462
  };
3117
3463
 
3118
- // The caller takes the reference of the stack.
3119
- const parseFormula = (sexpr: SExpr) => {
3464
+ // The caller takes the stack's reference. Z3 reports a non-Boolean term at the token after it.
3465
+ const parseFormula = (
3466
+ sexpr: SExpr,
3467
+ follower: SmtPosition,
3468
+ message = "invalid assert command, term is not Boolean",
3469
+ ) => {
3120
3470
  runTerm(sexpr, false);
3121
3471
  const assertion = exprStack[exprStack.length - 1];
3122
- if (manager.sorts[assertion] !== SORT_BOOL)
3123
- throw new SmtParseError("invalid assert command, term is not Boolean", sexpr);
3472
+ if (manager.sorts[assertion] !== SORT_BOOL) throw new SmtParseError(message, follower);
3124
3473
  exprStack.pop();
3125
3474
  return assertion;
3126
3475
  };
3127
3476
 
3128
3477
  // An assertion is named when the last name of its term is its own.
3129
- const parseAssertion = (sexpr: SExpr) => {
3478
+ const parseAssertion = (sexpr: SExpr, follower: SmtPosition) => {
3130
3479
  releasePending();
3131
3480
  lastNamed.expr = -1;
3132
- const formula = parseFormula(sexpr);
3481
+ const formula = parseFormula(sexpr, follower);
3133
3482
  return { formula, name: lastNamed.expr === formula ? lastNamed.name : undefined };
3134
3483
  };
3135
3484
 
3136
3485
  const push = () => {
3137
3486
  releasePending();
3138
3487
  scopeStarts.push(undo.length);
3488
+ scopedFuncStarts.push(scopedFuncs.length);
3139
3489
  };
3140
3490
 
3141
- const pop = () => {
3491
+ const pop = (count: number) => {
3142
3492
  releasePending();
3143
- const start = scopeStarts.pop() ?? 0;
3493
+ const funcStart = scopedFuncStarts.splice(scopedFuncStarts.length - count)[0];
3494
+ for (const decl of scopedFuncs.splice(funcStart)) manager.eraseRecFunDef(decl);
3495
+ const start = scopeStarts.splice(scopeStarts.length - count)[0];
3144
3496
  for (const restore of undo.splice(start).reverse()) restore();
3497
+ // cmd_context::pop resets the plugin through its datatype handler.
3498
+ resetDatatypePlugin(manager);
3145
3499
  };
3146
3500
 
3147
3501
  // parser::reset, after an error: Z3 frees its stacks, and with them the terms that only the
@@ -3204,7 +3558,7 @@ export const createSmtlibReader = (
3204
3558
  getFuncs: (name: string) => funcs.get(name) ?? [],
3205
3559
  hasDefinitions,
3206
3560
  parseTerm,
3207
- parseSort: (sexpr: SExpr) => parseSort(sexpr, ""),
3561
+ parseSort: (sexpr: SExpr, context: string) => parseSort(sexpr, context),
3208
3562
  parseFormula,
3209
3563
  parseAssertion,
3210
3564
  getLogicError: logicChecker.checkExpr,
@@ -3212,9 +3566,15 @@ export const createSmtlibReader = (
3212
3566
  pop,
3213
3567
  reset,
3214
3568
  restrictSorts,
3569
+ registerList,
3215
3570
  isUsed,
3216
3571
  isClashing,
3217
3572
  getDeclaredFuncs,
3573
+ getConstantMacros: () =>
3574
+ [...macroDictionary.values()].flatMap((name) => {
3575
+ const macro = macros.get(name);
3576
+ return macro?.domain.length === 0 ? [{ name, body: macro.body }] : [];
3577
+ }),
3218
3578
  };
3219
3579
  };
3220
3580
 
@@ -3275,7 +3635,10 @@ export const parseSmtlib = (
3275
3635
  state.reader.declareCommand(list);
3276
3636
  } else if (name === "assert") {
3277
3637
  state.isInUse = true;
3278
- const assertion = state.reader.parseFormula(list.items[1] ?? list.end);
3638
+ const assertion = state.reader.parseFormula(
3639
+ list.items[1] ?? list.end,
3640
+ list.items[2] ?? list.end,
3641
+ );
3279
3642
  const logicError = state.reader.getLogicError(assertion);
3280
3643
  if (logicError !== undefined) {
3281
3644
  manager.decRef(assertion);
@@ -3288,7 +3651,7 @@ export const parseSmtlib = (
3288
3651
  };
3289
3652
  for (;;) {
3290
3653
  try {
3291
- const list = commands.read();
3654
+ const list = commands.readCommand();
3292
3655
  if (list === undefined) return { assertions, hasCheckSat: false, rlimit: state.rlimit };
3293
3656
  if (isSymbol(list.items[0], "check-sat"))
3294
3657
  return { assertions, hasCheckSat: true, rlimit: state.rlimit };