tla-ts 0.0.10-dev.8aec06f77 → 0.0.10-dev.94c3dd828

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 (196) hide show
  1. package/dist/deciders.cjs +37 -36
  2. package/dist/deciders.js +55 -54
  3. package/dist/index.cjs +1 -1
  4. package/dist/index.d.cts +3 -0
  5. package/dist/index.d.ts +3 -0
  6. package/dist/index.js +1 -1
  7. package/dist/parallel-worker.cjs +1 -1
  8. package/dist/parallel-worker.js +1 -1
  9. package/dist/prove.cjs +146 -58
  10. package/dist/prove.js +142 -54
  11. package/dist/run.cjs +45 -43
  12. package/dist/run.js +47 -45
  13. package/dist/transfer.cjs +39 -36
  14. package/dist/transfer.js +23 -20
  15. package/dist/worker.cjs +1 -1
  16. package/dist/worker.js +1 -1
  17. package/package.json +1 -1
  18. package/src/ast.ts +3 -3
  19. package/src/check.ts +203 -33
  20. package/src/cli/tlapm.ts +261 -68
  21. package/src/dependencies.ts +23 -2
  22. package/src/errors.ts +1 -1
  23. package/src/exit-codes.ts +1 -0
  24. package/src/liveness-checker.ts +530 -201
  25. package/src/liveness.ts +47 -32
  26. package/src/obligations/anonymize.ts +2 -4
  27. package/src/obligations/index.ts +5 -3
  28. package/src/obligations/pragma.ts +2 -2
  29. package/src/parallel.ts +2 -2
  30. package/src/parser.ts +151 -42
  31. package/src/prover/deciders.ts +1 -8
  32. package/src/prover/isabelle/isar/attrib.ts +86 -45
  33. package/src/prover/isabelle/isar/context.ts +25 -22
  34. package/src/prover/isabelle/isar/induct.ts +2 -5
  35. package/src/prover/isabelle/isar/method.ts +5 -7
  36. package/src/prover/isabelle/isar/proof.ts +33 -16
  37. package/src/prover/isabelle/isar/rule-cases.ts +6 -14
  38. package/src/prover/isabelle/isar/theory.ts +16 -17
  39. package/src/prover/isabelle/isar/toplevel.ts +46 -52
  40. package/src/prover/isabelle/provers/classical.ts +1 -1
  41. package/src/prover/ocaml.ts +4 -1
  42. package/src/prover/prep/action.ts +1 -0
  43. package/src/prover/prep/methods.ts +50 -3
  44. package/src/prover/prep/normalize.ts +4 -1
  45. package/src/prover/prove.ts +58 -32
  46. package/src/prover/ptl/decide.ts +43 -63
  47. package/src/prover/smt/data.ts +51 -45
  48. package/src/prover/smt/encode.ts +1 -2
  49. package/src/prover/smt/rewrite.ts +1 -0
  50. package/src/prover/smt/solver/aig-tactic.ts +25 -15
  51. package/src/prover/smt/solver/arith-rewriter.ts +3 -5
  52. package/src/prover/smt/solver/asserted-formulas.ts +1 -1
  53. package/src/prover/smt/solver/ast-util.ts +3 -1
  54. package/src/prover/smt/solver/ast.ts +110 -152
  55. package/src/prover/smt/solver/bound-manager.ts +39 -28
  56. package/src/prover/smt/solver/bv-bound-chk.ts +2 -8
  57. package/src/prover/smt/solver/bv-rewriter.ts +14 -16
  58. package/src/prover/smt/solver/bv1-blast.ts +1 -9
  59. package/src/prover/smt/solver/cg-table.ts +19 -14
  60. package/src/prover/smt/solver/check-logic.ts +6 -1
  61. package/src/prover/smt/solver/context.ts +20 -10
  62. package/src/prover/smt/solver/demodulator.ts +2 -2
  63. package/src/prover/smt/solver/dependent-expr-state.ts +16 -0
  64. package/src/prover/smt/solver/distribute-forall.ts +1 -10
  65. package/src/prover/smt/solver/dom-simplify.ts +1 -1
  66. package/src/prover/smt/solver/dt2bv-tactic.ts +2 -7
  67. package/src/prover/smt/solver/e-matching.ts +6 -6
  68. package/src/prover/smt/solver/elim-uncnstr.ts +3 -14
  69. package/src/prover/smt/solver/enode.ts +15 -1
  70. package/src/prover/smt/solver/euf/array-internalize.ts +19 -8
  71. package/src/prover/smt/solver/euf/dt-solver.ts +19 -19
  72. package/src/prover/smt/solver/euf/egraph.ts +65 -32
  73. package/src/prover/smt/solver/euf/euf-solver.ts +35 -18
  74. package/src/prover/smt/solver/euf/fpa-solver.ts +37 -51
  75. package/src/prover/smt/solver/euf/mam.ts +6 -48
  76. package/src/prover/smt/solver/euf/q-ematch.ts +21 -94
  77. package/src/prover/smt/solver/euf/q-mbi.ts +4 -2
  78. package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -1
  79. package/src/prover/smt/solver/euf/q-solver.ts +2 -0
  80. package/src/prover/smt/solver/euf/th-solver.ts +1 -1
  81. package/src/prover/smt/solver/factor.ts +1 -11
  82. package/src/prover/smt/solver/fd-solver.ts +1 -2
  83. package/src/prover/smt/solver/fm-tactic.ts +19 -13
  84. package/src/prover/smt/solver/fpa-rewriter.ts +3 -1
  85. package/src/prover/smt/solver/fpa2bv-converter.ts +10 -6
  86. package/src/prover/smt/solver/internalizer.ts +41 -2
  87. package/src/prover/smt/solver/lia2pb.ts +18 -4
  88. package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
  89. package/src/prover/smt/solver/lp/nla-powers.ts +144 -107
  90. package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -17
  91. package/src/prover/smt/solver/macro-finder.ts +1 -1
  92. package/src/prover/smt/solver/mam-compiler.ts +13 -13
  93. package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -11
  94. package/src/prover/smt/solver/maxcore.ts +4 -12
  95. package/src/prover/smt/solver/maxlex.ts +0 -7
  96. package/src/prover/smt/solver/maxsmt-base.ts +7 -0
  97. package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -11
  98. package/src/prover/smt/solver/mbp/mbp-plugin.ts +9 -0
  99. package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -9
  100. package/src/prover/smt/solver/model-evaluator.ts +9 -5
  101. package/src/prover/smt/solver/model-macro-solver.ts +3 -3
  102. package/src/prover/smt/solver/muz/dl-context.ts +57 -3
  103. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -20
  104. package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -1
  105. package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -10
  106. package/src/prover/smt/solver/muz/dl-mk-slice.ts +76 -13
  107. package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -2
  108. package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -2
  109. package/src/prover/smt/solver/muz/dl-rule.ts +93 -29
  110. package/src/prover/smt/solver/muz/hnf.ts +6 -5
  111. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +178 -0
  112. package/src/prover/smt/solver/muz/horn-tactic.ts +14 -3
  113. package/src/prover/smt/solver/muz/rule-properties.ts +194 -36
  114. package/src/prover/smt/solver/muz/spacer-context.ts +102 -84
  115. package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -2
  116. package/src/prover/smt/solver/muz/spacer-pdr.ts +3 -3
  117. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +2 -7
  118. package/src/prover/smt/solver/muz/spacer-util.ts +2 -2
  119. package/src/prover/smt/solver/muz/substitution.ts +88 -37
  120. package/src/prover/smt/solver/nlqsat.ts +2 -2
  121. package/src/prover/smt/solver/nlsat/algebraic.ts +1 -2
  122. package/src/prover/smt/solver/nlsat/explain.ts +5 -0
  123. package/src/prover/smt/solver/nlsat/solver.ts +36 -25
  124. package/src/prover/smt/solver/opt-context.ts +9 -8
  125. package/src/prover/smt/solver/opt-nlsat.ts +68 -58
  126. package/src/prover/smt/solver/opt-solver.ts +16 -7
  127. package/src/prover/smt/solver/optsmt.ts +12 -9
  128. package/src/prover/smt/solver/pattern-inference.ts +2 -2
  129. package/src/prover/smt/solver/pb-rewriter.ts +13 -13
  130. package/src/prover/smt/solver/poly-rewriter.ts +2 -2
  131. package/src/prover/smt/solver/probes.ts +1 -1
  132. package/src/prover/smt/solver/propagate-values.ts +4 -0
  133. package/src/prover/smt/solver/proto-model.ts +5 -5
  134. package/src/prover/smt/solver/purify-arith.ts +50 -15
  135. package/src/prover/smt/solver/qe-arith-plugin.ts +2 -1
  136. package/src/prover/smt/solver/qe-mbp.ts +13 -23
  137. package/src/prover/smt/solver/qe.ts +45 -53
  138. package/src/prover/smt/solver/qsat.ts +70 -90
  139. package/src/prover/smt/solver/quantifier-analyzer.ts +9 -9
  140. package/src/prover/smt/solver/quasi-macros.ts +9 -18
  141. package/src/prover/smt/solver/rational.ts +17 -0
  142. package/src/prover/smt/solver/recfun-decl-plugin.ts +33 -19
  143. package/src/prover/smt/solver/recfun-rewriter.ts +1 -1
  144. package/src/prover/smt/solver/rewriter-tpl.ts +6 -2
  145. package/src/prover/smt/solver/rewriter.ts +1 -1
  146. package/src/prover/smt/solver/sat/asymm-branch.ts +59 -46
  147. package/src/prover/smt/solver/sat/clause-use-list.ts +0 -6
  148. package/src/prover/smt/solver/sat/clause.ts +1 -3
  149. package/src/prover/smt/solver/sat/config.ts +3 -3
  150. package/src/prover/smt/solver/sat/consequences.ts +1 -1
  151. package/src/prover/smt/solver/sat/goal2sat.ts +1 -1
  152. package/src/prover/smt/solver/sat/inc-sat-solver.ts +4 -12
  153. package/src/prover/smt/solver/sat/model-converter.ts +1 -15
  154. package/src/prover/smt/solver/sat/pb-solver.ts +49 -23
  155. package/src/prover/smt/solver/sat/probing.ts +22 -19
  156. package/src/prover/smt/solver/sat/sat2goal.ts +9 -10
  157. package/src/prover/smt/solver/sat/simplifier.ts +15 -56
  158. package/src/prover/smt/solver/sat/solver.ts +20 -19
  159. package/src/prover/smt/solver/sat/watch-list.ts +7 -0
  160. package/src/prover/smt/solver/seq-decl-plugin.ts +7 -7
  161. package/src/prover/smt/solver/seq-derive.ts +6 -7
  162. package/src/prover/smt/solver/seq-eq-solver.ts +7 -7
  163. package/src/prover/smt/solver/seq-range-predicate.ts +14 -1
  164. package/src/prover/smt/solver/seq-re-rewriter.ts +1 -10
  165. package/src/prover/smt/solver/seq-re-util.ts +1 -2
  166. package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
  167. package/src/prover/smt/solver/seq-regex-live.ts +4 -4
  168. package/src/prover/smt/solver/seq-rewriter.ts +1 -4
  169. package/src/prover/smt/solver/smt-setup.ts +15 -9
  170. package/src/prover/smt/solver/smtlib-parser.ts +1174 -579
  171. package/src/prover/smt/solver/smtlib-script.ts +866 -728
  172. package/src/prover/smt/solver/tactic.ts +66 -14
  173. package/src/prover/smt/solver/theory-array.ts +25 -58
  174. package/src/prover/smt/solver/theory-bv.ts +13 -50
  175. package/src/prover/smt/solver/theory-fpa.ts +46 -78
  176. package/src/prover/smt/solver/theory-pb.ts +10 -6
  177. package/src/prover/smt/solver/theory-recfun.ts +2 -2
  178. package/src/prover/smt/solver/theory-seq-regex.ts +3 -6
  179. package/src/prover/smt/solver/theory-seq-solve.ts +5 -5
  180. package/src/prover/smt/solver/theory-seq-state.ts +6 -3
  181. package/src/prover/smt/solver/theory-seq.ts +32 -54
  182. package/src/prover/smt/solver/theory.ts +16 -1
  183. package/src/prover/smt/solver/tseitin-cnf.ts +3 -3
  184. package/src/prover/smt/solver/var-subst.ts +2 -2
  185. package/src/prover/smt/table.ts +3 -2
  186. package/src/prover/zenon/decide.ts +9 -11
  187. package/src/prover/zenon/node.ts +12 -11
  188. package/src/prover/zenon/tla/sets.ts +1 -1
  189. package/src/search.ts +131 -16
  190. package/src/successors.ts +1 -1
  191. package/src/symmetry.ts +2 -2
  192. package/src/tableau.ts +2 -2
  193. package/src/tlc/fingerprint.ts +81 -9
  194. package/src/tlc/summary.ts +29 -14
  195. package/src/typed-tier.ts +6535 -0
  196. package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
