tla-ts 0.0.10-dev.3a85c3a9e → 0.0.10-dev.45c0eaef5

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 (260) 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 +79 -79
  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 -107
  29. package/src/check.ts +535 -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 +21 -7
  33. package/src/cli/tlc.ts +31 -11
  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 +131 -41
  40. package/src/errors.ts +7 -0
  41. package/src/evaluate.ts +424 -135
  42. package/src/exit-codes.ts +28 -13
  43. package/src/instances.ts +135 -11
  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 +204 -62
  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/arith-rewriter.ts +11 -3
  67. package/src/prover/smt/solver/array-rewriter.ts +12 -2
  68. package/src/prover/smt/solver/asserted-formulas.ts +171 -58
  69. package/src/prover/smt/solver/ast-lt.ts +1 -1
  70. package/src/prover/smt/solver/ast.ts +66 -14
  71. package/src/prover/smt/solver/auf-solver.ts +23 -12
  72. package/src/prover/smt/solver/bit-blast-tactic.ts +27 -1
  73. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  74. package/src/prover/smt/solver/bound-simplifier.ts +11 -13
  75. package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
  76. package/src/prover/smt/solver/bv-rewriter.ts +1 -1
  77. package/src/prover/smt/solver/card2bv.ts +35 -18
  78. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
  79. package/src/prover/smt/solver/context.ts +84 -15
  80. package/src/prover/smt/solver/ctx-simplify.ts +1 -2
  81. package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
  82. package/src/prover/smt/solver/dependent-expr-state.ts +28 -16
  83. package/src/prover/smt/solver/diff-neq.ts +1 -2
  84. package/src/prover/smt/solver/dt2bv-tactic.ts +57 -21
  85. package/src/prover/smt/solver/elim-bounds.ts +89 -0
  86. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  87. package/src/prover/smt/solver/elim-uncnstr.ts +5 -8
  88. package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
  89. package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
  90. package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
  91. package/src/prover/smt/solver/euf/egraph.ts +4 -10
  92. package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
  93. package/src/prover/smt/solver/euf/mam.ts +1 -5
  94. package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
  95. package/src/prover/smt/solver/euf/th-solver.ts +0 -7
  96. package/src/prover/smt/solver/expr2polynomial.ts +204 -79
  97. package/src/prover/smt/solver/factor.ts +36 -14
  98. package/src/prover/smt/solver/fd-solver.ts +608 -139
  99. package/src/prover/smt/solver/fix-dl-var.ts +1 -2
  100. package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
  101. package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
  102. package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
  103. package/src/prover/smt/solver/goal.ts +6 -3
  104. package/src/prover/smt/solver/goal2nlsat.ts +57 -30
  105. package/src/prover/smt/solver/hashtable.ts +4 -0
  106. package/src/prover/smt/solver/internalizer.ts +1 -1
  107. package/src/prover/smt/solver/logic-tactics.ts +15 -5
  108. package/src/prover/smt/solver/lp/containers.ts +7 -1
  109. package/src/prover/smt/solver/lp/core-solver.ts +12 -8
  110. package/src/prover/smt/solver/lp/cross-nested.ts +1 -3
  111. package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
  112. package/src/prover/smt/solver/lp/lp-settings.ts +6 -2
  113. package/src/prover/smt/solver/lp/nex-creator.ts +3 -2
  114. package/src/prover/smt/solver/lp/nex.ts +2 -1
  115. package/src/prover/smt/solver/lp/nla-basics.ts +46 -1
  116. package/src/prover/smt/solver/lp/nla-core.ts +26 -6
  117. package/src/prover/smt/solver/lp/nla-grobner.ts +158 -81
  118. package/src/prover/smt/solver/lp/nra-solver.ts +138 -95
  119. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -2
  120. package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -20
  121. package/src/prover/smt/solver/lp/pdd-solver.ts +72 -39
  122. package/src/prover/smt/solver/lp/pdd.ts +725 -290
  123. package/src/prover/smt/solver/lp/union-find.ts +1 -1
  124. package/src/prover/smt/solver/mam-compiler.ts +1 -1
  125. package/src/prover/smt/solver/maxcore.ts +2 -1
  126. package/src/prover/smt/solver/maxsmt-base.ts +1 -0
  127. package/src/prover/smt/solver/model-based-opt.ts +1 -1
  128. package/src/prover/smt/solver/model-checker.ts +1 -1
  129. package/src/prover/smt/solver/model-evaluator.ts +2 -0
  130. package/src/prover/smt/solver/model-generator.ts +85 -43
  131. package/src/prover/smt/solver/mpf.ts +2 -4
  132. package/src/prover/smt/solver/mus.ts +2 -3
  133. package/src/prover/smt/solver/muz/dl-context.ts +22 -44
  134. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
  135. package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
  136. package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
  137. package/src/prover/smt/solver/muz/hnf.ts +2 -2
  138. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
  139. package/src/prover/smt/solver/muz/horn-tactic.ts +15 -2
  140. package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
  141. package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
  142. package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
  143. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -1
  144. package/src/prover/smt/solver/nlqsat.ts +1 -1
  145. package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
  146. package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
  147. package/src/prover/smt/solver/nlsat/explain.ts +375 -217
  148. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
  149. package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
  150. package/src/prover/smt/solver/nlsat/solver.ts +74 -71
  151. package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
  152. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
  153. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
  154. package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
  155. package/src/prover/smt/solver/nnf.ts +6 -2
  156. package/src/prover/smt/solver/opt-context.ts +21 -7
  157. package/src/prover/smt/solver/opt-nlsat.ts +29 -18
  158. package/src/prover/smt/solver/opt-pareto.ts +19 -0
  159. package/src/prover/smt/solver/opt-preprocess.ts +1 -1
  160. package/src/prover/smt/solver/opt-solver.ts +10 -6
  161. package/src/prover/smt/solver/optsmt.ts +1 -1
  162. package/src/prover/smt/solver/parallel-tactic.ts +1 -1
  163. package/src/prover/smt/solver/pb-rewriter.ts +1 -4
  164. package/src/prover/smt/solver/poly-rewriter.ts +75 -18
  165. package/src/prover/smt/solver/probes.ts +88 -23
  166. package/src/prover/smt/solver/proto-model.ts +8 -8
  167. package/src/prover/smt/solver/push-app-ite.ts +37 -0
  168. package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
  169. package/src/prover/smt/solver/qe-lite.ts +2 -2
  170. package/src/prover/smt/solver/qe.ts +3 -2
  171. package/src/prover/smt/solver/qsat.ts +23 -8
  172. package/src/prover/smt/solver/quantifier-manager.ts +14 -9
  173. package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
  174. package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
  175. package/src/prover/smt/solver/rewriter.ts +31 -25
  176. package/src/prover/smt/solver/rlimit.ts +20 -3
  177. package/src/prover/smt/solver/sat/config.ts +1 -1
  178. package/src/prover/smt/solver/sat/goal2sat.ts +65 -12
  179. package/src/prover/smt/solver/sat/inc-sat-solver.ts +129 -43
  180. package/src/prover/smt/solver/sat/model-converter.ts +1 -1
  181. package/src/prover/smt/solver/sat/pb-constraint.ts +7 -0
  182. package/src/prover/smt/solver/sat/pb-solver.ts +26 -7
  183. package/src/prover/smt/solver/sat/sat-tactic.ts +17 -7
  184. package/src/prover/smt/solver/sat/sat2goal.ts +72 -48
  185. package/src/prover/smt/solver/sat/simplifier.ts +1 -1
  186. package/src/prover/smt/solver/sat/solver.ts +27 -47
  187. package/src/prover/smt/solver/seq-axioms.ts +20 -35
  188. package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
  189. package/src/prover/smt/solver/seq-derive.ts +4 -7
  190. package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
  191. package/src/prover/smt/solver/seq-monadic.ts +7 -5
  192. package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
  193. package/src/prover/smt/solver/seq-re-util.ts +1 -1
  194. package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
  195. package/src/prover/smt/solver/seq-regex-live.ts +2 -2
  196. package/src/prover/smt/solver/seq-rewriter.ts +31 -29
  197. package/src/prover/smt/solver/seq-skolem.ts +0 -23
  198. package/src/prover/smt/solver/seq-view-witness.ts +4 -4
  199. package/src/prover/smt/solver/smt-consequences.ts +1 -1
  200. package/src/prover/smt/solver/smt-kernel.ts +48 -7
  201. package/src/prover/smt/solver/smt-setup.ts +106 -13
  202. package/src/prover/smt/solver/smtlib-parser.ts +589 -224
  203. package/src/prover/smt/solver/smtlib-script.ts +713 -210
  204. package/src/prover/smt/solver/solve-eqs.ts +36 -37
  205. package/src/prover/smt/solver/solver.ts +18 -3
  206. package/src/prover/smt/solver/tactic.ts +350 -195
  207. package/src/prover/smt/solver/theory-bv.ts +13 -3
  208. package/src/prover/smt/solver/theory-fpa.ts +1 -1
  209. package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
  210. package/src/prover/smt/solver/theory-lra-internalize.ts +10 -0
  211. package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
  212. package/src/prover/smt/solver/theory-lra-state.ts +1 -1
  213. package/src/prover/smt/solver/theory-lra.ts +1 -1
  214. package/src/prover/smt/solver/theory-pb.ts +24 -7
  215. package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
  216. package/src/prover/smt/solver/theory-seq-state.ts +2 -21
  217. package/src/prover/smt/solver/theory-without-terms.ts +24 -0
  218. package/src/prover/smt/solver/tseitin-cnf.ts +1 -0
  219. package/src/prover/tlapm/cache.ts +8 -8
  220. package/src/prover/zenon/equality-rules.ts +24 -0
  221. package/src/prover/zenon/expr.ts +21 -0
  222. package/src/prover/zenon/index-table.ts +7 -2
  223. package/src/prover/zenon/isar-case.ts +1 -1
  224. package/src/prover/zenon/isar.ts +2 -2
  225. package/src/prover/zenon/phrase.ts +1 -1
  226. package/src/prover/zenon/rules.ts +2 -1
  227. package/src/resolve.ts +1274 -258
  228. package/src/runtime.ts +25 -2
  229. package/src/sany/builtins.ts +10 -10
  230. package/src/sany/generation.ts +5 -15
  231. package/src/sany/generator-def-entries.ts +123 -36
  232. package/src/sany/generator-definitions.ts +5 -3
  233. package/src/sany/generator-expressions.ts +60 -37
  234. package/src/sany/generator-proofs.ts +18 -12
  235. package/src/sany/generator.ts +12 -6
  236. package/src/sany/lexer.ts +15 -7
  237. package/src/sany/modules.ts +4 -2
  238. package/src/sany/nodes.ts +1 -1
  239. package/src/sany/selectors.ts +11 -6
  240. package/src/sany/xml.ts +2 -3
  241. package/src/search.ts +348 -153
  242. package/src/simulate.ts +250 -185
  243. package/src/spec-description.ts +15 -7
  244. package/src/standard-definitions.ts +5 -0
  245. package/src/standard-modules.ts +56 -22
  246. package/src/subexpressions.ts +564 -138
  247. package/src/successors.ts +50 -20
  248. package/src/symmetry.ts +2 -1
  249. package/src/tlc/jar-data.ts +10 -0
  250. package/src/tlc/messages.ts +3 -3
  251. package/src/tlc/order.ts +14 -3
  252. package/src/tlc/random.ts +2 -1
  253. package/src/tlc/replay.ts +147 -46
  254. package/src/tlc/tlc-operators.ts +10 -8
  255. package/src/tlc/tlcext-operators.ts +87 -26
  256. package/src/tlc/trace-spec.ts +11 -25
  257. package/src/trace-liveness.ts +529 -0
  258. package/src/typed-tier.ts +52 -31
  259. package/src/typescript/types.ts +2 -2
  260. package/src/values.ts +150 -79
