tla-ts 0.0.10-dev.99796fe03 → 0.0.10-dev.a17d6d9fa

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 (226) 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 +54 -54
  5. package/dist/index.cjs +1 -1
  6. package/dist/index.d.cts +3 -2
  7. package/dist/index.d.ts +3 -2
  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 +60 -60
  14. package/dist/prove.js +78 -78
  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 +43 -43
  20. package/dist/transfer.js +39 -39
  21. package/dist/worker.cjs +6 -6
  22. package/dist/worker.js +6 -6
  23. package/package.json +1 -1
  24. package/src/ast.ts +1 -0
  25. package/src/bags.ts +50 -29
  26. package/src/builtins.ts +4 -3
  27. package/src/check-failure.ts +1 -1
  28. package/src/check-trace.ts +90 -51
  29. package/src/check.ts +367 -178
  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 +1 -2
  33. package/src/cli/tlc.ts +16 -10
  34. package/src/cli/xml-exporter.ts +1 -1
  35. package/src/codegen.ts +26 -9
  36. package/src/dependencies.ts +49 -9
  37. package/src/dfid.ts +22 -10
  38. package/src/environment.ts +58 -33
  39. package/src/errors.ts +7 -0
  40. package/src/evaluate.ts +117 -41
  41. package/src/exit-codes.ts +4 -2
  42. package/src/instances.ts +5 -5
  43. package/src/java-hash.ts +14 -0
  44. package/src/java-overrides.ts +2 -2
  45. package/src/levels.ts +138 -90
  46. package/src/liveness-checker.ts +81 -33
  47. package/src/liveness.ts +49 -11
  48. package/src/obligations/index.ts +1 -1
  49. package/src/obligations/normalize.ts +1 -4
  50. package/src/obligations/printer.ts +5 -5
  51. package/src/parallel-worker.ts +8 -2
  52. package/src/parallel.ts +5 -0
  53. package/src/parser.ts +112 -145
  54. package/src/prover/isabelle/isar/attrib.ts +4 -4
  55. package/src/prover/isabelle/isar/rule-cases.ts +8 -6
  56. package/src/prover/isabelle/provers/clasimp.ts +1 -1
  57. package/src/prover/isabelle/provers/hypsubst.ts +2 -2
  58. package/src/prover/isabelle/pure/rewriter.ts +3 -3
  59. package/src/prover/isabelle/pure/term.ts +3 -3
  60. package/src/prover/prep/md5.ts +26 -29
  61. package/src/prover/smt/rewrite.ts +2 -7
  62. package/src/prover/smt/simplify.ts +1 -1
  63. package/src/prover/smt/solver/arith-rewriter.ts +11 -3
  64. package/src/prover/smt/solver/array-rewriter.ts +12 -2
  65. package/src/prover/smt/solver/asserted-formulas.ts +169 -58
  66. package/src/prover/smt/solver/ast-lt.ts +1 -1
  67. package/src/prover/smt/solver/ast.ts +63 -14
  68. package/src/prover/smt/solver/auf-solver.ts +23 -12
  69. package/src/prover/smt/solver/bit-blast-tactic.ts +26 -0
  70. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  71. package/src/prover/smt/solver/bound-simplifier.ts +11 -13
  72. package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
  73. package/src/prover/smt/solver/bv-rewriter.ts +1 -1
  74. package/src/prover/smt/solver/card2bv.ts +32 -18
  75. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
  76. package/src/prover/smt/solver/context.ts +47 -9
  77. package/src/prover/smt/solver/ctx-simplify.ts +1 -2
  78. package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
  79. package/src/prover/smt/solver/dependent-expr-state.ts +9 -4
  80. package/src/prover/smt/solver/diff-neq.ts +1 -2
  81. package/src/prover/smt/solver/elim-bounds.ts +89 -0
  82. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  83. package/src/prover/smt/solver/elim-uncnstr.ts +5 -8
  84. package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
  85. package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
  86. package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
  87. package/src/prover/smt/solver/euf/egraph.ts +4 -11
  88. package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
  89. package/src/prover/smt/solver/euf/mam.ts +1 -5
  90. package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
  91. package/src/prover/smt/solver/euf/th-solver.ts +0 -7
  92. package/src/prover/smt/solver/expr2polynomial.ts +204 -79
  93. package/src/prover/smt/solver/factor.ts +36 -14
  94. package/src/prover/smt/solver/fd-solver.ts +2 -0
  95. package/src/prover/smt/solver/fix-dl-var.ts +1 -2
  96. package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
  97. package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
  98. package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
  99. package/src/prover/smt/solver/goal.ts +6 -3
  100. package/src/prover/smt/solver/goal2nlsat.ts +57 -30
  101. package/src/prover/smt/solver/hashtable.ts +4 -0
  102. package/src/prover/smt/solver/internalizer.ts +1 -1
  103. package/src/prover/smt/solver/logic-tactics.ts +9 -2
  104. package/src/prover/smt/solver/lp/lp-settings.ts +5 -1
  105. package/src/prover/smt/solver/lp/nla-core.ts +1 -1
  106. package/src/prover/smt/solver/lp/nla-grobner.ts +2 -2
  107. package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
  108. package/src/prover/smt/solver/lp/pdd.ts +2 -3
  109. package/src/prover/smt/solver/lp/union-find.ts +1 -1
  110. package/src/prover/smt/solver/mam-compiler.ts +1 -1
  111. package/src/prover/smt/solver/model-based-opt.ts +1 -1
  112. package/src/prover/smt/solver/model-evaluator.ts +2 -0
  113. package/src/prover/smt/solver/model-generator.ts +85 -43
  114. package/src/prover/smt/solver/mpf.ts +2 -4
  115. package/src/prover/smt/solver/mus.ts +2 -3
  116. package/src/prover/smt/solver/muz/dl-context.ts +10 -4
  117. package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
  118. package/src/prover/smt/solver/muz/dl-rule.ts +2 -2
  119. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
  120. package/src/prover/smt/solver/muz/horn-tactic.ts +1 -1
  121. package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
  122. package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
  123. package/src/prover/smt/solver/nlqsat.ts +1 -1
  124. package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
  125. package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
  126. package/src/prover/smt/solver/nlsat/explain.ts +375 -217
  127. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
  128. package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
  129. package/src/prover/smt/solver/nlsat/solver.ts +74 -64
  130. package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
  131. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
  132. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
  133. package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
  134. package/src/prover/smt/solver/nnf.ts +6 -2
  135. package/src/prover/smt/solver/opt-context.ts +20 -7
  136. package/src/prover/smt/solver/opt-nlsat.ts +29 -18
  137. package/src/prover/smt/solver/opt-pareto.ts +19 -0
  138. package/src/prover/smt/solver/opt-preprocess.ts +1 -1
  139. package/src/prover/smt/solver/opt-solver.ts +9 -5
  140. package/src/prover/smt/solver/optsmt.ts +1 -1
  141. package/src/prover/smt/solver/pb-rewriter.ts +1 -4
  142. package/src/prover/smt/solver/poly-rewriter.ts +75 -18
  143. package/src/prover/smt/solver/probes.ts +88 -23
  144. package/src/prover/smt/solver/proto-model.ts +8 -8
  145. package/src/prover/smt/solver/push-app-ite.ts +37 -0
  146. package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
  147. package/src/prover/smt/solver/qe-lite.ts +2 -2
  148. package/src/prover/smt/solver/qe.ts +3 -2
  149. package/src/prover/smt/solver/qsat.ts +16 -6
  150. package/src/prover/smt/solver/quantifier-manager.ts +14 -9
  151. package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
  152. package/src/prover/smt/solver/rewriter.ts +31 -25
  153. package/src/prover/smt/solver/rlimit.ts +4 -0
  154. package/src/prover/smt/solver/sat/config.ts +1 -1
  155. package/src/prover/smt/solver/sat/goal2sat.ts +0 -1
  156. package/src/prover/smt/solver/sat/inc-sat-solver.ts +39 -5
  157. package/src/prover/smt/solver/sat/model-converter.ts +1 -1
  158. package/src/prover/smt/solver/sat/pb-solver.ts +1 -1
  159. package/src/prover/smt/solver/sat/sat-tactic.ts +13 -5
  160. package/src/prover/smt/solver/sat/simplifier.ts +1 -1
  161. package/src/prover/smt/solver/sat/solver.ts +25 -47
  162. package/src/prover/smt/solver/seq-axioms.ts +20 -35
  163. package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
  164. package/src/prover/smt/solver/seq-derive.ts +2 -2
  165. package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
  166. package/src/prover/smt/solver/seq-monadic.ts +7 -5
  167. package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
  168. package/src/prover/smt/solver/seq-re-util.ts +1 -1
  169. package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
  170. package/src/prover/smt/solver/seq-regex-live.ts +2 -2
  171. package/src/prover/smt/solver/seq-rewriter.ts +31 -29
  172. package/src/prover/smt/solver/seq-skolem.ts +0 -23
  173. package/src/prover/smt/solver/seq-view-witness.ts +4 -4
  174. package/src/prover/smt/solver/smt-kernel.ts +39 -5
  175. package/src/prover/smt/solver/smt-setup.ts +96 -10
  176. package/src/prover/smt/solver/smtlib-parser.ts +584 -223
  177. package/src/prover/smt/solver/smtlib-script.ts +509 -154
  178. package/src/prover/smt/solver/solve-eqs.ts +36 -37
  179. package/src/prover/smt/solver/solver.ts +18 -3
  180. package/src/prover/smt/solver/tactic.ts +284 -168
  181. package/src/prover/smt/solver/theory-bv.ts +13 -3
  182. package/src/prover/smt/solver/theory-fpa.ts +1 -1
  183. package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
  184. package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
  185. package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
  186. package/src/prover/smt/solver/theory-lra.ts +1 -1
  187. package/src/prover/smt/solver/theory-pb.ts +24 -7
  188. package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
  189. package/src/prover/smt/solver/theory-seq-state.ts +2 -21
  190. package/src/prover/smt/solver/tseitin-cnf.ts +1 -0
  191. package/src/prover/tlapm/cache.ts +8 -8
  192. package/src/prover/zenon/index-table.ts +5 -2
  193. package/src/prover/zenon/isar-case.ts +1 -1
  194. package/src/prover/zenon/isar.ts +2 -2
  195. package/src/prover/zenon/phrase.ts +1 -1
  196. package/src/resolve.ts +959 -243
  197. package/src/runtime.ts +7 -1
  198. package/src/sany/builtins.ts +10 -10
  199. package/src/sany/generation.ts +2 -13
  200. package/src/sany/generator-definitions.ts +3 -1
  201. package/src/sany/generator-expressions.ts +36 -30
  202. package/src/sany/generator-proofs.ts +5 -3
  203. package/src/sany/generator.ts +2 -1
  204. package/src/sany/lexer.ts +3 -3
  205. package/src/sany/modules.ts +4 -2
  206. package/src/sany/nodes.ts +1 -1
  207. package/src/sany/selectors.ts +11 -6
  208. package/src/sany/xml.ts +2 -3
  209. package/src/search.ts +166 -101
  210. package/src/simulate.ts +110 -50
  211. package/src/spec-description.ts +5 -6
  212. package/src/standard-modules.ts +15 -6
  213. package/src/subexpressions.ts +398 -108
  214. package/src/successors.ts +4 -2
  215. package/src/symmetry.ts +1 -1
  216. package/src/tlc/jar-data.ts +10 -0
  217. package/src/tlc/messages.ts +3 -3
  218. package/src/tlc/order.ts +14 -3
  219. package/src/tlc/random.ts +2 -1
  220. package/src/tlc/replay.ts +3 -2
  221. package/src/tlc/tlc-operators.ts +10 -8
  222. package/src/tlc/tlcext-operators.ts +44 -15
  223. package/src/tlc/trace-spec.ts +9 -22
  224. package/src/typed-tier.ts +32 -25
  225. package/src/typescript/types.ts +2 -2
  226. package/src/values.ts +135 -78
