tla-ts 0.0.10-dev.d618a2d79 → 0.0.10-dev.e5c8dc315

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 (263) 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 +18 -4
  7. package/dist/index.d.ts +18 -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 +56 -56
  14. package/dist/prove.js +78 -78
  15. package/dist/run.cjs +40 -44
  16. package/dist/run.js +42 -46
  17. package/dist/tlapm.cjs +1 -1
  18. package/dist/tlapm.js +2 -2
  19. package/dist/transfer.cjs +97 -92
  20. package/dist/transfer.js +97 -92
  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 +31 -3
  25. package/src/bags.ts +50 -29
  26. package/src/builtins.ts +4 -3
  27. package/src/check-failure.ts +13 -11
  28. package/src/check-trace.ts +146 -93
  29. package/src/check.ts +518 -281
  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 +18 -4
  33. package/src/cli/tlc.ts +18 -12
  34. package/src/cli/xml-exporter.ts +1 -1
  35. package/src/codegen.ts +23 -10
  36. package/src/coverage.ts +255 -18
  37. package/src/dependencies.ts +68 -15
  38. package/src/dfid.ts +101 -36
  39. package/src/environment.ts +155 -66
  40. package/src/errors.ts +7 -0
  41. package/src/evaluate.ts +424 -135
  42. package/src/exit-codes.ts +28 -14
  43. package/src/instances.ts +152 -25
  44. package/src/java-hash.ts +14 -0
  45. package/src/java-overrides.ts +2 -2
  46. package/src/levels.ts +675 -236
  47. package/src/lexer.ts +12 -2
  48. package/src/liveness-checker.ts +179 -60
  49. package/src/liveness.ts +55 -10
  50. package/src/obligations/index.ts +1 -1
  51. package/src/obligations/normalize.ts +1 -4
  52. package/src/obligations/printer.ts +5 -5
  53. package/src/obligations/source.ts +2 -0
  54. package/src/parallel-worker.ts +8 -2
  55. package/src/parallel.ts +5 -0
  56. package/src/parser.ts +180 -149
  57. package/src/prover/isabelle/isar/attrib.ts +4 -4
  58. package/src/prover/isabelle/isar/rule-cases.ts +8 -6
  59. package/src/prover/isabelle/provers/clasimp.ts +1 -1
  60. package/src/prover/isabelle/provers/hypsubst.ts +2 -2
  61. package/src/prover/isabelle/pure/rewriter.ts +3 -3
  62. package/src/prover/isabelle/pure/term.ts +3 -3
  63. package/src/prover/prep/md5.ts +26 -29
  64. package/src/prover/smt/rewrite.ts +2 -7
  65. package/src/prover/smt/simplify.ts +1 -1
  66. package/src/prover/smt/solver/ackermannize-bv-tactic.ts +3 -2
  67. package/src/prover/smt/solver/arith-rewriter.ts +11 -3
  68. package/src/prover/smt/solver/array-rewriter.ts +12 -2
  69. package/src/prover/smt/solver/asserted-formulas.ts +171 -58
  70. package/src/prover/smt/solver/ast-lt.ts +1 -1
  71. package/src/prover/smt/solver/ast.ts +66 -14
  72. package/src/prover/smt/solver/auf-solver.ts +23 -12
  73. package/src/prover/smt/solver/bit-blast-tactic.ts +28 -2
  74. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  75. package/src/prover/smt/solver/bound-simplifier.ts +11 -13
  76. package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
  77. package/src/prover/smt/solver/bv-rewriter.ts +1 -1
  78. package/src/prover/smt/solver/bv1-blast.ts +1 -1
  79. package/src/prover/smt/solver/card2bv.ts +35 -18
  80. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
  81. package/src/prover/smt/solver/context.ts +84 -15
  82. package/src/prover/smt/solver/ctx-simplify.ts +9 -4
  83. package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
  84. package/src/prover/smt/solver/dependent-expr-state.ts +28 -16
  85. package/src/prover/smt/solver/diff-neq.ts +9 -8
  86. package/src/prover/smt/solver/dt2bv-tactic.ts +66 -28
  87. package/src/prover/smt/solver/elim-bounds.ts +89 -0
  88. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  89. package/src/prover/smt/solver/elim-uncnstr.ts +31 -28
  90. package/src/prover/smt/solver/eq2bv-tactic.ts +15 -6
  91. package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
  92. package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
  93. package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
  94. package/src/prover/smt/solver/euf/egraph.ts +4 -11
  95. package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
  96. package/src/prover/smt/solver/euf/mam.ts +1 -5
  97. package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
  98. package/src/prover/smt/solver/euf/th-solver.ts +0 -7
  99. package/src/prover/smt/solver/expr2polynomial.ts +204 -79
  100. package/src/prover/smt/solver/factor.ts +36 -14
  101. package/src/prover/smt/solver/fd-solver.ts +608 -139
  102. package/src/prover/smt/solver/fix-dl-var.ts +2 -3
  103. package/src/prover/smt/solver/fm-tactic.ts +9 -7
  104. package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
  105. package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
  106. package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
  107. package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -1
  108. package/src/prover/smt/solver/goal.ts +6 -3
  109. package/src/prover/smt/solver/goal2nlsat.ts +57 -30
  110. package/src/prover/smt/solver/hashtable.ts +4 -0
  111. package/src/prover/smt/solver/internalizer.ts +1 -1
  112. package/src/prover/smt/solver/lia2pb.ts +1 -1
  113. package/src/prover/smt/solver/logic-tactics.ts +15 -5
  114. package/src/prover/smt/solver/lp/core-solver.ts +12 -8
  115. package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
  116. package/src/prover/smt/solver/lp/lp-settings.ts +6 -2
  117. package/src/prover/smt/solver/lp/nla-core.ts +1 -1
  118. package/src/prover/smt/solver/lp/nla-grobner.ts +158 -80
  119. package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
  120. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -2
  121. package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -20
  122. package/src/prover/smt/solver/lp/pdd-solver.ts +72 -39
  123. package/src/prover/smt/solver/lp/pdd.ts +725 -290
  124. package/src/prover/smt/solver/lp/union-find.ts +1 -1
  125. package/src/prover/smt/solver/mam-compiler.ts +1 -1
  126. package/src/prover/smt/solver/maxcore.ts +2 -1
  127. package/src/prover/smt/solver/maxsmt-base.ts +1 -0
  128. package/src/prover/smt/solver/model-based-opt.ts +1 -1
  129. package/src/prover/smt/solver/model-checker.ts +1 -1
  130. package/src/prover/smt/solver/model-evaluator.ts +2 -0
  131. package/src/prover/smt/solver/model-generator.ts +85 -43
  132. package/src/prover/smt/solver/mpf.ts +2 -4
  133. package/src/prover/smt/solver/mus.ts +2 -3
  134. package/src/prover/smt/solver/muz/dl-context.ts +22 -44
  135. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
  136. package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
  137. package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
  138. package/src/prover/smt/solver/muz/hnf.ts +2 -2
  139. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
  140. package/src/prover/smt/solver/muz/horn-tactic.ts +15 -2
  141. package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
  142. package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
  143. package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
  144. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -1
  145. package/src/prover/smt/solver/nlqsat.ts +2 -1
  146. package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
  147. package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
  148. package/src/prover/smt/solver/nlsat/explain.ts +375 -217
  149. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
  150. package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
  151. package/src/prover/smt/solver/nlsat/solver.ts +74 -64
  152. package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
  153. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
  154. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
  155. package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
  156. package/src/prover/smt/solver/nnf.ts +6 -2
  157. package/src/prover/smt/solver/normalize-bounds.ts +2 -2
  158. package/src/prover/smt/solver/occf.ts +1 -1
  159. package/src/prover/smt/solver/opt-context.ts +21 -7
  160. package/src/prover/smt/solver/opt-nlsat.ts +29 -18
  161. package/src/prover/smt/solver/opt-pareto.ts +19 -0
  162. package/src/prover/smt/solver/opt-preprocess.ts +1 -1
  163. package/src/prover/smt/solver/opt-solver.ts +10 -6
  164. package/src/prover/smt/solver/optsmt.ts +1 -1
  165. package/src/prover/smt/solver/parallel-tactic.ts +1 -1
  166. package/src/prover/smt/solver/pb-rewriter.ts +1 -4
  167. package/src/prover/smt/solver/pb2bv-tactic.ts +9 -3
  168. package/src/prover/smt/solver/poly-rewriter.ts +75 -18
  169. package/src/prover/smt/solver/probes.ts +88 -23
  170. package/src/prover/smt/solver/proto-model.ts +8 -8
  171. package/src/prover/smt/solver/purify-arith.ts +51 -49
  172. package/src/prover/smt/solver/push-app-ite.ts +37 -0
  173. package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
  174. package/src/prover/smt/solver/qe-lite.ts +2 -2
  175. package/src/prover/smt/solver/qe.ts +3 -2
  176. package/src/prover/smt/solver/qsat.ts +23 -8
  177. package/src/prover/smt/solver/quantifier-manager.ts +14 -9
  178. package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
  179. package/src/prover/smt/solver/reduce-args.ts +2 -2
  180. package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
  181. package/src/prover/smt/solver/rewriter.ts +31 -25
  182. package/src/prover/smt/solver/rlimit.ts +7 -3
  183. package/src/prover/smt/solver/sat/config.ts +1 -1
  184. package/src/prover/smt/solver/sat/goal2sat.ts +75 -12
  185. package/src/prover/smt/solver/sat/inc-sat-solver.ts +149 -47
  186. package/src/prover/smt/solver/sat/model-converter.ts +1 -1
  187. package/src/prover/smt/solver/sat/pb-constraint.ts +7 -0
  188. package/src/prover/smt/solver/sat/pb-solver.ts +26 -7
  189. package/src/prover/smt/solver/sat/sat-tactic.ts +54 -25
  190. package/src/prover/smt/solver/sat/sat2goal.ts +75 -50
  191. package/src/prover/smt/solver/sat/simplifier.ts +1 -1
  192. package/src/prover/smt/solver/sat/solver.ts +27 -47
  193. package/src/prover/smt/solver/seq-axioms.ts +20 -35
  194. package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
  195. package/src/prover/smt/solver/seq-derive.ts +2 -2
  196. package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
  197. package/src/prover/smt/solver/seq-monadic.ts +7 -5
  198. package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
  199. package/src/prover/smt/solver/seq-re-util.ts +1 -1
  200. package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
  201. package/src/prover/smt/solver/seq-regex-live.ts +2 -2
  202. package/src/prover/smt/solver/seq-rewriter.ts +31 -29
  203. package/src/prover/smt/solver/seq-skolem.ts +0 -23
  204. package/src/prover/smt/solver/seq-view-witness.ts +4 -4
  205. package/src/prover/smt/solver/smt-consequences.ts +1 -1
  206. package/src/prover/smt/solver/smt-kernel.ts +48 -7
  207. package/src/prover/smt/solver/smt-setup.ts +106 -13
  208. package/src/prover/smt/solver/smtlib-parser.ts +589 -224
  209. package/src/prover/smt/solver/smtlib-script.ts +718 -213
  210. package/src/prover/smt/solver/solve-eqs.ts +36 -37
  211. package/src/prover/smt/solver/solver.ts +18 -4
  212. package/src/prover/smt/solver/tactic.ts +389 -199
  213. package/src/prover/smt/solver/theory-bv.ts +13 -3
  214. package/src/prover/smt/solver/theory-fpa.ts +1 -1
  215. package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
  216. package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
  217. package/src/prover/smt/solver/theory-lra-propagate.ts +12 -3
  218. package/src/prover/smt/solver/theory-lra-state.ts +1 -1
  219. package/src/prover/smt/solver/theory-lra.ts +1 -1
  220. package/src/prover/smt/solver/theory-pb.ts +24 -7
  221. package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
  222. package/src/prover/smt/solver/theory-seq-state.ts +2 -21
  223. package/src/prover/smt/solver/theory-without-terms.ts +24 -0
  224. package/src/prover/smt/solver/tseitin-cnf.ts +15 -5
  225. package/src/prover/tlapm/cache.ts +8 -8
  226. package/src/prover/zenon/index-table.ts +5 -2
  227. package/src/prover/zenon/isar-case.ts +1 -1
  228. package/src/prover/zenon/isar.ts +2 -2
  229. package/src/prover/zenon/phrase.ts +1 -1
  230. package/src/resolve.ts +1311 -268
  231. package/src/runtime.ts +21 -2
  232. package/src/sany/builtins.ts +10 -10
  233. package/src/sany/generation.ts +5 -15
  234. package/src/sany/generator-def-entries.ts +123 -36
  235. package/src/sany/generator-definitions.ts +5 -3
  236. package/src/sany/generator-expressions.ts +60 -37
  237. package/src/sany/generator-proofs.ts +19 -12
  238. package/src/sany/generator.ts +12 -6
  239. package/src/sany/lexer.ts +15 -7
  240. package/src/sany/modules.ts +4 -2
  241. package/src/sany/nodes.ts +1 -1
  242. package/src/sany/selectors.ts +12 -6
  243. package/src/sany/xml.ts +2 -3
  244. package/src/search.ts +321 -135
  245. package/src/simulate.ts +247 -185
  246. package/src/spec-description.ts +15 -7
  247. package/src/standard-definitions.ts +1 -0
  248. package/src/standard-modules.ts +56 -22
  249. package/src/subexpressions.ts +666 -147
  250. package/src/successors.ts +50 -20
  251. package/src/symmetry.ts +2 -1
  252. package/src/tlc/jar-data.ts +10 -0
  253. package/src/tlc/messages.ts +3 -3
  254. package/src/tlc/order.ts +14 -3
  255. package/src/tlc/random.ts +2 -1
  256. package/src/tlc/replay.ts +147 -46
  257. package/src/tlc/tlc-operators.ts +10 -8
  258. package/src/tlc/tlcext-operators.ts +44 -15
  259. package/src/tlc/trace-spec.ts +9 -22
  260. package/src/trace-liveness.ts +529 -0
  261. package/src/typed-tier.ts +52 -31
  262. package/src/typescript/types.ts +2 -2
  263. package/src/values.ts +150 -79