@@ -3,7 +3,7 @@
3
3
  // src/util/heap.h, src/util/util.h), MIT license, see z3-license.txt.
4
4
  import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
5
5
  import type { RandomGen } from "../random-gen";
6
- import { type ClauseArena, NULL_LITERAL } from "./clause";
6
+ import { type ClauseArena, NULL_LITERAL, UINT_MAX } from "./clause";
7
7
  import { UseList } from "./clause-use-list";
8
8
  import { getBool, getNumber, type SatParams } from "./config";
9
9
  import { MC_ABCE, MC_ACCE, MC_BCE, MC_CCE, MC_ELIM_VAR } from "./model-converter";
@@ -17,8 +17,6 @@ const ABCE_T = 3;
17
17
  const ATE_T = 4;
18
18
  const NO_T = 5;
19
19
 
20
- const UINT_MAX = 4294967295;
21
-
22
20
  const isApproxSubset = (first: number, second: number) => (first | second) === second;
23
21
 
24
22
  const shuffle = (lits: number[], rand: RandomGen) => {
@@ -606,7 +604,6 @@ class BlockedClauseElim {
606
604
  if (!this.isSelectClause(2)) continue;
607
605
  const other = wlist.getLiteral(index);
608
606
  const result = this.cceBinary(lit, other, elimType);
609
- this.incBc(result);
610
607
  if (result === ATE_T) {
611
608
  wlist.setLearned(index, true);
612
609
  solver.setLearned1(other, lit, true);
@@ -633,7 +630,6 @@ class BlockedClauseElim {
633
630
  if (arena.wasRemoved(clause) || arena.isLearned(clause)) continue;
634
631
  if (!this.isSelectClause(arena.size[clause])) continue;
635
632
  const result = this.cceClause(clause, elimType);
636
- this.incBc(result);
637
633
  if (result === ATE_T) {
638
634
  solver.mc.addAte(this.coveredClause);
639
635
  simplifier.setLearnedClause(clause);
@@ -646,15 +642,6 @@ class BlockedClauseElim {
646
642
  }
647
643
  }
648
644
 
649
- private incBc(elimType: number) {
650
- const simplifier = this.simplifier;
651
- if (elimType === CCE_T) simplifier.numCce++;
652
- else if (elimType === ACCE_T) simplifier.numAcce++;
653
- else if (elimType === ABCE_T) simplifier.numAbce++;
654
- else if (elimType === ATE_T) simplifier.numAte++;
655
- else if (elimType === BCE_T) simplifier.numBce++;
656
- }
657
-
658
645
  private isSelectClause(size: number) {
659
646
  return size > 3 || this.simplifier.solver.rand.next() % 4 === 0;
660
647
  }
@@ -668,7 +655,6 @@ class BlockedClauseElim {
668
655
  if (lit !== this.blocked && this.isProcessVar(lit >> 1)) this.queue.decreased(lit ^ 1);
669
656
  }
670
657
  solver.mc.insert(entry, this.coveredClause);
671
- solver.mc.setClause(entry, arena.getLits(clause));
672
658
  }
673
659
 
674
660
  private blockCoveredBinary(other: number, lit: number) {
@@ -676,7 +662,6 @@ class BlockedClauseElim {
676
662
  const entry = solver.mc.mk(this.kind, this.blocked >> 1);
677
663
  this.simplifier.setLearnedBinary(lit, other);
678
664
  solver.mc.insert(entry, this.coveredClause);
679
- solver.mc.setClause(entry, [lit, other]);
680
665
  if (this.isProcessVar(other >> 1)) this.queue.decreased(other ^ 1);
681
666
  }
682
667
  }
@@ -719,15 +704,7 @@ export class Simplifier {
719
704
  private isSubsumption: boolean;
720
705
  private subsumptionLimit: number;
721
706
  readonly isElimVars: boolean;
722
- numBce = 0;
723
- numCce = 0;
724
- numAcce = 0;
725
- numAbce = 0;
726
- numAte = 0;
727
- numSubsumed = 0;
728
707
  numElimVars = 0;
729
- numSubRes = 0;
730
- numElimLits = 0;
731
708
  private isLearnedInUseLists = false;
732
709
  private oldNumElimVars = 0;
733
710
  private bsClauses: number[] = [];
@@ -1092,33 +1069,30 @@ export class Simplifier {
1092
1069
  const second = this.bsClauses[index];
1093
1070
  const lit = this.bsLits[index];
1094
1071
  if (!arena.wasRemoved(second) && lit === NULL_LITERAL) {
1095
- if (arena.isLearned(first) && !arena.isLearned(second)) this.setNotLearned(first);
1072
+ if (arena.isLearned(first) && !arena.isLearned(second)) arena.setLearned(first, false);
1096
1073
  this.removeClause(second);
1097
- this.numSubsumed++;
1098
1074
  } else if (!arena.wasRemoved(second)) {
1099
1075
  this.elimLit(second, lit);
1100
- this.numSubRes++;
1101
1076
  }
1102
1077
  if (solver.isInconsistent) break;
1103
1078
  }
1104
1079
  }
1105
1080
 
1106
- private setNotLearned(clause: number) {
1107
- this.solver.arena.setLearned(clause, false);
1108
- if (clause !== this.dummy) this.useList.unblock(clause);
1109
- }
1110
-
1081
+ // tmp_clause::set computes the approximation only when it allocates the clause, so every later
1082
+ // binary is filtered with the approximation of the first one.
1111
1083
  private setDummy(first: number, second: number, isLearned: boolean) {
1112
1084
  const arena = this.solver.arena;
1113
- if (this.dummyArena !== arena) {
1085
+ const previousArena = this.dummyArena;
1086
+ if (previousArena !== arena) {
1087
+ const previous = this.dummy;
1114
1088
  this.dummyArena = arena;
1115
1089
  this.dummy = arena.mkClause([first, second], 2, isLearned);
1090
+ if (previousArena !== undefined) arena.approx[this.dummy] = previousArena.approx[previous];
1116
1091
  return this.dummy;
1117
1092
  }
1118
1093
  arena.set(this.dummy, 0, first);
1119
1094
  arena.set(this.dummy, 1, second);
1120
1095
  arena.setLearned(this.dummy, isLearned);
1121
- arena.updateApprox(this.dummy);
1122
1096
  return this.dummy;
1123
1097
  }
1124
1098
 
@@ -1164,9 +1138,8 @@ export class Simplifier {
1164
1138
  }
1165
1139
  }
1166
1140
  for (const second of this.bsClauses) {
1167
- if (arena.isLearned(first) && !arena.isLearned(second)) this.setNotLearned(first);
1141
+ if (arena.isLearned(first) && !arena.isLearned(second)) arena.setLearned(first, false);
1168
1142
  this.removeClause(second);
1169
- this.numSubsumed++;
1170
1143
  }
1171
1144
  }
1172
1145
 
@@ -1217,7 +1190,7 @@ export class Simplifier {
1217
1190
  const oldTrailSize = solver.trail.length;
1218
1191
  const numClauses = solver.clauses.length;
1219
1192
  solver.assignScoped(lit);
1220
- solver.propagateCore(false);
1193
+ solver.propagate(false);
1221
1194
  if (solver.isInconsistent) return;
1222
1195
  const newTrailSize = solver.trail.length;
1223
1196
  for (let index = oldTrailSize; index < newTrailSize; index++) {
@@ -1236,7 +1209,6 @@ export class Simplifier {
1236
1209
  const solver = this.solver;
1237
1210
  const arena = solver.arena;
1238
1211
  this.isNeedingCleanup = true;
1239
- this.numElimLits++;
1240
1212
  this.insertElimTodo(lit >> 1);
1241
1213
  arena.elim(clause, lit);
1242
1214
  this.useList.eraseNotRemoved(lit, clause);
@@ -1298,7 +1270,6 @@ export class Simplifier {
1298
1270
 
1299
1271
  private elimDupBins() {
1300
1272
  const solver = this.solver;
1301
- let numElim = 0;
1302
1273
  for (const wlist of solver.watches) {
1303
1274
  solver.checkpoint();
1304
1275
  const size = wlist.size;
@@ -1315,10 +1286,7 @@ export class Simplifier {
1315
1286
  const val1 = data[2 * index];
1316
1287
  const val2 = data[2 * index + 1];
1317
1288
  if ((val2 & 3) === 0) {
1318
- if (val1 === lastLit) {
1319
- numElim++;
1320
- continue;
1321
- }
1289
+ if (val1 === lastLit) continue;
1322
1290
  lastLit = val1;
1323
1291
  }
1324
1292
  wlist.data[2 * next] = val1;
@@ -1327,7 +1295,6 @@ export class Simplifier {
1327
1295
  }
1328
1296
  wlist.setEnd(next);
1329
1297
  }
1330
- this.numSubsumed += Math.trunc(numElim / 2);
1331
1298
  }
1332
1299
 
1333
1300
  private subsume() {
@@ -1390,14 +1357,6 @@ export class Simplifier {
1390
1357
  }
1391
1358
  }
1392
1359
 
1393
- private numNonlearnedBin(lit: number) {
1394
- const wlist = this.solver.watches[lit ^ 1];
1395
- let count = 0;
1396
- for (let index = 0; index < wlist.size; index++)
1397
- if (wlist.isBinary(index) && !wlist.isLearned(index)) count++;
1398
- return count;
1399
- }
1400
-
1401
1360
  private orderVarsForElim() {
1402
1361
  const solver = this.solver;
1403
1362
  const sizes = this.useList.size;
@@ -1409,8 +1368,8 @@ export class Simplifier {
1409
1368
  if (solver.valueVar(boolVar) !== L_UNDEF) continue;
1410
1369
  const numPos = sizes[2 * boolVar];
1411
1370
  const numNeg = sizes[2 * boolVar + 1];
1412
- const numBinPos = this.numNonlearnedBin(2 * boolVar);
1413
- const numBinNeg = this.numNonlearnedBin(2 * boolVar + 1);
1371
+ const numBinPos = solver.watches[2 * boolVar + 1].numNonlearnedBin();
1372
+ const numBinNeg = solver.watches[2 * boolVar].numNonlearnedBin();
1414
1373
  costs[boolVar] =
1415
1374
  (Math.imul(2 * numPos, numNeg) +
1416
1375
  Math.imul(numPos, numBinNeg) +
@@ -1536,8 +1495,8 @@ export class Simplifier {
1536
1495
  if (solver.valueVar(boolVar) !== L_UNDEF) return false;
1537
1496
  const posLit = 2 * boolVar;
1538
1497
  const negLit = 2 * boolVar + 1;
1539
- const numBinPos = this.numNonlearnedBin(posLit);
1540
- const numBinNeg = this.numNonlearnedBin(negLit);
1498
+ const numBinPos = solver.watches[negLit].numNonlearnedBin();
1499
+ const numBinNeg = solver.watches[posLit].numNonlearnedBin();
1541
1500
  const numPos = this.useList.numIrredundant(posLit) + numBinPos;
1542
1501
  const numNeg = this.useList.numIrredundant(negLit) + numBinNeg;
1543
1502
  if (numPos >= this.resOccCutoff && numNeg >= this.resOccCutoff) return false;
@@ -6,7 +6,7 @@ import { RandomGen } from "../random-gen";
6
6
  import type { ResourceLimit } from "../rlimit";
7
7
  import { AsymmBranch } from "./asymm-branch";
8
8
  import { Cleaner } from "./cleaner";
9
- import { ClauseArena, NULL_LITERAL } from "./clause";
9
+ import { ClauseArena, NULL_LITERAL, UINT_MAX } from "./clause";
10
10
  import {
11
11
  GC_DYN_PSM,
12
12
  GC_GLUE,
@@ -68,9 +68,9 @@ export interface SatExtension {
68
68
  flushRoots(): void;
69
69
  initUseList(useVars: Set<number>): void;
70
70
  findMutexes(lits: number[], mutexes: number[][]): void;
71
+ toFormulas(lit2expr: (lit: number) => number, formulas: number[]): void;
71
72
  }
72
73
 
73
- const UINT_MAX = 4294967295;
74
74
  const RANDOM_MAX_VALUE = 0x7fff;
75
75
 
76
76
  const S_SAT = 0;
@@ -124,7 +124,7 @@ const sortClauses = (clauses: number[], isLess: (first: number, second: number)
124
124
 
125
125
  export class Solver {
126
126
  config: SatConfig;
127
- rand = new RandomGen(0);
127
+ rand: RandomGen;
128
128
  arena = new ClauseArena();
129
129
  cleaner: Cleaner;
130
130
  mc = new ModelConverter();
@@ -156,7 +156,6 @@ export class Solver {
156
156
  private varCount = 0;
157
157
  justVal: number[] = [];
158
158
  justKind: number[] = [];
159
- decision: boolean[] = [];
160
159
  mark: boolean[] = [];
161
160
  litMark: boolean[] = [];
162
161
  eliminated: boolean[] = [];
@@ -216,7 +215,7 @@ export class Solver {
216
215
  isSimplifyEnabled = true;
217
216
  isRestartEnabled = true;
218
217
  lemma: number[] = [];
219
- private incremental = false;
218
+ private incremental: boolean;
220
219
  private assumptions: number[] = [];
221
220
  private assumptionSet = new Set<number>();
222
221
  readonly userScopeLiterals: number[] = [];
@@ -240,7 +239,7 @@ export class Solver {
240
239
  this.asymmBranch = new AsymmBranch(this, params);
241
240
  this.probing = new Probing(this, params);
242
241
  this.updateParams();
243
- this.mkVar(false, false);
242
+ this.mkVar(false);
244
243
  }
245
244
 
246
245
  private updateParams() {
@@ -333,7 +332,7 @@ export class Solver {
333
332
  }
334
333
  }
335
334
 
336
- mkVar(isExternal: boolean, isDecision: boolean) {
335
+ mkVar(isExternal: boolean) {
337
336
  this.isModelCurrent = false;
338
337
  const boolVar = this.varCount++;
339
338
  this.activeVars.push(boolVar);
@@ -349,7 +348,6 @@ export class Solver {
349
348
  this.justLevel[boolVar] = UINT_MAX;
350
349
  this.justVal.push(0);
351
350
  this.justKind.push(JUSTIFICATION_NONE);
352
- this.decision.push(isDecision);
353
351
  this.eliminated.push(false);
354
352
  this.external.push(isExternal);
355
353
  this.varScope.push(this.scopeLvl);
@@ -401,10 +399,7 @@ export class Solver {
401
399
  }
402
400
 
403
401
  mkClauseCore(lits: number[], isRedundant: boolean, isTheory = false): number {
404
- if (!isRedundant || isTheory) {
405
- if (!this.simplifyClause(lits)) return -1;
406
- if (!this.isSearching) this.mc.addClause(lits);
407
- }
402
+ if ((!isRedundant || isTheory) && !this.simplifyClause(lits)) return -1;
408
403
  switch (lits.length) {
409
404
  case 0:
410
405
  this.setConflict();
@@ -722,7 +717,7 @@ export class Solver {
722
717
  this.trail.push(lit);
723
718
  }
724
719
 
725
- propagateCore(isUpdating: boolean) {
720
+ propagate(isUpdating: boolean) {
726
721
  if (this.isExtPropagating()) this.ext?.unitPropagate?.();
727
722
  while (this.qhead < this.trail.length && !this.isInconsistent) {
728
723
  do {
@@ -737,10 +732,6 @@ export class Solver {
737
732
  return !this.isInconsistent;
738
733
  }
739
734
 
740
- propagate(isUpdating: boolean) {
741
- return this.propagateCore(isUpdating);
742
- }
743
-
744
735
  private propagateClause(clause: number, isUpdating: boolean, assignLevel: number, first: number) {
745
736
  const arena = this.arena;
746
737
  arena.markUsed(clause);
@@ -1082,6 +1073,14 @@ export class Solver {
1082
1073
  this.reasonUnknown = "sat.canceled";
1083
1074
  return true;
1084
1075
  }
1076
+ if (this.config.restartMax <= this.restarts) {
1077
+ this.reasonUnknown = "sat.max.restarts";
1078
+ return true;
1079
+ }
1080
+ if (this.config.inprocessMax <= this.simplifications) {
1081
+ this.reasonUnknown = "sat.max.inprocess";
1082
+ return true;
1083
+ }
1085
1084
  return this.reachedMaxConflicts();
1086
1085
  }
1087
1086
 
@@ -1831,7 +1830,7 @@ export class Solver {
1831
1830
  // variables, the scope variable is the last one.
1832
1831
  userPush() {
1833
1832
  this.popToBaseLevel();
1834
- this.userScopeLiterals.push(2 * this.mkVar(true, false));
1833
+ this.userScopeLiterals.push(2 * this.mkVar(true));
1835
1834
  this.ext?.userPush?.();
1836
1835
  }
1837
1836
 
@@ -1844,7 +1843,10 @@ export class Solver {
1844
1843
  this.ext?.userPop?.(numScopes);
1845
1844
  this.gcVars(maxVar);
1846
1845
  this.qhead = 0;
1846
+ const wasSuspended = this.limit.isSuspended;
1847
+ this.limit.isSuspended = true;
1847
1848
  this.propagate(false);
1849
+ this.limit.isSuspended = wasSuspended;
1848
1850
  }
1849
1851
 
1850
1852
  // gc_vars: drop the variables from maxVar on, with their watches and clauses.
@@ -1903,7 +1905,6 @@ export class Solver {
1903
1905
  for (const values of [
1904
1906
  this.justVal,
1905
1907
  this.justKind,
1906
- this.decision,
1907
1908
  this.eliminated,
1908
1909
  this.external,
1909
1910
  this.varScope,
@@ -66,6 +66,13 @@ export class WatchList {
66
66
  : this.data[2 * index + 1] & ~4;
67
67
  }
68
68
 
69
+ numNonlearnedBin() {
70
+ let count = 0;
71
+ for (let index = 0; index < this.size; index++)
72
+ if (this.isBinary(index) && !this.isLearned(index)) count++;
73
+ return count;
74
+ }
75
+
69
76
  getClause(index: number) {
70
77
  return this.data[2 * index];
71
78
  }
@@ -444,13 +444,14 @@ const getEmptyReSignature = (
444
444
  kind: number,
445
445
  op: number,
446
446
  reglanName: string,
447
+ domain: readonly number[],
447
448
  range: number | undefined,
448
449
  ) => {
449
450
  const reglan = manager.mkReSort(manager.mkStringSort());
450
451
  const rng = range ?? reglan;
451
- if (rng !== reglan) return mkSignature(op, getPsig(op).name, [], rng);
452
- const matched = match(manager, getPsig(kind), [], rng);
453
- return typeof matched === "string" ? matched : mkSignature(op, reglanName, [], matched);
452
+ if (kind === op && rng !== reglan) return mkSignature(op, getPsig(op).name, domain, rng);
453
+ const matched = match(manager, getPsig(kind), domain, rng);
454
+ return typeof matched === "string" ? matched : mkSignature(op, reglanName, domain, matched);
454
455
  };
455
456
 
456
457
  const getCharSignature = (
@@ -570,10 +571,10 @@ export const getSeqSignature = (
570
571
  }
571
572
  case OP_INTERNAL_REGEXP_FULL_CHAR:
572
573
  case OP_RE_FULL_CHAR_SET:
573
- return getEmptyReSignature(manager, kind, OP_RE_FULL_CHAR_SET, "re.allchar", range);
574
+ return getEmptyReSignature(manager, kind, OP_RE_FULL_CHAR_SET, "re.allchar", domain, range);
574
575
  case OP_INTERNAL_REGEXP_EMPTY:
575
576
  case OP_RE_EMPTY_SET:
576
- return getEmptyReSignature(manager, kind, OP_RE_EMPTY_SET, "re.none", range);
577
+ return getEmptyReSignature(manager, kind, OP_RE_EMPTY_SET, "re.none", domain, range);
577
578
  case OP_RE_FULL_SEQ_SET:
578
579
  return mkSignature(kind, "re.all", domain, range ?? manager.mkReSort(manager.mkStringSort()));
579
580
  case OP_RE_LOOP: {
@@ -773,8 +774,7 @@ export const isBinaryApp = (manager: AstManager, expr: number, op: number) =>
773
774
 
774
775
  export const getConcat = (manager: AstManager, expr: number, result: number[]) => {
775
776
  const todo = [expr];
776
- while (todo.length > 0) {
777
- const current = todo.pop()!;
777
+ for (let current = todo.pop(); current !== undefined; current = todo.pop()) {
778
778
  if (isBinaryApp(manager, current, OP_SEQ_CONCAT)) {
779
779
  todo.push(manager.getArg(current, 1), manager.getArg(current, 0));
780
780
  continue;
@@ -177,7 +177,8 @@ export class Derive {
177
177
  }
178
178
 
179
179
  private reset() {
180
- for (const cache of [...this.caches, ...this.topCaches]) cache.clear();
180
+ // Deviation from Z3: the xor caches go too, as the trail was all that kept their results alive.
181
+ for (const cache of [...this.caches, ...this.topCaches, ...this.xorCaches]) cache.clear();
181
182
  this.resetOpCaches();
182
183
  this.trail.reset();
183
184
  this.element = assign(this.manager, this.element, -1);
@@ -639,8 +640,7 @@ export class Derive {
639
640
  if (isFullSeq(manager, first) || isFullSeq(manager, second)) return mkFullSeq(manager, sort);
640
641
  const elements: number[] = [];
641
642
  const todo = [second, first];
642
- while (todo.length > 0) {
643
- const expr = todo.pop()!;
643
+ for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
644
644
  if (isReBinary(manager, expr, OP_RE_UNION)) {
645
645
  todo.push(manager.getArg(expr, 1), manager.getArg(expr, 0));
646
646
  continue;
@@ -1248,6 +1248,7 @@ export class Derive {
1248
1248
  const elementSort = manager.getSeqElementSort(manager.getReSeqSort(manager.sorts[regex]));
1249
1249
  const element = manager.mkVar(0, elementSort);
1250
1250
  const derivative = this.derive(DERIVATIVE_BRZOZOWSKI, element, regex);
1251
+ // Deviation from Z3: a cached derivative leaves m_ele null there, which stops the pruning.
1251
1252
  this.getCofactors(element, derivative, result);
1252
1253
  }
1253
1254
 
@@ -1271,8 +1272,7 @@ export class Derive {
1271
1272
  for (let pair = 0; pair < brzozowski.size; pair += 2) {
1272
1273
  const guard = brzozowski.items[pair];
1273
1274
  const pending = [brzozowski.items[pair + 1]];
1274
- while (pending.length > 0) {
1275
- const target = pending.pop()!;
1275
+ for (let target = pending.pop(); target !== undefined; target = pending.pop()) {
1276
1276
  if (isReBinary(manager, target, OP_RE_UNION)) {
1277
1277
  pending.push(manager.getArg(target, 1), manager.getArg(target, 0));
1278
1278
  continue;
@@ -1286,8 +1286,7 @@ export class Derive {
1286
1286
  }
1287
1287
  const tail = manager.getArg(target, 1);
1288
1288
  const heads = [manager.getArg(target, 0)];
1289
- while (heads.length > 0) {
1290
- const current = heads.pop()!;
1289
+ for (let current = heads.pop(); current !== undefined; current = heads.pop()) {
1291
1290
  if (isReBinary(manager, current, OP_RE_UNION))
1292
1291
  heads.push(manager.getArg(current, 1), manager.getArg(current, 0));
1293
1292
  else add(guard, this.re.mkReAppend(current, tail));
@@ -311,7 +311,7 @@ export class SeqEqSolver {
311
311
  }
312
312
 
313
313
  private matchTernaryEqR(ls: readonly number[], rs: readonly number[]): TernaryEq | undefined {
314
- if (ls.length <= 1 || rs.length <= 1 || !this.isVar(rs[0]) || !this.isVar(rs.at(-1)!))
314
+ if (ls.length <= 1 || rs.length <= 1 || !this.isVar(rs[0]) || !this.isVar(rs[rs.length - 1]))
315
315
  return undefined;
316
316
  const numLsUnits = this.countUnitsR2l(ls, ls.length - 1);
317
317
  if (numLsUnits === 0 || numLsUnits === ls.length) return undefined;
@@ -334,7 +334,7 @@ export class SeqEqSolver {
334
334
  }
335
335
 
336
336
  private matchTernaryEqL(ls: readonly number[], rs: readonly number[]): TernaryEq | undefined {
337
- if (ls.length <= 1 || rs.length <= 1 || !this.isVar(rs[0]) || !this.isVar(rs.at(-1)!))
337
+ if (ls.length <= 1 || rs.length <= 1 || !this.isVar(rs[0]) || !this.isVar(rs[rs.length - 1]))
338
338
  return undefined;
339
339
  const numLsUnits = this.countUnitsL2r(ls, 0);
340
340
  if (numLsUnits === 0 || numLsUnits === ls.length) return undefined;
@@ -360,11 +360,11 @@ export class SeqEqSolver {
360
360
  ls.length > 1 &&
361
361
  this.isVar(ls[0]) &&
362
362
  rs.length > 1 &&
363
- this.isVar(rs.at(-1)!) &&
363
+ this.isVar(rs[rs.length - 1]) &&
364
364
  ls.slice(1).every((expr) => this.isUnit(expr)) &&
365
365
  rs.slice(0, -1).every((expr) => this.isUnit(expr))
366
366
  )
367
- return { x: ls[0], y: rs.at(-1)!, xs: ls.slice(1), ys: rs.slice(0, -1) };
367
+ return { x: ls[0], y: rs[rs.length - 1], xs: ls.slice(1), ys: rs.slice(0, -1) };
368
368
  return undefined;
369
369
  }
370
370
 
@@ -380,10 +380,10 @@ export class SeqEqSolver {
380
380
  if (
381
381
  ls.length <= 1 ||
382
382
  !this.isVar(ls[0]) ||
383
- !this.isVar(ls.at(-1)!) ||
383
+ !this.isVar(ls[ls.length - 1]) ||
384
384
  rs.length <= 1 ||
385
385
  !this.isVar(rs[0]) ||
386
- !this.isVar(rs.at(-1)!)
386
+ !this.isVar(rs[rs.length - 1])
387
387
  )
388
388
  return undefined;
389
389
  const lsNonUnit = this.countNonUnitsL2r(ls, 0);
@@ -404,7 +404,7 @@ export class SeqEqSolver {
404
404
 
405
405
  canAlignFromLhs(ls: readonly number[], rs: readonly number[]) {
406
406
  const manager = this.manager;
407
- const last = rs.at(-1)!;
407
+ const last = rs[rs.length - 1];
408
408
  for (let index = 0; index < ls.length; index++) {
409
409
  if (manager.areDistinct(ls[index], last)) continue;
410
410
  if (index === 0) return true;
@@ -2,6 +2,7 @@
2
2
  // src/ast/rewriter/seq_range_collapse.cpp), MIT license, see z3-license.txt.
3
3
  import {
4
4
  type AstManager,
5
+ FAMILY_CHAR,
5
6
  OP_AND,
6
7
  OP_CHAR_LE,
7
8
  OP_EQ,
@@ -10,6 +11,7 @@ import {
10
11
  OP_RE_COMPLEMENT,
11
12
  OP_RE_DIFF,
12
13
  OP_RE_INTERSECT,
14
+ OP_RE_OF_PRED,
13
15
  OP_SEQ_UNIT,
14
16
  OP_RE_RANGE,
15
17
  OP_RE_UNION,
@@ -202,7 +204,18 @@ export const regexToRangePredicate = (
202
204
  const pair = getPair(first, second);
203
205
  return pair === undefined ? undefined : intersectRanges(pair[0], pair[1]);
204
206
  }
205
- return undefined;
207
+ if (!isReUnary(manager, regex, OP_RE_OF_PRED) || !manager.isLambda(manager.getArg(regex, 0)))
208
+ return undefined;
209
+ const lambda = manager.getQuantifier(manager.getArg(regex, 0));
210
+ if (lambda.sorts.length !== 1) return undefined;
211
+ const variable = manager.mkVar(0, lambda.sorts[0]);
212
+ manager.incRef(variable);
213
+ const ranges =
214
+ manager.getSortFamily(lambda.sorts[0]) === FAMILY_CHAR
215
+ ? guardToRangePredicate(manager, variable, lambda.body)
216
+ : undefined;
217
+ manager.decRef(variable);
218
+ return ranges;
206
219
  };
207
220
 
208
221
  export const rangePredicateToRegex = (
@@ -50,7 +50,6 @@ import {
50
50
  uniteRanges,
51
51
  } from "./seq-range-predicate";
52
52
  import { RegexBisim } from "./seq-regex-bisim";
53
- import { RegexWitness } from "./seq-regex-witness";
54
53
  import {
55
54
  UINT_MAX,
56
55
  canBeMember,
@@ -771,8 +770,7 @@ export class ReRewriter {
771
770
  };
772
771
  const isEveryInterArmEndingWithFullSeq = (regex: number) => {
773
772
  const todo = [regex];
774
- while (todo.length > 0) {
775
- const current = todo.pop()!;
773
+ for (let current = todo.pop(); current !== undefined; current = todo.pop()) {
776
774
  const split = this.getSplit(current, OP_RE_INTERSECT);
777
775
  if (split !== undefined) todo.push(split.head, split.tail);
778
776
  else if (!isEndingWithFullSeq(current)) return false;
@@ -1170,11 +1168,4 @@ export class ReRewriter {
1170
1168
  ? manager.falseExpr
1171
1169
  : undefined;
1172
1170
  }
1173
-
1174
- someStringInRe(regex: number) {
1175
- const witness = new RegexWitness(this.manager, this);
1176
- const result = witness.getWitness(regex);
1177
- witness.release();
1178
- return result;
1179
- }
1180
1171
  }
@@ -651,8 +651,7 @@ const getLengthShape = (manager: AstManager, seq: number) => {
651
651
  let stride = 0;
652
652
  const multiplicities = new Map<number, number>();
653
653
  const todo = [seq];
654
- while (todo.length > 0) {
655
- const expr = todo.pop()!;
654
+ for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
656
655
  if (isBinaryApp(manager, expr, OP_SEQ_CONCAT)) {
657
656
  todo.push(manager.getArg(expr, 0), manager.getArg(expr, 1));
658
657
  continue;
@@ -59,7 +59,7 @@ export class RegexBisim {
59
59
  return (
60
60
  manager.isReSort(manager.sorts[regex]) &&
61
61
  this.info.getInfo(regex).isKnown &&
62
- manager.isGround(regex)
62
+ manager.isGroundApp(regex)
63
63
  );
64
64
  }
65
65
 
@@ -76,8 +76,7 @@ export class LiveStates {
76
76
 
77
77
  private markLive(search: LiveSearch, start: number) {
78
78
  const todo = [start];
79
- while (todo.length > 0) {
80
- const id = todo.pop()!;
79
+ for (let id = todo.pop(); id !== undefined; id = todo.pop()) {
81
80
  if (!search.seen.has(id) || search.live[id]) continue;
82
81
  search.live[id] = true;
83
82
  search.liveFrontier.push(id);
@@ -175,8 +174,9 @@ export class LiveStates {
175
174
  if (target === -1) this.membershipSearches.set(state, search);
176
175
  else {
177
176
  search.targetId = this.intern(target);
178
- if (!this.reachSearches.has(state)) this.reachSearches.set(state, new Map());
179
- this.reachSearches.get(state)!.set(target, search);
177
+ const searches = this.reachSearches.get(state);
178
+ if (searches === undefined) this.reachSearches.set(state, new Map([[target, search]]));
179
+ else searches.set(target, search);
180
180
  }
181
181
  this.addState(search, search.rootId);
182
182
  return search;
@@ -71,6 +71,7 @@ import {
71
71
  import { mkBvApp } from "./bv-decl-plugin";
72
72
  import { getCompositeHash } from "./hash";
73
73
  import { ObjMap } from "./hashtable";
74
+ import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
74
75
  import type { Rewrite } from "./rewriter-tpl";
75
76
  import {
76
77
  getConcat,
@@ -99,10 +100,6 @@ const SIGN_ZERO = 0;
99
100
  const SIGN_POS = 1;
100
101
  const SIGN_NEG = 2;
101
102
 
102
- const L_FALSE = -1;
103
- const L_UNDEF = 0;
104
- const L_TRUE = 1;
105
-
106
103
  const NON_LIFTING_OPS = new Set([
107
104
  OP_SEQ_EMPTY,
108
105
  OP_RE_EMPTY_SET,