@@ -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)];
@@ -22,6 +22,7 @@ import { QuantifierHoister } from "./quant-hoist";
22
22
  import { hasSubterm } from "./recfun-decl-plugin";
23
23
  import { RefVector } from "./ref-vector";
24
24
  import { SmtKernel } from "./smt-kernel";
25
+ import type { TacticEnvironment } from "./tactic";
25
26
 
26
27
  export const NO_LEVEL = -1;
27
28
 
@@ -314,7 +315,10 @@ class Kernel {
314
315
  private lastAssert = -1;
315
316
  private trail: RefVector;
316
317
 
317
- constructor(private manager: AstManager) {
318
+ constructor(
319
+ private manager: AstManager,
320
+ private isCoreMinimizing: boolean,
321
+ ) {
318
322
  this.trail = new RefVector(manager);
319
323
  }
320
324
 
@@ -324,6 +328,7 @@ class Kernel {
324
328
  mbqiMaxIterations: MBQI_MAX_ITERATIONS,
325
329
  isFindingMacros: false,
326
330
  relevancyLevel: 0,
331
+ isCoreMinimizing: this.isCoreMinimizing,
327
332
  });
328
333
  this.lastAssert = -1;
329
334
  this.trail.reset();
@@ -351,7 +356,7 @@ class Kernel {
351
356
 
352
357
  getCore(core: RefVector) {
353
358
  core.reset();
354
- for (const expr of this.solver.context.unsatCore) core.push(expr);
359
+ this.solver.getUnsatCore(core);
355
360
  }
356
361
 
357
362
  reasonUnknown() {
@@ -383,10 +388,11 @@ class Qsat {
383
388
  constructor(
384
389
  private manager: AstManager,
385
390
  private mode: number,
391
+ isCoreMinimizing: boolean,
386
392
  ) {
387
393
  this.mbp = new Mbproj(manager);
388
- this.fa = new Kernel(manager);
389
- this.ex = new Kernel(manager);
394
+ this.fa = new Kernel(manager, isCoreMinimizing);
395
+ this.ex = new Kernel(manager, isCoreMinimizing);
390
396
  this.predAbs = new PredAbs(manager);
391
397
  this.answer = new RefVector(manager);
392
398
  this.asms = new RefVector(manager);
@@ -804,8 +810,12 @@ class Qsat {
804
810
  }
805
811
  }
806
812
 
807
- export const runQsat = (manager: AstManager, mode: number) => (goal: Goal) => {
808
- const qsat = new Qsat(manager, mode);
813
+ export const runQsat = (environment: TacticEnvironment, mode: number) => (goal: Goal) => {
814
+ const qsat = new Qsat(
815
+ environment.manager,
816
+ mode,
817
+ environment.parameters.get("smt.core.minimize") === "true",
818
+ );
809
819
  try {
810
820
  return qsat.apply(goal);
811
821
  } 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 },
@@ -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);
@@ -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);
@@ -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;
@@ -114,7 +114,6 @@ export class Goal2Sat implements SatInternalizer, EufInternalizer {
114
114
 
115
115
  private insertAtom(expr: number, boolVar: number) {
116
116
  this.atoms.set(expr, boolVar);
117
- if (this.mkThSolver === null) return;
118
117
  this.manager.incRef(expr);
119
118
  this.recentAtoms.push(expr);
120
119
  }
@@ -1,5 +1,6 @@
1
1
  import { SmtTacticError, SmtUnsupportedError } from "../../../../errors";
2
2
  import { type AstManager, OP_AND, OP_EQ, OP_IMPLIES, OP_NOT, OP_OR, SORT_BOOL } from "../ast";
3
+ import { mkNot } from "../ast-util";
3
4
  import { BitBlasterRewriter } from "../bit-blast-tactic";
4
5
  import { Goal } from "../goal";
5
6
  import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
@@ -24,6 +25,8 @@ interface Scope {
24
25
  readonly converters: Goal["converters"];
25
26
  readonly fmlsSize: number;
26
27
  readonly fmlsHead: number;
28
+ readonly namesSize: number;
29
+ readonly hasUninterpreted: boolean;
27
30
  }
28
31
 
29
32
  export class IncSatSolver {
@@ -31,6 +34,7 @@ export class IncSatSolver {
31
34
  private readonly goal2sat: Goal2Sat;
32
35
  private readonly fmls: RefVector;
33
36
  private fmlsHead = 0;
37
+ private readonly names: RefVector;
34
38
  private isCnf = true;
35
39
  private readonly core: RefVector;
36
40
  private dep2asm = new Map<number, number>();
@@ -62,6 +66,7 @@ export class IncSatSolver {
62
66
  );
63
67
  if (mkThSolver !== null) this.goal2sat.ensureEuf();
64
68
  this.fmls = new RefVector(manager);
69
+ this.names = new RefVector(manager);
65
70
  this.core = new RefVector(manager);
66
71
  this.converters = new Goal(manager);
67
72
  this.internalized = new RefVector(manager);
@@ -87,21 +92,41 @@ export class IncSatSolver {
87
92
  this.fmls.push(expr);
88
93
  }
89
94
 
90
- // Outside sat.euf, a scope would also need the scopes of the bit-blaster.
95
+ assertNamed(expr: number, name: number) {
96
+ const manager = this.manager;
97
+ this.names.push(name);
98
+ if (this.isCnf && isLiteral(manager, expr) && isLiteral(manager, name))
99
+ return this.assertExpr(manager.mkApp(OP_OR, [mkNot(manager, name), expr], SORT_BOOL));
100
+ if (
101
+ this.isCnf &&
102
+ manager.getOp(expr) === OP_OR &&
103
+ this.isClause(expr) &&
104
+ isLiteral(manager, name)
105
+ )
106
+ return this.assertExpr(
107
+ manager.mkApp(OP_OR, [mkNot(manager, name), ...manager.getArgs(expr)], SORT_BOOL),
108
+ );
109
+ this.isCnf = false;
110
+ this.assertExpr(manager.mkApp(OP_IMPLIES, [name, expr], SORT_BOOL));
111
+ }
112
+
91
113
  push() {
92
- if (this.goal2sat.euf === null) throw new SmtUnsupportedError("push on the SAT solver");
93
114
  this.internalizeFormulas();
94
115
  this.goal2sat.push();
95
116
  this.solver.userPush();
117
+ this.bitBlaster?.push();
96
118
  this.scopes.push({
97
119
  converters: this.converters.converters,
98
120
  fmlsSize: this.fmls.size,
99
121
  fmlsHead: this.fmlsHead,
122
+ namesSize: this.names.size,
123
+ hasUninterpreted: this.hasUninterpreted,
100
124
  });
101
125
  }
102
126
 
103
127
  pop(numScopes: number) {
104
128
  const count = Math.min(numScopes, this.scopes.length);
129
+ this.bitBlaster?.pop(count);
105
130
  this.goal2sat.pop(count);
106
131
  this.solver.userPop(count);
107
132
  for (let index = 0; index < count; index++) {
@@ -109,9 +134,17 @@ export class IncSatSolver {
109
134
  this.converters.converters = scope.converters;
110
135
  this.fmlsHead = scope.fmlsHead;
111
136
  this.fmls.shrink(scope.fmlsSize);
137
+ this.names.shrink(scope.namesSize);
138
+ this.hasUninterpreted = scope.hasUninterpreted;
112
139
  }
113
140
  }
114
141
 
142
+ private getBitBlaster() {
143
+ const bitBlaster = (this.bitBlaster ??= new BitBlasterRewriter(this.manager, BIT_BLAST_PARAMS));
144
+ while (bitBlaster.getNumScopes() < this.scopes.length) bitBlaster.push();
145
+ return bitBlaster;
146
+ }
147
+
115
148
  private checkUninterpreted() {
116
149
  if (this.goal2sat.unhandledFuns.length === 0) return L_TRUE;
117
150
  this.hasUninterpreted = true;
@@ -131,7 +164,7 @@ export class IncSatSolver {
131
164
  private internalizeGoal(goal: Goal) {
132
165
  this.solver.popToBaseLevel();
133
166
  if (this.solver.isInconsistent) return L_FALSE;
134
- const bitBlaster = (this.bitBlaster ??= new BitBlasterRewriter(this.manager, BIT_BLAST_PARAMS));
167
+ const bitBlaster = this.getBitBlaster();
135
168
  const subgoals = (() => {
136
169
  if (this.isCnf) return [goal];
137
170
  try {
@@ -203,7 +236,7 @@ export class IncSatSolver {
203
236
  this.dep2asm = new Map();
204
237
  const internalized = this.internalizeFormulas();
205
238
  if (internalized !== L_TRUE) return internalized;
206
- this.internalizeAssumptions(literals);
239
+ this.internalizeAssumptions([...literals, ...this.names.items]);
207
240
  this.reasonUnknown = "no reason given";
208
241
  this.isInternalizedConverted = false;
209
242
  const result = this.solver.check(this.asms);
@@ -239,7 +272,7 @@ export class IncSatSolver {
239
272
 
240
273
  getConsequences(assumptions: readonly number[], vars: readonly number[]) {
241
274
  const manager = this.manager;
242
- this.bitBlaster ??= new BitBlasterRewriter(manager, BIT_BLAST_PARAMS);
275
+ this.getBitBlaster();
243
276
  this.dep2asm = new Map();
244
277
  this.solver.popToBaseLevel();
245
278
  const consequences: number[] = [];
@@ -365,6 +398,7 @@ export class IncSatSolver {
365
398
  for (const model of this.models) model.decRef();
366
399
  this.models = [];
367
400
  this.fmls.reset();
401
+ this.names.reset();
368
402
  this.core.reset();
369
403
  this.internalized.reset();
370
404
  this.releaseBitBlaster();
@@ -6,7 +6,7 @@ export const MC_BCE = 1;
6
6
  export const MC_CCE = 2;
7
7
  export const MC_ACCE = 3;
8
8
  export const MC_ABCE = 4;
9
- export const MC_ATE = 5;
9
+ const MC_ATE = 5;
10
10
 
11
11
  export interface McEntry {
12
12
  boolVar: number;
@@ -1443,7 +1443,7 @@ export class PbSolver implements SatExtension, ConstraintHost {
1443
1443
  private convertPbWlits(expr: number): WLits {
1444
1444
  const manager = this.manager;
1445
1445
  const lits = this.convertPbArgs(expr);
1446
- const coeffs = lits.map((_, index) =>
1446
+ const coeffs = lits.map((_value, index) =>
1447
1447
  this.checkUnsigned(getPbCoeff(manager, manager.decls[expr], index)),
1448
1448
  );
1449
1449
  return { coeffs, lits };
@@ -1,8 +1,8 @@
1
- import { SmtTacticError } from "../../../../errors";
1
+ import { SmtCanceledError, SmtTacticError } from "../../../../errors";
2
2
  import type { AstManager } from "../ast";
3
3
  import type { ThSolverFactory } from "../euf/euf-solver";
4
4
  import { OVER, type Goal } from "../goal";
5
- import { L_FALSE, L_TRUE } from "../lbool";
5
+ import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
6
6
  import { ProtoModel } from "../proto-model";
7
7
  import type { SatParams } from "./config";
8
8
  import { Goal2Sat } from "./goal2sat";
@@ -19,11 +19,19 @@ export const createSatTactic =
19
19
  const goal2sat = new Goal2Sat(manager, solver, params.get("ite_extra") !== false, mkThSolver);
20
20
  goal2sat.run(goal.forms.items);
21
21
  goal.reset();
22
- const result = solver.check();
22
+ const result = (() => {
23
+ try {
24
+ return solver.check();
25
+ } catch (error) {
26
+ if (error instanceof SmtCanceledError) throw new SmtTacticError("canceled");
27
+ throw error;
28
+ }
29
+ })();
30
+ if (result === L_UNDEF) goal.reasonUnknown = solver.reasonUnknown;
23
31
  const unhandledFuns = goal2sat.euf?.unhandledFunctions ?? goal2sat.unhandledFuns;
24
32
  if (result === L_FALSE) goal.assert(manager.falseExpr);
25
33
  else if (result === L_TRUE && unhandledFuns.length === 0) {
26
- const model = new ProtoModel(manager);
34
+ const model = new ProtoModel(manager).mkModel();
27
35
  for (const [expr, boolVar] of goal2sat.atoms) {
28
36
  if (!manager.isUninterpretedConst(expr)) continue;
29
37
  const value = solver.model[boolVar];
@@ -31,7 +39,7 @@ export const createSatTactic =
31
39
  else if (value === L_FALSE) model.registerConst(manager.decls[expr], manager.falseExpr);
32
40
  }
33
41
  const euf = goal2sat.euf;
34
- goal.model = (euf?.updateModel(model) ?? model).mkModel();
42
+ goal.model = euf?.updateModel(model) ?? model;
35
43
  euf?.validateModel(goal.model);
36
44
  } else {
37
45
  solver.popToBaseLevel();
@@ -1270,7 +1270,7 @@ export class Simplifier {
1270
1270
  for (const wlist of solver.watches) {
1271
1271
  solver.checkpoint();
1272
1272
  const size = wlist.size;
1273
- const order = Array.from({ length: size }, (_, index) => index);
1273
+ const order = Array.from({ length: size }, (_value, index) => index);
1274
1274
  const getRank = (index: number) =>
1275
1275
  wlist.isBinary(index)
1276
1276
  ? 2 * wlist.getLiteral(index) + (wlist.isLearned(index) ? 1 : 0)