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
@@ -68,6 +68,7 @@ import { TheoryPolymorphism } from "./theory-polymorphism";
68
68
  import { TheoryLra } from "./theory-lra";
69
69
  import { shrink } from "./array";
70
70
  import {
71
+ DEFAULT_CONFIG,
71
72
  getSmtConfig,
72
73
  PS_ALWAYS_FALSE,
73
74
  PS_CACHING_CONSERVATIVE,
@@ -77,6 +78,7 @@ import {
77
78
  RS_LUBY,
78
79
  type SmtSetup,
79
80
  } from "./smt-setup";
81
+ import type { KernelParams } from "./solver";
80
82
 
81
83
  const ACTIVITY_LIMIT = 1e100;
82
84
  const INV_ACTIVITY_LIMIT = 1e-100;
@@ -152,6 +154,7 @@ export interface SmtParams {
152
154
  isMbqi: boolean;
153
155
  mbqiMaxIterations: number;
154
156
  relevancyLevel: 0 | 2;
157
+ randomSeed?: number;
155
158
  // The model checker's auxiliary context pretends every array operation is supported.
156
159
  isArrayFakeSupport?: boolean;
157
160
  }
@@ -170,6 +173,7 @@ export class Context extends Internalizer {
170
173
  private scopeAuxClauseLimits: number[] = [];
171
174
  private scopeTrailLimits: number[] = [];
172
175
  private baseScopeLemmaLimits: number[] = [];
176
+ private isBaseScopeInconsistent: boolean[] = [];
173
177
  private atomPropagationQueue: Literal[] = [];
174
178
  private thEqQueue: number[] = [];
175
179
  private thDiseqQueue: number[] = [];
@@ -191,6 +195,8 @@ export class Context extends Internalizer {
191
195
  private r1ParentGenerations = new Map<Enode, number>();
192
196
  private erasedGenerations = new Map<Enode, number>();
193
197
  private lastSearchFailure: SearchFailure = FAILURE_OK;
198
+ // As in Z3, a new search doesn't reset it.
199
+ reasonUnknown = "unknown";
194
200
  private hasCaseSplit = true;
195
201
  private incompleteTheories: Theory[] = [];
196
202
  private modelState: ModelState = { kind: "none" };
@@ -203,7 +209,22 @@ export class Context extends Internalizer {
203
209
  readonly params: SmtParams,
204
210
  ) {
205
211
  super(manager, params.relevancyLevel > 0);
206
- this.qmanager = new DefaultQuantifierManager(this, params.isMbqi);
212
+ this.qmanager = new DefaultQuantifierManager(this);
213
+ }
214
+
215
+ // As in Z3, rereading the parameters drops the setup's tuning but for eliminate_term_ite, eliminate_bounds and relevancy.
216
+ updateParams(params: KernelParams) {
217
+ this.params.isMbqi = params.isMbqi;
218
+ this.params.mbqiMaxIterations = params.mbqiMaxIterations;
219
+ this.params.randomSeed = params.randomSeed;
220
+ this.config = {
221
+ ...DEFAULT_CONFIG,
222
+ theories: this.config.theories,
223
+ isFindingMacros: params.isFindingMacros,
224
+ isEliminatingTermIte: this.config.isEliminatingTermIte,
225
+ isEliminatingBounds: this.config.isEliminatingBounds,
226
+ };
227
+ this.qmanager.updateParams();
207
228
  }
208
229
 
209
230
  // setup_context and setup_components. The setup's theories come in its order, then setup_card's.
@@ -212,6 +233,7 @@ export class Context extends Internalizer {
212
233
  isUsingStaticFeatures: boolean,
213
234
  asserted: AssertedFormulas,
214
235
  ) {
236
+ if (this.isInconsistent() || asserted.isInconsistent) return false;
215
237
  const config = getSmtConfig(
216
238
  this.manager,
217
239
  setup,
@@ -221,11 +243,13 @@ export class Context extends Internalizer {
221
243
  );
222
244
  this.setup = setup;
223
245
  this.config = config;
246
+ this.randomSeed = this.params.randomSeed ?? 0;
224
247
  if (config.relevancyLevel !== undefined) this.relevancy.isEnabled = config.relevancyLevel > 0;
225
248
  for (const family of config.theories)
226
249
  if (family !== FAMILY_POLY || this.manager.hasTypeVars) this.registerFamily(family);
227
250
  this.registerFamily(FAMILY_PB);
228
251
  asserted.setup(config);
252
+ return true;
229
253
  }
230
254
 
231
255
  // register_plugin keeps the theory a family already has.
@@ -244,7 +268,9 @@ export class Context extends Internalizer {
244
268
  }
245
269
 
246
270
  checkCanceled() {
247
- return !this.manager.limit.inc();
271
+ if (this.manager.limit.inc()) return false;
272
+ this.lastSearchFailure = FAILURE_CANCELED;
273
+ return true;
248
274
  }
249
275
 
250
276
  assign(literal: Literal, justification: BJustification, isDecision = false) {
@@ -961,11 +987,12 @@ export class Context extends Internalizer {
961
987
  this.cacheGeneration(newLevel, visited);
962
988
  this.qmanager.pop(numScopes);
963
989
  this.fingerprints.pop(numScopes);
990
+ if (newLevel >= this.baseLevel || !this.isBaseScopeInconsistent[newLevel]) this.conflict = null;
964
991
  if (newLevel < this.baseLevel) {
965
992
  this.deleteClauses(this.lemmas, this.baseScopeLemmaLimits[newLevel]);
966
993
  shrink(this.baseScopeLemmaLimits, newLevel);
994
+ shrink(this.isBaseScopeInconsistent, newLevel);
967
995
  }
968
- this.conflict = null;
969
996
  this.deleteClauses(this.auxClauses, this.scopeAuxClauseLimits[newLevel]);
970
997
  this.relevancy.pop(numScopes);
971
998
  this.unassignVars(this.scopeAssignedLimits[newLevel]);
@@ -1277,7 +1304,7 @@ export class Context extends Internalizer {
1277
1304
  if (this.lastSearchFailure === FAILURE_QUANTIFIERS) return "(incomplete quantifiers)";
1278
1305
  if (this.lastSearchFailure === FAILURE_THEORY)
1279
1306
  return `(incomplete (theory${this.incompleteTheories.map((theory) => ` ${theory.name}`).join("")}))`;
1280
- return "unknown";
1307
+ return this.reasonUnknown;
1281
1308
  }
1282
1309
 
1283
1310
  private hasCaseSplits() {
@@ -1448,6 +1475,7 @@ export class Context extends Internalizer {
1448
1475
  this.popToBaseLevel();
1449
1476
  this.pushScope();
1450
1477
  this.baseScopeLemmaLimits.push(this.lemmas.length);
1478
+ this.isBaseScopeInconsistent.push(this.isInconsistent());
1451
1479
  this.baseLevel++;
1452
1480
  this.searchLevel++;
1453
1481
  }
@@ -1481,15 +1509,23 @@ export class Context extends Internalizer {
1481
1509
  this.asserted = asserted;
1482
1510
  this.macros = asserted.macros;
1483
1511
  this.hasQuantifiers = asserted.hasQuantifiers;
1484
- const formulas = asserted.reduce();
1512
+ if (this.checkCanceled()) return;
1513
+ asserted.reduce();
1514
+ if (this.checkCanceled()) return;
1485
1515
  if (asserted.isInconsistent) {
1486
1516
  this.setConflict("axiom", null);
1487
1517
  return;
1488
1518
  }
1489
- for (const formula of formulas) {
1490
- if (this.isInconsistent()) break;
1491
- this.internalizeAssertion(formula, 0);
1519
+ const formulas = asserted.getFormulas();
1520
+ const size = asserted.getNumFormulas();
1521
+ for (let qhead = asserted.getQhead(); qhead < size && !this.isInconsistent(); qhead++) {
1522
+ if (this.checkCanceled()) {
1523
+ asserted.commit(qhead);
1524
+ return;
1525
+ }
1526
+ this.internalizeAssertion(formulas[qhead], 0);
1492
1527
  }
1528
+ asserted.commit();
1493
1529
  }
1494
1530
 
1495
1531
  initAssumptions(assumptions: number[], asserted: AssertedFormulas) {
@@ -1498,7 +1534,7 @@ export class Context extends Internalizer {
1498
1534
  this.unsatCore = [];
1499
1535
  if (assumptions.length > 0) {
1500
1536
  this.propagate();
1501
- if (this.isInconsistent()) return;
1537
+ if (this.isInconsistent() || this.checkCanceled()) return;
1502
1538
  this.delInactiveLemmas();
1503
1539
  this.pushScope();
1504
1540
  const manager = this.manager;
@@ -1598,10 +1634,12 @@ export class Context extends Internalizer {
1598
1634
  }
1599
1635
 
1600
1636
  search() {
1637
+ if (this.asserted?.isInconsistent && !this.isInconsistent()) this.setConflict("axiom", null);
1601
1638
  if (this.isInconsistent()) {
1602
1639
  this.resolveConflict();
1603
1640
  return L_FALSE;
1604
1641
  }
1642
+ if (this.checkCanceled()) return L_UNDEF;
1605
1643
  this.resetModel();
1606
1644
  for (const theory of this.theories) theory.initSearchEh();
1607
1645
  this.qmanager.initSearchEh();
@@ -74,8 +74,7 @@ class CtxSimplifier {
74
74
  for (const form of goal.forms.items) {
75
75
  this.pinned.push(form);
76
76
  visit(form);
77
- while (stack.length > 0) {
78
- const expr = stack.pop() as number;
77
+ for (let expr = stack.pop(); expr !== undefined; expr = stack.pop()) {
79
78
  if (manager.kinds[expr] !== KIND_APP) continue;
80
79
  for (let index = manager.getNumArgs(expr) - 1; index >= 0; index--)
81
80
  visit(manager.getArg(expr, index));
@@ -1,4 +1,4 @@
1
- import { SmtInvariantError } from "../../../errors";
1
+ import { SmtDefaultError, SmtInvariantError } from "../../../errors";
2
2
  import {
3
3
  type AstManager,
4
4
  OP_DT_ACCESSOR,
@@ -327,7 +327,7 @@ const computeSizeFunctions = (manager: AstManager, names: string[]) => {
327
327
  }
328
328
  };
329
329
 
330
- const resetDeclarations = (manager: AstManager) => {
330
+ export const resetDatatypePlugin = (manager: AstManager) => {
331
331
  manager.datatypeConstructors = [];
332
332
  manager.constructorAccessors = [];
333
333
  manager.constructorRecognizers = [];
@@ -337,7 +337,7 @@ const resetDeclarations = (manager: AstManager) => {
337
337
 
338
338
  export const removeDatatype = (manager: AstManager, name: string) => {
339
339
  manager.datatypeDefs.delete(name);
340
- resetDeclarations(manager);
340
+ resetDatatypePlugin(manager);
341
341
  };
342
342
 
343
343
  export const mkDatatypeDef = (
@@ -357,7 +357,7 @@ export const mkDatatypeDef = (
357
357
 
358
358
  export const mkDatatypes = (manager: AstManager, defs: DatatypeDef[]): number[] | string => {
359
359
  for (const def of defs) {
360
- if (manager.datatypeDefs.has(def.name)) resetDeclarations(manager);
360
+ if (manager.datatypeDefs.has(def.name)) resetDatatypePlugin(manager);
361
361
  manager.datatypeDefs.set(def.name, def);
362
362
  }
363
363
  const sorts = defs.map((def) => instantiateDef(manager, def, []));
@@ -415,7 +415,12 @@ export const instantiateAccessor = (
415
415
  export const getDatatypeConstructors = (manager: AstManager, sort: number) => {
416
416
  const existing = manager.datatypeConstructors[sort];
417
417
  if (existing !== undefined) return existing;
418
- const def = getDef(manager, sort);
418
+ const def = getDatatypeDef(manager, sort);
419
+ if (def === undefined) {
420
+ // Z3 caches the empty list before it raises, so a later call gets no constructors.
421
+ manager.datatypeConstructors[sort] = [];
422
+ throw new SmtDefaultError("datatype constructors have not been created");
423
+ }
419
424
  const parameters = manager.getSortParameters(sort);
420
425
  const constructors = def.constructors.map((constructor, index) =>
421
426
  manager.mkDatatypeDecl(
@@ -568,5 +573,8 @@ const getNonRecConstructorCore = (
568
573
  return result === -1 ? { constructor: -1, depth: 0 } : remember(result, minDepth);
569
574
  };
570
575
 
571
- export const getNonRecConstructor = (manager: AstManager, sort: number) =>
572
- getNonRecConstructorCore(manager, sort, [sort]).constructor;
576
+ export const getNonRecConstructor = (manager: AstManager, sort: number) => {
577
+ const constructor = getNonRecConstructorCore(manager, sort, [sort]).constructor;
578
+ if (constructor === -1) throw new SmtDefaultError("constructor not available");
579
+ return constructor;
580
+ };
@@ -1,5 +1,5 @@
1
1
  import type { AstManager } from "./ast";
2
- import type { Goal } from "./goal";
2
+ import type { Definition, Goal } from "./goal";
3
3
 
4
4
  // The formula read last stays referenced, as m_dep, until the next read or the end of the tactic.
5
5
  export class DependentExprState {
@@ -60,6 +60,13 @@ export class DependentExprState {
60
60
  }
61
61
  }
62
62
 
63
+ export const finishSimplifier = (goal: Goal, definitions: Definition[] = []) => {
64
+ goal.elimTrue();
65
+ goal.elimRedundancies();
66
+ goal.depth++;
67
+ if (goal.isModelsEnabled) goal.addDefinitions(definitions);
68
+ };
69
+
63
70
  interface Simplifier {
64
71
  reduce(): void;
65
72
  release(): void;
@@ -73,9 +80,7 @@ export const runSimplifier = (
73
80
  const state = new DependentExprState(goal.manager, goal);
74
81
  const simplifier = create(state);
75
82
  if (!goal.isProofsEnabled || isSupportingProofs) simplifier.reduce();
76
- goal.elimTrue();
77
- goal.elimRedundancies();
78
- goal.depth++;
83
+ finishSimplifier(goal);
79
84
  simplifier.release();
80
85
  state.release();
81
86
  };
@@ -151,8 +151,7 @@ class DiffNeq {
151
151
  }
152
152
 
153
153
  private resolveConflict() {
154
- while (this.stack.length > 0) {
155
- const value = this.stack.pop() as number;
154
+ for (let value = this.stack.pop(); value !== undefined; value = this.stack.pop()) {
156
155
  const next = this.chooseValue(this.stack.length, value + 1);
157
156
  if (next !== -1) {
158
157
  this.stack.push(next);
@@ -0,0 +1,89 @@
1
+ import {
2
+ type AstManager,
3
+ KIND_VAR,
4
+ OP_ADD,
5
+ OP_GE,
6
+ OP_LE,
7
+ OP_MUL,
8
+ OP_NOT,
9
+ OP_OR,
10
+ QUANTIFIER_FORALL,
11
+ } from "./ast";
12
+ import { Rational } from "./rational";
13
+ import { RewriterTpl } from "./rewriter-tpl";
14
+ import { collectUsedVars, elimUnusedVars } from "./var-subst";
15
+
16
+ interface Bound {
17
+ lower: number;
18
+ upper: number;
19
+ }
20
+
21
+ const getBound = (manager: AstManager, atom: number): Bound | undefined => {
22
+ const isNegated = manager.getOp(atom) === OP_NOT;
23
+ const inequality = isNegated ? manager.getArg(atom, 0) : atom;
24
+ const op = manager.getOp(inequality);
25
+ if ((op !== OP_LE && op !== OP_GE) || !manager.isNumeral(manager.getArg(inequality, 1)))
26
+ return undefined;
27
+ const isLe = (op === OP_LE) !== isNegated;
28
+ const term = manager.getArg(inequality, 0);
29
+ const bound = { lower: -1, upper: -1 };
30
+ if (manager.kinds[term] === KIND_VAR) bound.upper = term;
31
+ else if (manager.getOp(term) === OP_ADD && manager.getNumArgs(term) === 2) {
32
+ const first = manager.getArg(term, 0);
33
+ if (manager.kinds[first] === KIND_VAR) bound.upper = first;
34
+ else if (!manager.isGroundApp(first)) return undefined;
35
+ const second = manager.getArg(term, 1);
36
+ if (
37
+ manager.getOp(second) !== OP_MUL ||
38
+ !manager.isNumeral(manager.getArg(second, 0)) ||
39
+ !manager.getRationalValue(manager.getArg(second, 0)).equals(Rational.minusOne)
40
+ )
41
+ return undefined;
42
+ const negated = manager.getArg(second, 1);
43
+ if (manager.kinds[negated] === KIND_VAR) bound.lower = negated;
44
+ else if (!manager.isGroundApp(negated)) return undefined;
45
+ } else return undefined;
46
+ return isLe ? bound : { lower: bound.upper, upper: bound.lower };
47
+ };
48
+
49
+ export class ElimBoundsRw extends RewriterTpl {
50
+ reduceQuantifier(expr: number, body: number) {
51
+ const manager = this.manager;
52
+ const data = manager.getQuantifier(expr);
53
+ if (data.kind !== QUANTIFIER_FORALL) return -1;
54
+ const numVars = data.sorts.length;
55
+ const atoms = manager.getOp(body) === OP_OR ? manager.getArgs(body) : [body];
56
+ const isUsed = Array.from({ length: numVars }, () => false);
57
+ for (const atom of atoms)
58
+ if (getBound(manager, atom) === undefined)
59
+ for (const [index, isVarUsed] of collectUsedVars(manager, atom, numVars).entries())
60
+ if (isVarUsed) isUsed[index] = true;
61
+ if (isUsed.every((isVarUsed) => isVarUsed)) return -1;
62
+ const isCandidate = (variable: number) =>
63
+ variable !== -1 && manager.values[variable] < numVars && !isUsed[manager.values[variable]];
64
+ const lowers = new Set<number>();
65
+ const uppers = new Set<number>();
66
+ for (const atom of atoms) {
67
+ const bound = getBound(manager, atom);
68
+ if (bound === undefined) continue;
69
+ if (isCandidate(bound.lower)) lowers.add(bound.lower);
70
+ if (isCandidate(bound.upper)) uppers.add(bound.upper);
71
+ }
72
+ const candidates = new Set(
73
+ [...lowers, ...uppers].filter((variable) => !lowers.has(variable) || !uppers.has(variable)),
74
+ );
75
+ if (candidates.size === 0) return -1;
76
+ const kept = atoms.filter((atom) => {
77
+ const bound = getBound(manager, atom);
78
+ return bound === undefined || (!candidates.has(bound.lower) && !candidates.has(bound.upper));
79
+ });
80
+ if (kept.length === atoms.length) return -1;
81
+ if (kept.length === 0) {
82
+ manager.incRef(manager.falseExpr);
83
+ return manager.falseExpr;
84
+ }
85
+ return manager.withTemporaries(() =>
86
+ elimUnusedVars(manager, manager.mkQuantifier({ ...data, body: manager.mkOr(kept) })),
87
+ );
88
+ }
89
+ }
@@ -0,0 +1,48 @@
1
+ import { type AstManager, OP_ITE, SORT_BOOL } from "./ast";
2
+ import type { Definition, Goal } from "./goal";
3
+ import { DefinedNames } from "./nnf";
4
+ import { RewriterTpl } from "./rewriter-tpl";
5
+
6
+ class ElimTermIteRw extends RewriterTpl {
7
+ readonly hidden: Definition[] = [];
8
+
9
+ constructor(
10
+ manager: AstManager,
11
+ private names: DefinedNames,
12
+ private goal: Goal,
13
+ ) {
14
+ super(manager);
15
+ }
16
+
17
+ reduceApp(decl: number, args: number[], sort: number) {
18
+ const manager = this.manager;
19
+ if (decl !== OP_ITE || sort === SORT_BOOL) return -1;
20
+ const ite = manager.mkApp(OP_ITE, args, sort);
21
+ manager.incRef(ite);
22
+ const named = this.names.mkName(ite);
23
+ if (named.definition !== -1) {
24
+ this.goal.assert(named.definition);
25
+ if (this.goal.isModelsEnabled) this.hidden.push({ decl: manager.decls[named.name], def: -1 });
26
+ }
27
+ manager.incRef(named.name);
28
+ if (named.definition !== -1) manager.decRef(named.definition);
29
+ manager.decRef(ite);
30
+ return named.name;
31
+ }
32
+ }
33
+
34
+ export const runElimTermIte = (manager: AstManager) => (goal: Goal) => {
35
+ const names = new DefinedNames(manager, null);
36
+ const rewriter = new ElimTermIteRw(manager, names, goal);
37
+ const size = goal.forms.size;
38
+ for (let index = 0; index < size && !goal.isInconsistent; index++) {
39
+ const result = rewriter.rewrite(goal.forms.items[index]);
40
+ goal.update(index, result, goal.getDependency(index));
41
+ manager.decRef(result);
42
+ }
43
+ if (rewriter.hidden.length > 0) goal.addDefinitions(rewriter.hidden);
44
+ goal.depth++;
45
+ names.release();
46
+ rewriter.release();
47
+ return [goal];
48
+ };
@@ -59,8 +59,7 @@ export const collectUnconstrained = (manager: AstManager, goal: Goal) => {
59
59
  const repeated = new Set<number>();
60
60
  for (const form of goal.forms.items) {
61
61
  const todo = [form];
62
- while (todo.length > 0) {
63
- const expr = todo.pop() as number;
62
+ for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
64
63
  const isConst = manager.kinds[expr] === KIND_APP && manager.isUninterpretedConst(expr);
65
64
  if (visited.has(expr)) {
66
65
  if (isConst) repeated.add(expr);
@@ -82,8 +81,7 @@ export const disableQuantified = (manager: AstManager, goal: Goal, bodies: RefVe
82
81
  const disabled = new Set<number>();
83
82
  const visited = new Set<number>();
84
83
  const todo = [...goal.forms.items];
85
- while (todo.length > 0) {
86
- const expr = todo.pop() as number;
84
+ for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
87
85
  if (visited.has(expr)) continue;
88
86
  visited.add(expr);
89
87
  if (manager.kinds[expr] === KIND_QUANTIFIER) {
@@ -92,8 +90,7 @@ export const disableQuantified = (manager: AstManager, goal: Goal, bodies: RefVe
92
90
  if (disabled.has(body)) continue;
93
91
  bodies.push(body);
94
92
  const marks = [body];
95
- while (marks.length > 0) {
96
- const marked = marks.pop() as number;
93
+ for (let marked = marks.pop(); marked !== undefined; marked = marks.pop()) {
97
94
  if (disabled.has(marked)) continue;
98
95
  disabled.add(marked);
99
96
  if (manager.kinds[marked] === KIND_APP) manager.pushArgs(marked, marks);
@@ -259,7 +256,7 @@ class UncnstrRewriter extends RewriterTpl {
259
256
  if (index === -1) return -1;
260
257
  const found = this.mkFreshFor(decl, args, sort);
261
258
  if (!found.isNew) return found.fresh;
262
- const rest = args.filter((_, other) => other !== index);
259
+ const rest = args.filter((_value, other) => other !== index);
263
260
  const restExpr =
264
261
  rest.length === 0
265
262
  ? -1
@@ -525,7 +522,7 @@ export const elimUncnstr = (manager: AstManager, goal: Goal, bodies: RefVector)
525
522
  const rewritten = rewriter.rewrite(form);
526
523
  if (rewritten !== form) {
527
524
  isModified = true;
528
- goal.update(index, rewritten);
525
+ goal.update(index, rewritten, goal.dependencies[index]);
529
526
  }
530
527
  manager.decRef(rewritten);
531
528
  }
@@ -67,7 +67,7 @@ const mkInternalizeState = (): InternalizeState => ({
67
67
 
68
68
  const MAX_POWER_DEGREE = 10;
69
69
 
70
- export const isUnderspecified = (op: number) =>
70
+ const isUnderspecified = (op: number) =>
71
71
  op === OP_DIV ||
72
72
  op === OP_IDIV ||
73
73
  op === OP_REM ||
@@ -32,7 +32,7 @@ export interface AxiomRecord {
32
32
  readonly select: Enode | null;
33
33
  }
34
34
 
35
- export interface VarData {
35
+ interface VarData {
36
36
  isPropUpward: boolean;
37
37
  hasDefault: boolean;
38
38
  readonly lambdas: Enode[];
@@ -71,7 +71,7 @@ import { type Enode, NULL_THEORY_VAR } from "./egraph";
71
71
  import type { EufSolver } from "./euf-solver";
72
72
  import { ThSolver } from "./th-solver";
73
73
 
74
- export interface ZeroOneBit {
74
+ interface ZeroOneBit {
75
75
  readonly owner: number;
76
76
  readonly index: number;
77
77
  readonly isTrue: boolean;
@@ -23,8 +23,8 @@ export const NULL_THEORY_VAR = -1;
23
23
  export const NULL_BOOL_VAR = -1;
24
24
 
25
25
  const J_AXIOM = 0;
26
- export const J_CONGRUENCE = 1;
27
- export const J_EXTERNAL = 2;
26
+ const J_CONGRUENCE = 1;
27
+ const J_EXTERNAL = 2;
28
28
 
29
29
  export interface Justification {
30
30
  readonly kind: number;
@@ -32,7 +32,7 @@ export interface Justification {
32
32
  readonly external: number;
33
33
  }
34
34
 
35
- export const AXIOM: Justification = {
35
+ const AXIOM: Justification = {
36
36
  kind: J_AXIOM,
37
37
  isCommutative: false,
38
38
  external: 0,
@@ -490,8 +490,7 @@ export class Egraph {
490
490
  }
491
491
  const rootVar = root.getThVar(id);
492
492
  node.replaceThVar(thVar, id);
493
- // Deviation from Z3: the undo gives the node back its own variable. Z3 gives it the root's,
494
- // which later equates the wrong terms.
493
+ // Deviation from Z3: the undo gives the node back its own variable, where Z3 gives it the root's and later equates the wrong terms.
495
494
  this.updates.push({
496
495
  tag: U_REPLACE_TH_VAR,
497
496
  r1: node,
@@ -523,12 +522,6 @@ export class Egraph {
523
522
  this.push(U_TOGGLE_CGC, node);
524
523
  }
525
524
 
526
- setRelevant(node: Enode) {
527
- if (node.isRelevant) return;
528
- node.isRelevant = true;
529
- this.push(U_SET_RELEVANT, node);
530
- }
531
-
532
525
  private toggleCgcEnabled(node: Enode, isBacktracking: boolean) {
533
526
  const isEnabled = !node.isCgcEnabled;
534
527
  node.isCgcEnabled = isEnabled;
@@ -465,8 +465,7 @@ export class EufSolver implements SatExtension {
465
465
  let generation = 0;
466
466
  const visited = new Set<number>();
467
467
  const todo = [expr];
468
- while (todo.length > 0) {
469
- const current = todo.pop() as number;
468
+ for (let current = todo.pop(); current !== undefined; current = todo.pop()) {
470
469
  if (visited.has(current)) continue;
471
470
  visited.add(current);
472
471
  const node = this.egraph.find(current);
@@ -42,7 +42,7 @@ import { type Egraph, type Enode, getClass } from "./egraph";
42
42
  import type { TrailStack } from "./th-solver";
43
43
 
44
44
  // euf::mam_solver: the solver whose trail undoes the matcher.
45
- export interface MamSolver {
45
+ interface MamSolver {
46
46
  readonly manager: AstManager;
47
47
  readonly egraph: Egraph;
48
48
  readonly trail: TrailStack;
@@ -590,10 +590,6 @@ export class Mam implements LabelHasher<Enode> {
590
590
  return this.ctx.egraph.find(expr) ?? null;
591
591
  }
592
592
 
593
- canPropagate() {
594
- return this.toMatch.length > 0 || this.newPatterns.length > 0;
595
- }
596
-
597
593
  private setLbls(root: Enode, isParent: boolean, hash: number) {
598
594
  const low = isParent ? root.plbls : root.lbls;
599
595
  const high = isParent ? root.plblsHigh : root.lblsHigh;
@@ -493,8 +493,7 @@ export class Ematch {
493
493
  const manager = this.ctx.manager;
494
494
  const todo = [expr];
495
495
  const marked = new Set<number>();
496
- while (todo.length > 0) {
497
- const term = todo.pop() as number;
496
+ for (let term = todo.pop(); term !== undefined; term = todo.pop()) {
498
497
  if (marked.has(term)) continue;
499
498
  marked.add(term);
500
499
  if (manager.isGroundApp(term)) {
@@ -25,10 +25,6 @@ export class TrailStack {
25
25
  this.scopes.length -= numScopes;
26
26
  while (this.undos.length > lim) (this.undos.pop() as () => void)();
27
27
  }
28
-
29
- get numScopes() {
30
- return this.scopes.length;
31
- }
32
28
  }
33
29
 
34
30
  // A th_explain: the literals and equalities that explain a propagation or a conflict.
@@ -109,9 +105,6 @@ export abstract class ThSolver {
109
105
  isBetaRedex(_parent: Enode, _node: Enode) {
110
106
  return false;
111
107
  }
112
- isFixed(_thVar: number, _lits: number[]): number {
113
- return -1;
114
- }
115
108
  addValue(_node: Enode, _model: ProtoModel, _values: (number | undefined)[]) {}
116
109
  addDep(node: Enode, deps: Dependencies) {
117
110
  deps.set(node, null);