@@ -45,9 +45,11 @@ import {
45
45
  } from "./ast";
46
46
  import { getAckrBound } from "./ackr-helper";
47
47
  import { BoundManager } from "./bound-manager";
48
+ import { Expr2Polynomial } from "./expr2polynomial";
49
+ import { PolynomialManager, PolynomialRef } from "./nlsat/polynomial";
48
50
  import { findNonPb } from "./pb2bv-tactic";
49
51
  import type { Goal } from "./goal";
50
- import { isSymbol, type SExpr, type SmtToken } from "./smtlib-parser";
52
+ import { isSymbol, type SExpr } from "./smtlib-parser";
51
53
 
52
54
  export interface Probe {
53
55
  (goal: Goal): number;
@@ -57,8 +59,7 @@ const forEachExpr = (goal: Goal, visit: (expr: number) => void) => {
57
59
  const manager = goal.manager;
58
60
  const visited = new Set<number>();
59
61
  const todo = [...goal.forms.items].reverse();
60
- while (todo.length > 0) {
61
- const expr = todo.pop() as number;
62
+ for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
62
63
  if (visited.has(expr)) continue;
63
64
  visited.add(expr);
64
65
  visit(expr);
@@ -361,6 +362,65 @@ const hasPatterns: Probe = (goal) => {
361
362
  );
362
363
  };
363
364
 
365
+ const mkArithDegreeProbe =
366
+ (isAverage: boolean): Probe =>
367
+ (goal) => {
368
+ const manager = goal.manager;
369
+ let variableCount = 0;
370
+ const expr2poly = new Expr2Polynomial(
371
+ manager,
372
+ new PolynomialManager(manager.limit),
373
+ new Map(),
374
+ () => variableCount++,
375
+ );
376
+ let maxDegree = 0;
377
+ let accDegree = 0;
378
+ let counter = 0;
379
+ const updateDegree = (polynomial: PolynomialRef) => {
380
+ const degree = expr2poly.pm.totalDegree(polynomial.get());
381
+ if (degree > maxDegree) maxDegree = degree;
382
+ accDegree += degree;
383
+ counter++;
384
+ };
385
+ const process = (expr: number) => {
386
+ const first = new PolynomialRef(expr2poly.pm);
387
+ const second = new PolynomialRef(expr2poly.pm);
388
+ expr2poly.toPolynomial(manager.getArg(expr, 0), first);
389
+ expr2poly.toPolynomial(manager.getArg(expr, 1), second);
390
+ updateDegree(first);
391
+ updateDegree(second);
392
+ second.reset();
393
+ first.reset();
394
+ };
395
+ forEachExpr(goal, (expr) => {
396
+ const op = manager.getOp(expr);
397
+ if (op === OP_LE || op === OP_LT || op === OP_GT || op === OP_GE) process(expr);
398
+ if (op === OP_EQ && isArithSort(manager.sorts[manager.getArg(expr, 0)])) process(expr);
399
+ });
400
+ expr2poly.release();
401
+ return isAverage ? (counter === 0 ? 0 : accDegree / counter) : maxDegree;
402
+ };
403
+
404
+ const getBitsize = (value: bigint) => (value < 0n ? -value : value).toString(2).length;
405
+
406
+ const mkArithBwProbe =
407
+ (isAverage: boolean): Probe =>
408
+ (goal) => {
409
+ const manager = goal.manager;
410
+ let maxBitWidth = 0;
411
+ let accBitWidth = 0;
412
+ let counter = 0;
413
+ forEachExpr(goal, (expr) => {
414
+ if (!manager.isNumeral(expr)) return;
415
+ const value = manager.getRationalValue(expr);
416
+ const bitWidth = getBitsize(value.num) + (value.den === 1n ? 0 : getBitsize(value.den));
417
+ if (bitWidth > maxBitWidth) maxBitWidth = bitWidth;
418
+ accBitWidth += bitWidth;
419
+ counter++;
420
+ });
421
+ return isAverage ? (counter === 0 ? 0 : accBitWidth / counter) : maxBitWidth;
422
+ };
423
+
364
424
  const NAMED_PROBES = new Map<string, Probe>([
365
425
  ["depth", (goal) => goal.depth],
366
426
  ["size", (goal) => goal.forms.size],
@@ -436,11 +496,13 @@ const NAMED_PROBES = new Map<string, Probe>([
436
496
  ),
437
497
  ],
438
498
  ["ackr-bound-probe", getAckrBound],
499
+ ["arith-max-deg", mkArithDegreeProbe(false)],
500
+ ["arith-avg-deg", mkArithDegreeProbe(true)],
501
+ ["arith-max-bw", mkArithBwProbe(false)],
502
+ ["arith-avg-bw", mkArithBwProbe(true)],
439
503
  ]);
440
504
 
441
- const UNPORTED_PROBES = new Set(
442
- "memory arith-max-deg arith-avg-deg arith-max-bw arith-avg-bw".split(" "),
443
- );
505
+ const UNPORTED_PROBES = new Set(["memory"]);
444
506
 
445
507
  const BINARY_PROBES = new Map<string, (first: number, second: number) => number>([
446
508
  ["=", (first, second) => Number(first === second)],
@@ -461,48 +523,51 @@ const NARY_PROBES = new Map<string, (first: number, second: number) => number>([
461
523
  ["*", (first, second) => first * second],
462
524
  ]);
463
525
 
464
- export const compileProbe = (sexpr: SExpr, end: SmtToken, isInternal = false): Probe => {
465
- if (sexpr.kind === "numeral") {
466
- const value = Number(sexpr.text);
467
- if (value > 2 ** 31 - 1)
526
+ export const compileProbe = (sexpr: SExpr, isInternal = false): Probe => {
527
+ // A decimal is a numeral of the s-expression, which is_int32 rejects unless it is whole.
528
+ if (sexpr.kind === "numeral" || sexpr.kind === "decimal") {
529
+ const [whole, fraction = ""] = sexpr.text.split(".");
530
+ const value = Number(whole);
531
+ if (!/^0*$/.test(fraction) || value > 2 ** 31 - 1)
468
532
  throw new SmtParseError(
469
533
  "invalid probe, constant is too big to fit in a fixed size integer",
470
- end,
534
+ sexpr,
471
535
  );
472
536
  return () => value;
473
537
  }
474
538
  if (sexpr.kind !== "list") {
475
- if (!isSymbol(sexpr)) throw new SmtParseError("invalid probe, unexpected input", end);
539
+ if (!isSymbol(sexpr)) throw new SmtParseError("invalid probe, unexpected input", sexpr);
476
540
  const named =
477
541
  NAMED_PROBES.get(sexpr.text) ?? (isInternal ? INTERNAL_PROBES.get(sexpr.text) : undefined);
478
542
  if (named !== undefined) return named;
479
543
  if (UNPORTED_PROBES.has(sexpr.text)) throw new SmtUnsupportedError(`the probe ${sexpr.text}`);
480
- throw new SmtParseError(`invalid probe, unknown builtin probe ${sexpr.text}`, end);
544
+ throw new SmtParseError(`invalid probe, unknown builtin probe ${sexpr.text}`, sexpr);
481
545
  }
482
546
  const head = sexpr.items[0];
483
- if (head === undefined) throw new SmtParseError("invalid probe, arguments expected", end);
484
- if (!isSymbol(head)) throw new SmtParseError("invalid probe, symbol expected", end);
547
+ if (head === undefined) throw new SmtParseError("invalid probe, arguments expected", sexpr.end);
548
+ if (!isSymbol(head)) throw new SmtParseError("invalid probe, symbol expected", sexpr.end);
485
549
  const children = sexpr.items.slice(1);
486
550
  if (head.text === "not") {
487
551
  if (children.length !== 1)
488
- throw new SmtParseError("invalid probe expression, one argument expected", end);
489
- const child = compileProbe(children[0], end, isInternal);
552
+ throw new SmtParseError("invalid probe expression, one argument expected", sexpr.end);
553
+ const child = compileProbe(children[0], isInternal);
490
554
  return (goal) => Number(child(goal) === 0);
491
555
  }
492
556
  const binary = BINARY_PROBES.get(head.text);
493
557
  if (binary !== undefined) {
494
558
  if (children.length !== 2)
495
- throw new SmtParseError("invalid probe expression, two arguments expected", end);
496
- const first = compileProbe(children[0], end, isInternal);
497
- const second = compileProbe(children[1], end, isInternal);
559
+ throw new SmtParseError("invalid probe expression, two arguments expected", sexpr.end);
560
+ const first = compileProbe(children[0], isInternal);
561
+ const second = compileProbe(children[1], isInternal);
498
562
  return (goal) => binary(first(goal), second(goal));
499
563
  }
500
564
  const nary = NARY_PROBES.get(head.text);
501
565
  if (nary === undefined)
502
- throw new SmtParseError(`invalid probe, unknown probe expression ${head.text}`, end);
566
+ throw new SmtParseError(`invalid probe, unknown probe expression ${head.text}`, sexpr.end);
503
567
  if (children.length === 0)
504
- throw new SmtParseError("invalid probe, at least one argument expected", end);
505
- const probes = children.map((child) => compileProbe(child, end, isInternal));
568
+ throw new SmtParseError("invalid probe, at least one argument expected", sexpr.end);
569
+ const probes = children.map((child) => compileProbe(child, isInternal));
570
+ // Deviation from Z3: MK_NARY_PROBE applies the operator to its first argument twice.
506
571
  return (goal) => probes.map((probe) => probe(goal)).reduce(nary);
507
572
  };
508
573
 
@@ -28,7 +28,7 @@ import {
28
28
  } from "./datatype-decl-plugin";
29
29
  import { mkArrayApp, mkAsArray } from "./array-decl-plugin";
30
30
  import { mkFpNumeral, mkRmNumeral } from "./fpa-decl-plugin";
31
- import { MPF_ROUND_TOWARD_ZERO, mkZero } from "./mpf";
31
+ import { MPF_ROUND_TOWARD_ZERO, mkNan, mkZero } from "./mpf";
32
32
  import { RandomGen } from "./random-gen";
33
33
  import { mkEmptySeq, mkSeqApp } from "./seq-decl-plugin";
34
34
  import { Rational } from "./rational";
@@ -45,7 +45,7 @@ export const getManagerSomeValue = (manager: AstManager, sort: number): number =
45
45
  if (sort === SORT_BOOL) return manager.falseExpr;
46
46
  if (manager.isRmSort(sort)) return mkRmNumeral(manager, MPF_ROUND_TOWARD_ZERO);
47
47
  if (manager.isFpSort(sort))
48
- return mkFpNumeral(manager, mkZero(manager.getEbits(sort), manager.getSbits(sort), false));
48
+ return mkFpNumeral(manager, mkNan(manager.getEbits(sort), manager.getSbits(sort)));
49
49
  if (isArithSort(sort)) return manager.mkNumeralOfSort(Rational.zero, sort);
50
50
  if (manager.isBvSort(sort)) return manager.mkBvNumeral(0n, manager.getBvSize(sort));
51
51
  if (manager.isArraySort(sort))
@@ -267,7 +267,7 @@ export class FuncInterp {
267
267
  const lambda = manager.mkQuantifier({
268
268
  kind: QUANTIFIER_LAMBDA,
269
269
  sorts: [...domain],
270
- names: domain.map((_, index) => index),
270
+ names: domain.map((_value, index) => index),
271
271
  body,
272
272
  patterns: [],
273
273
  noPatterns: [],
@@ -518,6 +518,8 @@ export class ProtoModel {
518
518
  const manager = this.manager;
519
519
  if (this.charFactory !== undefined && manager.isCharSort(sort))
520
520
  return manager.mkChar(this.charFactory.getSomeValue());
521
+ if (manager.isFpSort(sort) && !this.isFinal)
522
+ return mkFpNumeral(manager, mkZero(manager.getEbits(sort), manager.getSbits(sort), false));
521
523
  if (
522
524
  manager.isFpSort(sort) ||
523
525
  manager.isRmSort(sort) ||
@@ -753,7 +755,7 @@ export class ProtoModel {
753
755
  ]);
754
756
  }
755
757
  for (const [decl, value] of this.constInterps)
756
- if (!manager.recFunDefs.has(decl)) collectDeps(decl, [value]);
758
+ if (!manager.recFunDefs.has(decl) && !manager.macros.has(decl)) collectDeps(decl, [value]);
757
759
  sort.sort();
758
760
  const rewriter = new Rewriter(manager, TACTIC_REWRITER_OPTIONS);
759
761
  for (const decl of sort.sorted) {
@@ -1037,10 +1039,8 @@ export class ProtoModel {
1037
1039
  copy() {
1038
1040
  const model = new ProtoModel(this.manager);
1039
1041
  model.isFinal = this.isFinal;
1040
- for (const decl of this.constDecls)
1041
- model.registerConst(decl, this.constInterps.get(decl) as number);
1042
- for (const decl of this.funcDecls)
1043
- model.registerFunc(decl, (this.funcInterps.get(decl) as FuncInterp).copy());
1042
+ for (const entry of this.constInterps) model.registerConst(entry[0], entry[1]);
1043
+ for (const entry of this.funcInterps) model.registerFunc(entry[0], entry[1].copy());
1044
1044
  for (const sort of this.getUninterpretedSorts())
1045
1045
  for (const value of this.getKnownUniverse(sort)) model.registerValue(value);
1046
1046
  for (const entry of this.universes) model.registerUsort(entry[0], entry[1].items);
@@ -570,7 +570,7 @@ export const purifyArith = (manager: AstManager, goal: Goal, options: PurifyOpti
570
570
  const pin = (expr: number) => state.pin(expr);
571
571
  for (let index = 0; !goal.isInconsistent && index < goal.forms.size; index++) {
572
572
  const rewritten = rewriter.engine.rewrite(goal.forms.items[index]);
573
- goal.update(index, rewritten);
573
+ goal.update(index, rewritten, goal.getDependency(index));
574
574
  manager.decRef(rewritten);
575
575
  }
576
576
  rewriter.release();
@@ -578,54 +578,56 @@ export const purifyArith = (manager: AstManager, goal: Goal, options: PurifyOpti
578
578
  mkCongruence(state, state.divs, goal);
579
579
  mkCongruence(state, state.mods, goal);
580
580
  mkCongruence(state, state.idivs, goal);
581
- const definitions: Definition[] = [...state.appToFresh.entries()].map((entry) => ({
582
- decl: manager.decls[entry[1]],
583
- def: -1,
584
- }));
585
- if (state.divs.length > 0)
586
- definitions.push({ decl: OP_DIV0, def: mkTable(state, state.divs, SORT_REAL) });
587
- if (state.mods.length > 0) {
588
- const body = mkTable(state, state.mods, SORT_INT);
589
- definitions.push({ decl: OP_MOD0, def: body });
590
- const isNonneg = pin(
591
- manager.mkApp(
592
- OP_GE,
593
- [pin(manager.mkVar(1, SORT_INT)), pin(manager.mkNumeralOfSort(Rational.zero, SORT_INT))],
594
- SORT_BOOL,
595
- ),
596
- );
597
- const negated = pin(manager.mkApp(OP_UMINUS, [body], SORT_INT));
598
- definitions.push({
599
- decl: OP_MOD0,
600
- def: pin(manager.mkApp(OP_ITE, [isNonneg, body, negated], SORT_INT)),
601
- });
602
- }
603
- if (state.idivs.length > 0)
604
- definitions.push({ decl: OP_IDIV0, def: mkTable(state, state.idivs, SORT_INT) });
605
- if (state.ipower0 !== -1) definitions.push({ decl: OP_POWER0, def: state.ipower0 });
606
- if (state.rpower0 !== -1) definitions.push({ decl: OP_POWER0, def: state.rpower0 });
607
- goal.addDefinitions(definitions);
608
- if (state.sinCos.size > 0) {
609
- const zero = pin(manager.mkRealNumeral(Rational.zero));
610
- goal.addDefinitions(
611
- [...state.sinCos.entries()].map((entry) => {
612
- const [sin, cos] = entry[1];
613
- const isNonneg = pin(manager.mkApp(OP_GE, [sin, zero], SORT_BOOL));
614
- const acos = pin(manager.mkApp(OP_ACOS, [cos], SORT_REAL));
615
- const negated = pin(manager.mkApp(OP_UMINUS, [cos], SORT_REAL));
616
- const shifted = pin(
617
- manager.mkApp(
618
- OP_ADD,
619
- [pin(manager.mkApp(OP_ACOS, [negated], SORT_REAL)), manager.piExpr],
620
- SORT_REAL,
621
- ),
622
- );
623
- return {
624
- decl: manager.decls[entry[0]],
625
- def: pin(manager.mkApp(OP_ITE, [isNonneg, acos, shifted], SORT_REAL)),
626
- };
627
- }),
628
- );
581
+ if (goal.isModelsEnabled) {
582
+ const definitions: Definition[] = [...state.appToFresh.entries()].map((entry) => ({
583
+ decl: manager.decls[entry[1]],
584
+ def: -1,
585
+ }));
586
+ if (state.divs.length > 0)
587
+ definitions.push({ decl: OP_DIV0, def: mkTable(state, state.divs, SORT_REAL) });
588
+ if (state.mods.length > 0) {
589
+ const body = mkTable(state, state.mods, SORT_INT);
590
+ definitions.push({ decl: OP_MOD0, def: body });
591
+ const isNonneg = pin(
592
+ manager.mkApp(
593
+ OP_GE,
594
+ [pin(manager.mkVar(1, SORT_INT)), pin(manager.mkNumeralOfSort(Rational.zero, SORT_INT))],
595
+ SORT_BOOL,
596
+ ),
597
+ );
598
+ const negated = pin(manager.mkApp(OP_UMINUS, [body], SORT_INT));
599
+ definitions.push({
600
+ decl: OP_MOD0,
601
+ def: pin(manager.mkApp(OP_ITE, [isNonneg, body, negated], SORT_INT)),
602
+ });
603
+ }
604
+ if (state.idivs.length > 0)
605
+ definitions.push({ decl: OP_IDIV0, def: mkTable(state, state.idivs, SORT_INT) });
606
+ if (state.ipower0 !== -1) definitions.push({ decl: OP_POWER0, def: state.ipower0 });
607
+ if (state.rpower0 !== -1) definitions.push({ decl: OP_POWER0, def: state.rpower0 });
608
+ goal.addDefinitions(definitions);
609
+ if (state.sinCos.size > 0) {
610
+ const zero = pin(manager.mkRealNumeral(Rational.zero));
611
+ goal.addDefinitions(
612
+ [...state.sinCos.entries()].map((entry) => {
613
+ const [sin, cos] = entry[1];
614
+ const isNonneg = pin(manager.mkApp(OP_GE, [sin, zero], SORT_BOOL));
615
+ const acos = pin(manager.mkApp(OP_ACOS, [cos], SORT_REAL));
616
+ const negated = pin(manager.mkApp(OP_UMINUS, [cos], SORT_REAL));
617
+ const shifted = pin(
618
+ manager.mkApp(
619
+ OP_ADD,
620
+ [pin(manager.mkApp(OP_ACOS, [negated], SORT_REAL)), manager.piExpr],
621
+ SORT_REAL,
622
+ ),
623
+ );
624
+ return {
625
+ decl: manager.decls[entry[0]],
626
+ def: pin(manager.mkApp(OP_ITE, [isNonneg, acos, shifted], SORT_REAL)),
627
+ };
628
+ }),
629
+ );
630
+ }
629
631
  }
630
632
  goal.depth++;
631
633
  state.pinned.reset();
@@ -0,0 +1,37 @@
1
+ import { OP_ITE, SORT_BOOL } from "./ast";
2
+ import { RewriterTpl } from "./rewriter-tpl";
3
+
4
+ export class NgPushAppIteRw extends RewriterTpl {
5
+ isRewritingPatterns() {
6
+ return false;
7
+ }
8
+
9
+ private isTarget(decl: number, args: number[]) {
10
+ const manager = this.manager;
11
+ if (decl === OP_ITE) return false;
12
+ let hasTermIte = false;
13
+ for (let index = 0; index < args.length; index++)
14
+ if (manager.getOp(args[index]) === OP_ITE && manager.sorts[args[index]] !== SORT_BOOL) {
15
+ if (hasTermIte) return false;
16
+ hasTermIte = true;
17
+ }
18
+ if (!hasTermIte) return false;
19
+ for (let index = 0; index < args.length; index++)
20
+ if (!manager.isGroundApp(args[index])) return true;
21
+ return false;
22
+ }
23
+
24
+ reduceApp(decl: number, args: number[], sort: number) {
25
+ const manager = this.manager;
26
+ if (!this.isTarget(decl, args)) return -1;
27
+ let index = 0;
28
+ while (manager.getOp(args[index]) !== OP_ITE) index++;
29
+ const ite = args[index];
30
+ const expr = manager.withTemporaries(() => {
31
+ const thenApp = manager.mkApp(decl, args.with(index, manager.getArg(ite, 1)), sort);
32
+ const elseApp = manager.mkApp(decl, args.with(index, manager.getArg(ite, 2)), sort);
33
+ return manager.mkApp(OP_ITE, [manager.getArg(ite, 0), thenApp, elseApp], sort);
34
+ });
35
+ return { expr, depth: 2 };
36
+ }
37
+ }
@@ -175,8 +175,7 @@ class ArithQeUtil {
175
175
  const restList: number[] = [];
176
176
  const todo = [p];
177
177
  let k: Rational | undefined;
178
- while (todo.length > 0) {
179
- const expr = todo.pop() as number;
178
+ for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
180
179
  if (isAppOf(manager, expr, OP_ADD)) {
181
180
  todo.push(...manager.getArgs(expr));
182
181
  continue;
@@ -560,8 +559,7 @@ class ArithQeUtil {
560
559
  return true;
561
560
  };
562
561
  const todo = [p];
563
- while (todo.length > 0) {
564
- const expr = todo.pop() as number;
562
+ for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
565
563
  if (isAppOf(manager, expr, OP_ADD)) {
566
564
  todo.push(...manager.getArgs(expr));
567
565
  continue;
@@ -16,6 +16,7 @@ import {
16
16
  QUANTIFIER_LAMBDA,
17
17
  } from "./ast";
18
18
  import { flattenAndVector, flattenOrVector, pushNotOwned } from "./ast-util";
19
+ import { finishSimplifier } from "./dependent-expr-state";
19
20
  import { isOccurring } from "./der";
20
21
  import { ExprSafeReplace } from "./expr-safe-replace";
21
22
  import type { Goal } from "./goal";
@@ -364,8 +365,7 @@ export const applyQeLite = (manager: AstManager, goal: Goal) => {
364
365
  }
365
366
  release(manager, formula);
366
367
  }
367
- goal.elimTrue();
368
- goal.elimRedundancies();
368
+ finishSimplifier(goal);
369
369
  qe.release();
370
370
  release(manager, dep);
371
371
  };
@@ -316,7 +316,8 @@ class SearchTree {
316
316
  }
317
317
 
318
318
  consumeVars(vars: number[]) {
319
- while (vars.length > 0) this.vars.push(vars.pop() as number);
319
+ for (let variable = vars.pop(); variable !== undefined; variable = vars.pop())
320
+ this.vars.push(variable);
320
321
  }
321
322
 
322
323
  isUnit() {
@@ -445,7 +446,7 @@ const partitionVars = (contains: readonly ContainsApp[], args: readonly number[]
445
446
  }
446
447
  if (nonSharedVars.length === 0) return undefined;
447
448
  const root0 = find(0);
448
- if (!nonSharedVars.some((_, index) => index > 0 && find(index) !== root0)) return undefined;
449
+ if (!nonSharedVars.some((_value, index) => index > 0 && find(index) !== root0)) return undefined;
449
450
  const roots: number[] = partition.length > 0 ? [-1] : [];
450
451
  for (const [index, x] of nonSharedVars.entries()) {
451
452
  const root = nonSharedVars[find(index)];
@@ -1,4 +1,9 @@
1
- import { SmtInvariantError, SmtTacticError, SmtUnsupportedError } from "../../../errors";
1
+ import {
2
+ SmtDefaultError,
3
+ SmtInvariantError,
4
+ SmtTacticError,
5
+ SmtUnsupportedError,
6
+ } from "../../../errors";
2
7
  import {
3
8
  type AstManager,
4
9
  FAMILY_BASIC,
@@ -22,6 +27,7 @@ import { QuantifierHoister } from "./quant-hoist";
22
27
  import { hasSubterm } from "./recfun-decl-plugin";
23
28
  import { RefVector } from "./ref-vector";
24
29
  import { SmtKernel } from "./smt-kernel";
30
+ import type { TacticEnvironment } from "./tactic";
25
31
 
26
32
  export const NO_LEVEL = -1;
27
33
 
@@ -314,7 +320,10 @@ class Kernel {
314
320
  private lastAssert = -1;
315
321
  private trail: RefVector;
316
322
 
317
- constructor(private manager: AstManager) {
323
+ constructor(
324
+ private manager: AstManager,
325
+ private isCoreMinimizing: boolean,
326
+ ) {
318
327
  this.trail = new RefVector(manager);
319
328
  }
320
329
 
@@ -324,6 +333,7 @@ class Kernel {
324
333
  mbqiMaxIterations: MBQI_MAX_ITERATIONS,
325
334
  isFindingMacros: false,
326
335
  relevancyLevel: 0,
336
+ isCoreMinimizing: this.isCoreMinimizing,
327
337
  });
328
338
  this.lastAssert = -1;
329
339
  this.trail.reset();
@@ -351,7 +361,7 @@ class Kernel {
351
361
 
352
362
  getCore(core: RefVector) {
353
363
  core.reset();
354
- for (const expr of this.solver.context.unsatCore) core.push(expr);
364
+ this.solver.getUnsatCore(core);
355
365
  }
356
366
 
357
367
  reasonUnknown() {
@@ -383,10 +393,11 @@ class Qsat {
383
393
  constructor(
384
394
  private manager: AstManager,
385
395
  private mode: number,
396
+ isCoreMinimizing: boolean,
386
397
  ) {
387
398
  this.mbp = new Mbproj(manager);
388
- this.fa = new Kernel(manager);
389
- this.ex = new Kernel(manager);
399
+ this.fa = new Kernel(manager, isCoreMinimizing);
400
+ this.ex = new Kernel(manager, isCoreMinimizing);
390
401
  this.predAbs = new PredAbs(manager);
391
402
  this.answer = new RefVector(manager);
392
403
  this.asms = new RefVector(manager);
@@ -536,7 +547,7 @@ class Qsat {
536
547
  for (const innerVar of vars.items) this.predAbs.hidden.push(manager.decls[innerVar]);
537
548
  for (const innerVar of vars.items)
538
549
  if (manager.isUninterpretedSort(manager.sorts[innerVar]))
539
- throw new SmtTacticError("qsat does not apply to uninterpreted sorts");
550
+ throw new SmtDefaultError("qsat does not apply to uninterpreted sorts");
540
551
  }
541
552
 
542
553
  private initializeLevels() {
@@ -804,8 +815,12 @@ class Qsat {
804
815
  }
805
816
  }
806
817
 
807
- export const runQsat = (manager: AstManager, mode: number) => (goal: Goal) => {
808
- const qsat = new Qsat(manager, mode);
818
+ export const runQsat = (environment: TacticEnvironment, mode: number) => (goal: Goal) => {
819
+ const qsat = new Qsat(
820
+ environment.manager,
821
+ mode,
822
+ environment.parameters.get("smt.core.minimize") === "true",
823
+ );
809
824
  try {
810
825
  return qsat.apply(goal);
811
826
  } finally {
@@ -25,17 +25,21 @@ export class DefaultQuantifierManager {
25
25
  private lazyMatchingIndex = 0;
26
26
  private mbqi: Mbqi | null = null;
27
27
 
28
- constructor(
29
- private context: Context,
30
- isMbqi: boolean,
31
- ) {
28
+ constructor(private context: Context) {
32
29
  this.qiQueue = new QiQueue(context);
33
30
  const onMatch = (quantifier: number, bindings: Enode[], maxGeneration: number) =>
34
31
  this.addInstance(quantifier, bindings, maxGeneration);
35
32
  this.mam = new Mam(context, onMatch);
36
33
  this.lazyMam = new Mam(context, onMatch);
37
- if (!isMbqi) return;
34
+ this.updateParams();
35
+ }
36
+
37
+ // As in Z3, smt.mbqi is read each time the model finder would run.
38
+ updateParams() {
39
+ const context = this.context;
40
+ if (!context.params.isMbqi || this.mbqi !== null) return;
38
41
  const finder = new ModelFinder(context);
42
+ for (let level = 0; level < context.scopeLevel; level++) finder.pushScope();
39
43
  this.mbqi = { finder, checker: new ModelChecker(context, finder, this) };
40
44
  }
41
45
 
@@ -46,7 +50,7 @@ export class DefaultQuantifierManager {
46
50
  add(quantifier: number, generation: number) {
47
51
  this.quantifiers.push(quantifier);
48
52
  this.generations.set(quantifier, generation);
49
- this.mbqi?.finder.registerQuantifier(quantifier);
53
+ if (this.context.params.isMbqi) this.mbqi?.finder.registerQuantifier(quantifier);
50
54
  }
51
55
 
52
56
  del(quantifier: number) {
@@ -149,20 +153,21 @@ export class DefaultQuantifierManager {
149
153
  }
150
154
 
151
155
  restartEh() {
156
+ if (!this.context.params.isMbqi) return;
152
157
  this.mbqi?.finder.restartEh();
153
158
  this.mbqi?.checker.restartEh();
154
159
  }
155
160
 
156
161
  isModelBased() {
157
- return this.mbqi !== null;
162
+ return this.context.params.isMbqi;
158
163
  }
159
164
 
160
165
  adjustModel(model: ProtoModel) {
161
- this.mbqi?.finder.fixModel(model);
166
+ if (this.context.params.isMbqi) this.mbqi?.finder.fixModel(model);
162
167
  }
163
168
 
164
169
  checkModel(model: ProtoModel, root2value: Map<Enode, number>) {
165
- const checker = this.mbqi?.checker;
170
+ const checker = this.context.params.isMbqi ? this.mbqi?.checker : undefined;
166
171
  if (this.quantifiers.length === 0) return CHECK_MODEL_SAT;
167
172
  if (checker === undefined) return CHECK_MODEL_UNKNOWN;
168
173
  if (checker.check(model, root2value)) return CHECK_MODEL_SAT;
@@ -149,10 +149,11 @@ const computeCases = (manager: AstManager, def: RecFunDef, isMacro: boolean, rhs
149
149
  }
150
150
  if (branch.toSplit !== null) {
151
151
  const ite = branch.toSplit.expr;
152
+ const toSplit = branch.toSplit.next;
152
153
  const condition = manager.getArg(ite, 0);
153
154
  const mkBranch = (isPositive: boolean): Branch => ({
154
155
  path: { ite, isPositive, next: branch.path },
155
- toSplit: branch.toSplit!.next,
156
+ toSplit,
156
157
  toUnfold: {
157
158
  expr: condition,
158
159
  next: { expr: manager.getArg(ite, isPositive ? 1 : 2), next: branch.toUnfold },
@@ -207,8 +207,8 @@ const reduce = (manager: AstManager, goal: Goal) => {
207
207
  goal.update(index, rewritten);
208
208
  manager.decRef(rewritten);
209
209
  }
210
- const definitions = getDefinitions(manager, declToArgs, rewriter.declToArgFuncs);
211
- goal.addDefinitions(definitions);
210
+ if (goal.isModelsEnabled)
211
+ goal.addDefinitions(getDefinitions(manager, declToArgs, rewriter.declToArgFuncs));
212
212
  rewriter.release();
213
213
  for (const argFuncs of rewriter.declToArgFuncs.entries())
214
214
  for (const [app, newDecl] of argFuncs[1].funcs.entries()) {
@@ -121,13 +121,14 @@ class RewriterCore {
121
121
  this.scopes = [];
122
122
  }
123
123
 
124
- protected releaseCaches() {
124
+ protected releaseCore() {
125
125
  for (const cache of this.caches) cache.reset();
126
+ this.numFrames = 0;
127
+ this.shrinkResults(0);
126
128
  }
127
129
 
128
130
  protected cleanupCore() {
129
- this.releaseCaches();
130
- this.shrinkResults(0);
131
+ this.releaseCore();
131
132
  this.caches = [new ActCache(this.manager, this.manager.getNumAsts())];
132
133
  this.frames = [];
133
134
  this.numFrames = 0;
@@ -247,7 +248,7 @@ abstract class VarShifterCore extends RewriterCore {
247
248
  }
248
249
 
249
250
  release() {
250
- this.releaseCaches();
251
+ this.releaseCore();
251
252
  }
252
253
  }
253
254
 
@@ -389,7 +390,7 @@ class RewriterEngine extends SubstCore {
389
390
  this.setLastResult(-1);
390
391
  this.invShifter.release();
391
392
  this.shifter.release();
392
- this.releaseCaches();
393
+ this.releaseCore();
393
394
  }
394
395
 
395
396
  rewrite(expr: number): number {
@@ -859,7 +860,7 @@ export class BetaReducer extends SubstCore {
859
860
  release() {
860
861
  this.setLastResult(-1);
861
862
  this.shifter.release();
862
- this.releaseCaches();
863
+ this.releaseCore();
863
864
  }
864
865
 
865
866
  rewrite(expr: number): number {