@@ -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);
@@ -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 },
@@ -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 {
@@ -92,6 +92,7 @@ export interface RewriterOptions {
92
92
  readonly localCtxLimit?: number;
93
93
  readonly isCoalescingChars?: boolean;
94
94
  readonly isSortingStore?: boolean;
95
+ readonly isExpandingSelects?: boolean;
95
96
  }
96
97
 
97
98
  export const KERNEL_REWRITER_OPTIONS: RewriterOptions = {
@@ -141,7 +142,7 @@ export class Rewriter extends RewriterTpl {
141
142
  return typeof result === "number" ? result : result.expr;
142
143
  },
143
144
  });
144
- this.array = new ArrayRewriter(manager, options.isSortingStore);
145
+ this.array = new ArrayRewriter(manager, options.isSortingStore, options.isExpandingSelects);
145
146
  this.seq = new SeqRewriter(manager, options.isCoalescingChars ?? true, this);
146
147
  this.unusedVarsEliminator = new UnusedVarsEliminator(manager);
147
148
  this.der = new Der(manager);
@@ -154,6 +155,17 @@ export class Rewriter extends RewriterTpl {
154
155
  super.release();
155
156
  }
156
157
 
158
+ // A rewrite that the spent resource limit stops answers its input instead of failing.
159
+ rewrite(expr: number) {
160
+ try {
161
+ return super.rewrite(expr);
162
+ } catch (error) {
163
+ if (this.manager.limit.inc()) throw error;
164
+ this.manager.incRef(expr);
165
+ return expr;
166
+ }
167
+ }
168
+
157
169
  private reduceTo(expr: number, depth: number): number {
158
170
  const manager = this.manager;
159
171
  const frames: ReduceFrame[] = [];
@@ -465,7 +477,7 @@ export class Rewriter extends RewriterTpl {
465
477
  const manager = this.manager;
466
478
  if (sort === SORT_BOOL && manager.sorts[first] !== SORT_BOOL) {
467
479
  if (this.isIte(first)) {
468
- if (manager.isUniqueValue(second) && manager.getRefCount(first) === 1)
480
+ if (manager.isValue(second) && manager.getRefCount(first) === 1)
469
481
  return this.pullIteCore(decl, first, second, sort, false);
470
482
  if (this.isIte(second) && manager.getArg(first, 0) === manager.getArg(second, 0)) {
471
483
  const branches = [1, 2].map((index) =>
@@ -481,15 +493,15 @@ export class Rewriter extends RewriterTpl {
481
493
  };
482
494
  }
483
495
  }
484
- if (this.isIte(second) && manager.isUniqueValue(first) && manager.getRefCount(second) === 1)
496
+ if (this.isIte(second) && manager.isValue(first) && manager.getRefCount(second) === 1)
485
497
  return this.pullIteCore(decl, second, first, sort, true);
486
498
  }
487
499
  const family = manager.funcDecls[decl].family;
488
500
  if (family !== FAMILY_BASIC && family !== FAMILY_ARITH && family !== FAMILY_BV)
489
501
  return undefined;
490
- if (manager.isUniqueValue(first) && this.isIteValueTree(second))
502
+ if (manager.isValue(first) && this.isIteValueTree(second))
491
503
  return this.pullIteCore(decl, second, first, sort, true);
492
- if (manager.isUniqueValue(second) && this.isIteValueTree(first))
504
+ if (manager.isValue(second) && this.isIteValueTree(first))
493
505
  return this.pullIteCore(decl, first, second, sort, false);
494
506
  return undefined;
495
507
  }
@@ -506,7 +518,7 @@ export class Rewriter extends RewriterTpl {
506
518
  manager.funcDecls[decl].op === OP_EQ
507
519
  ? branch === value
508
520
  ? manager.trueExpr
509
- : this.areDistinct(branch, value)
521
+ : manager.areDistinct(branch, value)
510
522
  ? manager.falseExpr
511
523
  : manager.mkEq(branch, value)
512
524
  : manager.mkApp(decl, isSwapped ? [value, branch] : [branch, value], sort),
@@ -521,7 +533,7 @@ export class Rewriter extends RewriterTpl {
521
533
  for (let ite = todo.pop(); ite !== undefined; ite = todo.pop()) {
522
534
  for (const branch of [manager.getArg(ite, 1), manager.getArg(ite, 2)]) {
523
535
  if (this.isIte(branch) && manager.getRefCount(branch) === 1) todo.push(branch);
524
- else if (!manager.isUniqueValue(branch)) return false;
536
+ else if (!manager.isValue(branch)) return false;
525
537
  }
526
538
  }
527
539
  return true;
@@ -879,9 +891,9 @@ export class Rewriter extends RewriterTpl {
879
891
  private tryIteEq(ite: number, other: number): Rewrite | undefined {
880
892
  const manager = this.manager;
881
893
  if (!this.isIte(ite)) return undefined;
882
- if (manager.getArg(ite, 1) === other && this.areDistinct(manager.getArg(ite, 2), other))
894
+ if (manager.getArg(ite, 1) === other && manager.areDistinct(manager.getArg(ite, 2), other))
883
895
  return { expr: manager.getArg(ite, 0), depth: 1 };
884
- if (manager.getArg(ite, 2) === other && this.areDistinct(manager.getArg(ite, 1), other))
896
+ if (manager.getArg(ite, 2) === other && manager.areDistinct(manager.getArg(ite, 1), other))
885
897
  return { expr: manager.mkNot(manager.getArg(ite, 0)), depth: 1 };
886
898
  return undefined;
887
899
  }
@@ -890,15 +902,10 @@ export class Rewriter extends RewriterTpl {
890
902
  return this.manager.getOp(expr) === OP_ITE;
891
903
  }
892
904
 
893
- private areDistinct(first: number, second: number) {
894
- const manager = this.manager;
895
- return first !== second && manager.isUniqueValue(first) && manager.isUniqueValue(second);
896
- }
897
-
898
905
  private mkIteValueEq(left: number, right: number): number | Rewrite | undefined {
899
906
  const manager = this.manager;
900
- if (this.isIte(left) && manager.isUniqueValue(right)) return this.tryIteValue(left, right);
901
- if (this.isIte(right) && manager.isUniqueValue(left)) return this.tryIteValue(right, left);
907
+ if (this.isIte(left) && manager.isValue(right)) return this.tryIteValue(left, right);
908
+ if (this.isIte(right) && manager.isValue(left)) return this.tryIteValue(right, left);
902
909
  if (
903
910
  !this.isIte(left) ||
904
911
  !this.isIte(right) ||
@@ -907,7 +914,7 @@ export class Rewriter extends RewriterTpl {
907
914
  manager.getArg(left, 2),
908
915
  manager.getArg(right, 1),
909
916
  manager.getArg(right, 2),
910
- ].every((arg) => manager.isUniqueValue(arg))
917
+ ].every((arg) => manager.isValue(arg))
911
918
  )
912
919
  return undefined;
913
920
  const mkOr = (args: number[]) => manager.mkApp(OP_OR, args, SORT_BOOL);
@@ -950,16 +957,16 @@ export class Rewriter extends RewriterTpl {
950
957
  const mkPlainEq = (branch: number) =>
951
958
  branch === value
952
959
  ? manager.trueExpr
953
- : this.areDistinct(branch, value)
960
+ : manager.areDistinct(branch, value)
954
961
  ? manager.falseExpr
955
962
  : manager.mkEq(branch, value);
956
963
  const mkAnd = (first: number, second: number) =>
957
964
  manager.mkApp(OP_AND, [first, second], SORT_BOOL);
958
965
  const mkOr = (first: number, second: number) =>
959
966
  manager.mkApp(OP_OR, [first, second], SORT_BOOL);
960
- if (this.areDistinct(value, elseExpr))
967
+ if (manager.areDistinct(value, elseExpr))
961
968
  return { expr: mkAnd(mkBranchEq(thenExpr), condition), depth: 2 };
962
- if (this.areDistinct(value, thenExpr))
969
+ if (manager.areDistinct(value, thenExpr))
963
970
  return { expr: mkAnd(mkBranchEq(elseExpr), manager.mkNot(condition)), depth: 2 };
964
971
  if (value === thenExpr)
965
972
  return value === elseExpr
@@ -969,8 +976,8 @@ export class Rewriter extends RewriterTpl {
969
976
  return { expr: mkOr(write(this.mkEq(thenExpr, value)), manager.mkNot(condition)), depth: 2 };
970
977
  const isValueIte = (expr: number) =>
971
978
  this.isIte(expr) &&
972
- manager.isUniqueValue(manager.getArg(expr, 1)) &&
973
- manager.isUniqueValue(manager.getArg(expr, 2));
979
+ manager.isValue(manager.getArg(expr, 1)) &&
980
+ manager.isValue(manager.getArg(expr, 2));
974
981
  const getExpr = (result: number | Rewrite) =>
975
982
  typeof result === "number" ? result : result.expr;
976
983
  const thenEq = isValueIte(thenExpr) ? this.tryIteValue(thenExpr, value) : undefined;
@@ -995,7 +1002,7 @@ export class Rewriter extends RewriterTpl {
995
1002
  const expr = todo.pop() ?? ite;
996
1003
  if (visited.has(expr)) continue;
997
1004
  visited.add(expr);
998
- if (this.areDistinct(expr, value)) continue;
1005
+ if (manager.isValue(expr) && manager.areDistinct(expr, value)) continue;
999
1006
  if (!this.isIte(expr)) return false;
1000
1007
  todo.push(manager.getArg(expr, 1), manager.getArg(expr, 2));
1001
1008
  }
@@ -1014,8 +1021,7 @@ export class Rewriter extends RewriterTpl {
1014
1021
  private mkEqCore(inputLeft: number, inputRight: number): number | Rewrite | undefined {
1015
1022
  const manager = this.manager;
1016
1023
  if (inputLeft === inputRight) return manager.trueExpr;
1017
- if (manager.isUniqueValue(inputLeft) && manager.isUniqueValue(inputRight))
1018
- return manager.falseExpr;
1024
+ if (manager.areDistinct(inputLeft, inputRight)) return manager.falseExpr;
1019
1025
  const iteEq = this.tryIteEq(inputLeft, inputRight) ?? this.tryIteEq(inputRight, inputLeft);
1020
1026
  if (iteEq !== undefined) return iteEq;
1021
1027
  const iteValueEq = this.mkIteValueEq(inputLeft, inputRight);
@@ -14,11 +14,11 @@ export class ResourceLimit {
14
14
  private signal?: AbortSignal,
15
15
  ) {}
16
16
 
17
- inc() {
18
- this.count++;
17
+ inc(offset = 1) {
18
+ this.count += offset;
19
19
  if (
20
20
  !this.isCanceled &&
21
- (this.count & CLOCK_CHECK_MASK) === 0 &&
21
+ (this.count & CLOCK_CHECK_MASK) < offset &&
22
22
  (Date.now() > this.deadline || this.signal?.aborted === true || this.isHeapNearlyFull())
23
23
  ) {
24
24
  this.isCanceled = true;
@@ -31,6 +31,10 @@ export class ResourceLimit {
31
31
  return !this.isSuspended && (this.isCanceled || this.count > this.limit);
32
32
  }
33
33
 
34
+ getCancelMessage() {
35
+ return this.isCanceled ? "canceled" : "max. resource limit exceeded";
36
+ }
37
+
34
38
  push(delta: number) {
35
39
  this.limits.push(this.limit);
36
40
  this.limit = Math.min(delta === 0 ? Infinity : this.count + delta, this.limit);
@@ -43,6 +47,19 @@ export class ResourceLimit {
43
47
  this.isCanceled = false;
44
48
  }
45
49
 
50
+ pushChild(child: ResourceLimit) {
51
+ child.limit = Math.min(child.limit, this.limit - Math.min(this.limit, this.count));
52
+ child.count = 0;
53
+ child.deadline = this.deadline;
54
+ child.signal = this.signal;
55
+ }
56
+
57
+ popChild(child: ResourceLimit) {
58
+ this.count += child.count;
59
+ child.count = 0;
60
+ child.release();
61
+ }
62
+
46
63
  restart(deadline: number) {
47
64
  this.deadline = deadline;
48
65
  this.isCanceled = false;
@@ -11,7 +11,7 @@ export const PS_RANDOM = 6;
11
11
  export const RS_GEOMETRIC = 0;
12
12
  export const RS_LUBY = 1;
13
13
  export const RS_EMA = 2;
14
- export const RS_STATIC = 3;
14
+ const RS_STATIC = 3;
15
15
 
16
16
  export const GC_DYN_PSM = 0;
17
17
  export const GC_PSM = 1;