tla-ts 0.0.10-dev.09e53c2a6 → 0.0.10-dev.11307be75

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 (214) 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 +2 -1
  7. package/dist/index.d.ts +2 -1
  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 +43 -43
  14. package/dist/prove.js +78 -78
  15. package/dist/run.cjs +33 -35
  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 +38 -38
  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 +46 -28
  26. package/src/check-trace.ts +2 -16
  27. package/src/check.ts +152 -64
  28. package/src/cli/runtime-invariants.ts +20 -56
  29. package/src/cli/tlc-arguments.ts +2 -2
  30. package/src/cli/tlc-output.ts +1 -2
  31. package/src/cli/tlc.ts +13 -8
  32. package/src/cli/xml-exporter.ts +1 -1
  33. package/src/codegen.ts +9 -5
  34. package/src/dependencies.ts +49 -9
  35. package/src/dfid.ts +9 -2
  36. package/src/environment.ts +57 -33
  37. package/src/errors.ts +7 -0
  38. package/src/evaluate.ts +92 -32
  39. package/src/exit-codes.ts +4 -2
  40. package/src/instances.ts +5 -5
  41. package/src/java-overrides.ts +2 -2
  42. package/src/levels.ts +138 -90
  43. package/src/liveness-checker.ts +43 -4
  44. package/src/liveness.ts +1 -1
  45. package/src/obligations/index.ts +1 -1
  46. package/src/obligations/normalize.ts +1 -4
  47. package/src/obligations/printer.ts +5 -5
  48. package/src/parallel-worker.ts +8 -2
  49. package/src/parallel.ts +5 -0
  50. package/src/parser.ts +106 -144
  51. package/src/prover/isabelle/isar/attrib.ts +4 -4
  52. package/src/prover/isabelle/isar/rule-cases.ts +8 -6
  53. package/src/prover/isabelle/provers/clasimp.ts +1 -1
  54. package/src/prover/isabelle/provers/hypsubst.ts +2 -2
  55. package/src/prover/isabelle/pure/rewriter.ts +3 -3
  56. package/src/prover/isabelle/pure/term.ts +3 -3
  57. package/src/prover/prep/md5.ts +26 -29
  58. package/src/prover/smt/rewrite.ts +2 -7
  59. package/src/prover/smt/simplify.ts +1 -1
  60. package/src/prover/smt/solver/asserted-formulas.ts +66 -1
  61. package/src/prover/smt/solver/ast-lt.ts +1 -1
  62. package/src/prover/smt/solver/ast.ts +58 -11
  63. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  64. package/src/prover/smt/solver/bound-simplifier.ts +2 -3
  65. package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
  66. package/src/prover/smt/solver/bv-rewriter.ts +1 -1
  67. package/src/prover/smt/solver/card2bv.ts +3 -5
  68. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +2 -3
  69. package/src/prover/smt/solver/context.ts +24 -3
  70. package/src/prover/smt/solver/ctx-simplify.ts +1 -2
  71. package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
  72. package/src/prover/smt/solver/dependent-expr-state.ts +9 -4
  73. package/src/prover/smt/solver/diff-neq.ts +1 -2
  74. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  75. package/src/prover/smt/solver/elim-uncnstr.ts +4 -7
  76. package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
  77. package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
  78. package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
  79. package/src/prover/smt/solver/euf/egraph.ts +4 -10
  80. package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
  81. package/src/prover/smt/solver/euf/mam.ts +1 -5
  82. package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
  83. package/src/prover/smt/solver/euf/th-solver.ts +0 -7
  84. package/src/prover/smt/solver/expr2polynomial.ts +204 -79
  85. package/src/prover/smt/solver/factor.ts +36 -14
  86. package/src/prover/smt/solver/fd-solver.ts +2 -0
  87. package/src/prover/smt/solver/fix-dl-var.ts +1 -2
  88. package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
  89. package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
  90. package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
  91. package/src/prover/smt/solver/goal.ts +6 -3
  92. package/src/prover/smt/solver/goal2nlsat.ts +57 -30
  93. package/src/prover/smt/solver/hashtable.ts +4 -0
  94. package/src/prover/smt/solver/logic-tactics.ts +9 -2
  95. package/src/prover/smt/solver/lp/containers.ts +7 -1
  96. package/src/prover/smt/solver/lp/cross-nested.ts +1 -3
  97. package/src/prover/smt/solver/lp/lp-settings.ts +1 -1
  98. package/src/prover/smt/solver/lp/nex-creator.ts +3 -2
  99. package/src/prover/smt/solver/lp/nex.ts +2 -1
  100. package/src/prover/smt/solver/lp/nla-core.ts +1 -1
  101. package/src/prover/smt/solver/lp/nla-grobner.ts +158 -80
  102. package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
  103. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -2
  104. package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -20
  105. package/src/prover/smt/solver/lp/pdd-solver.ts +72 -39
  106. package/src/prover/smt/solver/lp/pdd.ts +725 -290
  107. package/src/prover/smt/solver/lp/union-find.ts +1 -1
  108. package/src/prover/smt/solver/mam-compiler.ts +1 -1
  109. package/src/prover/smt/solver/model-based-opt.ts +1 -1
  110. package/src/prover/smt/solver/model-generator.ts +3 -1
  111. package/src/prover/smt/solver/mpf.ts +2 -4
  112. package/src/prover/smt/solver/mus.ts +2 -3
  113. package/src/prover/smt/solver/muz/dl-context.ts +10 -4
  114. package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
  115. package/src/prover/smt/solver/muz/dl-rule.ts +2 -2
  116. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
  117. package/src/prover/smt/solver/muz/horn-tactic.ts +1 -1
  118. package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
  119. package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
  120. package/src/prover/smt/solver/nlqsat.ts +1 -1
  121. package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
  122. package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
  123. package/src/prover/smt/solver/nlsat/explain.ts +375 -217
  124. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
  125. package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
  126. package/src/prover/smt/solver/nlsat/solver.ts +74 -64
  127. package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
  128. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
  129. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
  130. package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
  131. package/src/prover/smt/solver/nnf.ts +6 -2
  132. package/src/prover/smt/solver/opt-context.ts +9 -3
  133. package/src/prover/smt/solver/opt-nlsat.ts +29 -18
  134. package/src/prover/smt/solver/opt-preprocess.ts +1 -1
  135. package/src/prover/smt/solver/opt-solver.ts +6 -3
  136. package/src/prover/smt/solver/optsmt.ts +1 -1
  137. package/src/prover/smt/solver/pb-rewriter.ts +1 -4
  138. package/src/prover/smt/solver/poly-rewriter.ts +74 -18
  139. package/src/prover/smt/solver/probes.ts +88 -23
  140. package/src/prover/smt/solver/proto-model.ts +4 -6
  141. package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
  142. package/src/prover/smt/solver/qe-lite.ts +2 -2
  143. package/src/prover/smt/solver/qe.ts +3 -2
  144. package/src/prover/smt/solver/quantifier-manager.ts +14 -9
  145. package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
  146. package/src/prover/smt/solver/rlimit.ts +4 -0
  147. package/src/prover/smt/solver/sat/config.ts +1 -1
  148. package/src/prover/smt/solver/sat/inc-sat-solver.ts +26 -1
  149. package/src/prover/smt/solver/sat/model-converter.ts +1 -1
  150. package/src/prover/smt/solver/sat/pb-solver.ts +1 -1
  151. package/src/prover/smt/solver/sat/sat-tactic.ts +4 -3
  152. package/src/prover/smt/solver/sat/simplifier.ts +1 -1
  153. package/src/prover/smt/solver/sat/solver.ts +25 -47
  154. package/src/prover/smt/solver/seq-axioms.ts +20 -35
  155. package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
  156. package/src/prover/smt/solver/seq-derive.ts +4 -7
  157. package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
  158. package/src/prover/smt/solver/seq-monadic.ts +7 -5
  159. package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
  160. package/src/prover/smt/solver/seq-re-util.ts +1 -1
  161. package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
  162. package/src/prover/smt/solver/seq-regex-live.ts +2 -2
  163. package/src/prover/smt/solver/seq-rewriter.ts +31 -29
  164. package/src/prover/smt/solver/seq-skolem.ts +0 -23
  165. package/src/prover/smt/solver/seq-view-witness.ts +4 -4
  166. package/src/prover/smt/solver/smt-kernel.ts +9 -3
  167. package/src/prover/smt/solver/smt-setup.ts +68 -6
  168. package/src/prover/smt/solver/smtlib-parser.ts +558 -220
  169. package/src/prover/smt/solver/smtlib-script.ts +495 -153
  170. package/src/prover/smt/solver/solve-eqs.ts +13 -21
  171. package/src/prover/smt/solver/tactic.ts +219 -130
  172. package/src/prover/smt/solver/theory-bv.ts +2 -2
  173. package/src/prover/smt/solver/theory-lra-final-check.ts +1 -1
  174. package/src/prover/smt/solver/theory-lra-internalize.ts +1 -0
  175. package/src/prover/smt/solver/theory-lra-propagate.ts +6 -4
  176. package/src/prover/smt/solver/theory-lra.ts +0 -1
  177. package/src/prover/smt/solver/theory-pb.ts +24 -7
  178. package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
  179. package/src/prover/smt/solver/theory-seq-state.ts +2 -21
  180. package/src/prover/tlapm/cache.ts +8 -8
  181. package/src/prover/zenon/equality-rules.ts +24 -0
  182. package/src/prover/zenon/expr.ts +21 -0
  183. package/src/prover/zenon/index-table.ts +7 -2
  184. package/src/prover/zenon/isar-case.ts +1 -1
  185. package/src/prover/zenon/isar.ts +2 -2
  186. package/src/prover/zenon/phrase.ts +1 -1
  187. package/src/prover/zenon/rules.ts +2 -1
  188. package/src/resolve.ts +779 -225
  189. package/src/runtime.ts +3 -1
  190. package/src/sany/builtins.ts +10 -10
  191. package/src/sany/generation.ts +2 -13
  192. package/src/sany/generator-definitions.ts +3 -1
  193. package/src/sany/generator-expressions.ts +36 -30
  194. package/src/sany/generator-proofs.ts +5 -3
  195. package/src/sany/generator.ts +2 -1
  196. package/src/sany/lexer.ts +3 -3
  197. package/src/sany/modules.ts +4 -2
  198. package/src/sany/nodes.ts +1 -1
  199. package/src/sany/selectors.ts +11 -6
  200. package/src/sany/xml.ts +2 -3
  201. package/src/search.ts +51 -22
  202. package/src/spec-description.ts +2 -2
  203. package/src/subexpressions.ts +337 -102
  204. package/src/successors.ts +1 -0
  205. package/src/symmetry.ts +1 -1
  206. package/src/tlc/jar-data.ts +10 -0
  207. package/src/tlc/messages.ts +3 -3
  208. package/src/tlc/order.ts +14 -3
  209. package/src/tlc/tlc-operators.ts +3 -1
  210. package/src/tlc/tlcext-operators.ts +18 -5
  211. package/src/tlc/trace-spec.ts +5 -5
  212. package/src/typed-tier.ts +29 -23
  213. package/src/typescript/types.ts +2 -2
  214. package/src/values.ts +46 -27
@@ -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 },
@@ -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;
@@ -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,7 @@ interface Scope {
24
25
  readonly converters: Goal["converters"];
25
26
  readonly fmlsSize: number;
26
27
  readonly fmlsHead: number;
28
+ readonly namesSize: number;
27
29
  }
28
30
 
29
31
  export class IncSatSolver {
@@ -31,6 +33,7 @@ export class IncSatSolver {
31
33
  private readonly goal2sat: Goal2Sat;
32
34
  private readonly fmls: RefVector;
33
35
  private fmlsHead = 0;
36
+ private readonly names: RefVector;
34
37
  private isCnf = true;
35
38
  private readonly core: RefVector;
36
39
  private dep2asm = new Map<number, number>();
@@ -62,6 +65,7 @@ export class IncSatSolver {
62
65
  );
63
66
  if (mkThSolver !== null) this.goal2sat.ensureEuf();
64
67
  this.fmls = new RefVector(manager);
68
+ this.names = new RefVector(manager);
65
69
  this.core = new RefVector(manager);
66
70
  this.converters = new Goal(manager);
67
71
  this.internalized = new RefVector(manager);
@@ -87,6 +91,24 @@ export class IncSatSolver {
87
91
  this.fmls.push(expr);
88
92
  }
89
93
 
94
+ assertNamed(expr: number, name: number) {
95
+ const manager = this.manager;
96
+ this.names.push(name);
97
+ if (this.isCnf && isLiteral(manager, expr) && isLiteral(manager, name))
98
+ return this.assertExpr(manager.mkApp(OP_OR, [mkNot(manager, name), expr], SORT_BOOL));
99
+ if (
100
+ this.isCnf &&
101
+ manager.getOp(expr) === OP_OR &&
102
+ this.isClause(expr) &&
103
+ isLiteral(manager, name)
104
+ )
105
+ return this.assertExpr(
106
+ manager.mkApp(OP_OR, [mkNot(manager, name), ...manager.getArgs(expr)], SORT_BOOL),
107
+ );
108
+ this.isCnf = false;
109
+ this.assertExpr(manager.mkApp(OP_IMPLIES, [name, expr], SORT_BOOL));
110
+ }
111
+
90
112
  // Outside sat.euf, a scope would also need the scopes of the bit-blaster.
91
113
  push() {
92
114
  if (this.goal2sat.euf === null) throw new SmtUnsupportedError("push on the SAT solver");
@@ -97,6 +119,7 @@ export class IncSatSolver {
97
119
  converters: this.converters.converters,
98
120
  fmlsSize: this.fmls.size,
99
121
  fmlsHead: this.fmlsHead,
122
+ namesSize: this.names.size,
100
123
  });
101
124
  }
102
125
 
@@ -109,6 +132,7 @@ export class IncSatSolver {
109
132
  this.converters.converters = scope.converters;
110
133
  this.fmlsHead = scope.fmlsHead;
111
134
  this.fmls.shrink(scope.fmlsSize);
135
+ this.names.shrink(scope.namesSize);
112
136
  }
113
137
  }
114
138
 
@@ -203,7 +227,7 @@ export class IncSatSolver {
203
227
  this.dep2asm = new Map();
204
228
  const internalized = this.internalizeFormulas();
205
229
  if (internalized !== L_TRUE) return internalized;
206
- this.internalizeAssumptions(literals);
230
+ this.internalizeAssumptions([...literals, ...this.names.items]);
207
231
  this.reasonUnknown = "no reason given";
208
232
  this.isInternalizedConverted = false;
209
233
  const result = this.solver.check(this.asms);
@@ -365,6 +389,7 @@ export class IncSatSolver {
365
389
  for (const model of this.models) model.decRef();
366
390
  this.models = [];
367
391
  this.fmls.reset();
392
+ this.names.reset();
368
393
  this.core.reset();
369
394
  this.internalized.reset();
370
395
  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 };
@@ -2,7 +2,7 @@ import { 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";
@@ -20,10 +20,11 @@ export const createSatTactic =
20
20
  goal2sat.run(goal.forms.items);
21
21
  goal.reset();
22
22
  const result = solver.check();
23
+ if (result === L_UNDEF) goal.reasonUnknown = solver.reasonUnknown;
23
24
  const unhandledFuns = goal2sat.euf?.unhandledFunctions ?? goal2sat.unhandledFuns;
24
25
  if (result === L_FALSE) goal.assert(manager.falseExpr);
25
26
  else if (result === L_TRUE && unhandledFuns.length === 0) {
26
- const model = new ProtoModel(manager);
27
+ const model = new ProtoModel(manager).mkModel();
27
28
  for (const [expr, boolVar] of goal2sat.atoms) {
28
29
  if (!manager.isUninterpretedConst(expr)) continue;
29
30
  const value = solver.model[boolVar];
@@ -31,7 +32,7 @@ export const createSatTactic =
31
32
  else if (value === L_FALSE) model.registerConst(manager.decls[expr], manager.falseExpr);
32
33
  }
33
34
  const euf = goal2sat.euf;
34
- goal.model = (euf?.updateModel(model) ?? model).mkModel();
35
+ goal.model = euf?.updateModel(model) ?? model;
35
36
  euf?.validateModel(goal.model);
36
37
  } else {
37
38
  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)
@@ -74,7 +74,7 @@ const RANDOM_MAX_VALUE = 0x7fff;
74
74
  const S_SAT = 0;
75
75
  const S_UNSAT = 1;
76
76
 
77
- export class Ema {
77
+ class Ema {
78
78
  private beta = 1;
79
79
  value = 0;
80
80
  private period = 0;
@@ -139,7 +139,6 @@ export class Solver {
139
139
  model = new Int8Array(0);
140
140
  isModelCurrent = false;
141
141
  isInconsistent = false;
142
- isSearching = false;
143
142
  conflictJustLevel = 0;
144
143
  conflictLevel = 0;
145
144
  conflictVal = 0;
@@ -147,7 +146,6 @@ export class Solver {
147
146
  notL = NULL_LITERAL;
148
147
  clauses: number[] = [];
149
148
  learned: number[] = [];
150
- numFrozen = 0;
151
149
  watches: WatchList[] = [];
152
150
  assignment = new Int8Array(16);
153
151
  justLevel = new Uint32Array(8);
@@ -196,7 +194,6 @@ export class Solver {
196
194
  scopes: Scope[] = [];
197
195
  core: number[] = [];
198
196
  conflicts = 0;
199
- decisions = 0;
200
197
  conflictsSinceInit = 0;
201
198
  restarts = 0;
202
199
  conflictsSinceRestart = 0;
@@ -392,7 +389,6 @@ export class Solver {
392
389
  }
393
390
 
394
391
  delClause(clause: number) {
395
- if (this.arena.isFrozen(clause)) this.numFrozen--;
396
392
  this.arena.delClause(clause);
397
393
  }
398
394
 
@@ -879,38 +875,33 @@ export class Solver {
879
875
  check(assumptions: readonly number[] = []) {
880
876
  this.reasonUnknown = "no reason given";
881
877
  this.popToBaseLevel();
882
- this.isSearching = true;
883
878
  this.isGivenUp = false;
884
- try {
885
- this.initSearch();
886
- if (this.checkInconsistent()) return L_FALSE;
887
- this.propagate(false);
888
- if (this.checkInconsistent()) return L_FALSE;
889
- this.initAssumptions(assumptions);
890
- this.propagate(false);
879
+ this.initSearch();
880
+ if (this.checkInconsistent()) return L_FALSE;
881
+ this.propagate(false);
882
+ if (this.checkInconsistent()) return L_FALSE;
883
+ this.initAssumptions(assumptions);
884
+ this.propagate(false);
885
+ if (this.checkInconsistent()) return L_FALSE;
886
+ if (this.config.isForcingCleanup) this.doCleanup(true);
887
+ if (this.config.isGcBurst) {
888
+ this.conflictsSinceGc = this.gcThreshold + 1;
889
+ this.doGc();
890
+ }
891
+ if (this.config.isEnablingPreSimplify) {
892
+ this.doSimplify();
891
893
  if (this.checkInconsistent()) return L_FALSE;
892
- if (this.config.isForcingCleanup) this.doCleanup(true);
893
- if (this.config.isGcBurst) {
894
- this.conflictsSinceGc = this.gcThreshold + 1;
895
- this.doGc();
896
- }
897
- if (this.config.isEnablingPreSimplify) {
898
- this.doSimplify();
899
- if (this.checkInconsistent()) return L_FALSE;
900
- }
901
- if (this.config.maxConflicts === 0) return L_UNDEF;
902
- if (this.config.maxConflicts > 0 && this.config.burstSearch > 0) {
903
- this.restartThreshold = this.config.burstSearch;
904
- const result = this.boundedSearch();
905
- if (result !== L_UNDEF || this.isGivenUp) return result;
906
- this.popReinit(this.scopeLvl);
907
- this.conflictsSinceRestart = 0;
908
- this.restartThreshold = this.config.restartInitial;
909
- }
910
- return this.basicSearch();
911
- } finally {
912
- this.isSearching = false;
913
894
  }
895
+ if (this.config.maxConflicts === 0) return L_UNDEF;
896
+ if (this.config.maxConflicts > 0 && this.config.burstSearch > 0) {
897
+ this.restartThreshold = this.config.burstSearch;
898
+ const result = this.boundedSearch();
899
+ if (result !== L_UNDEF || this.isGivenUp) return result;
900
+ this.popReinit(this.scopeLvl);
901
+ this.conflictsSinceRestart = 0;
902
+ this.restartThreshold = this.config.restartInitial;
903
+ }
904
+ return this.basicSearch();
914
905
  }
915
906
 
916
907
  checkInconsistent() {
@@ -1126,7 +1117,6 @@ export class Solver {
1126
1117
  const next = this.nextVar();
1127
1118
  if (next === -1) return false;
1128
1119
  this.push();
1129
- this.decisions++;
1130
1120
  this.assignScoped(2 * next + (this.guess(next) ? 0 : 1));
1131
1121
  return true;
1132
1122
  }
@@ -1932,16 +1922,6 @@ export class Solver {
1932
1922
  this.activityInc >>>= 14;
1933
1923
  }
1934
1924
 
1935
- numClauses() {
1936
- let numClauses = this.trail.length;
1937
- for (let lit = 0; lit < this.watches.length; lit++) {
1938
- const wlist = this.watches[lit];
1939
- for (let index = 0; index < wlist.size; index++)
1940
- if (wlist.isBinary(index) && (lit ^ 1) < wlist.getLiteral(index)) numClauses++;
1941
- }
1942
- return numClauses + this.clauses.length + this.learned.length;
1943
- }
1944
-
1945
1925
  doCleanup(isForced: boolean) {
1946
1926
  if (this.conflictsSinceInit === 0 && !isForced) return false;
1947
1927
  return this.atBaseLvl() && !this.isInconsistent && this.cleaner.run(isForced);
@@ -2063,12 +2043,10 @@ export class Solver {
2063
2043
  this.detachClause(clause);
2064
2044
  arena.inactRounds[clause] = 0;
2065
2045
  arena.setFrozen(clause, true);
2066
- this.numFrozen++;
2067
2046
  }
2068
2047
  }
2069
2048
  } else if (this.psm(clause) <= Math.trunc(arena.size[clause] * this.minDTk)) {
2070
2049
  arena.setFrozen(clause, false);
2071
- this.numFrozen--;
2072
2050
  if (!this.activateFrozenClause(clause)) {
2073
2051
  this.delClause(clause);
2074
2052
  continue;
@@ -1,4 +1,3 @@
1
- import { SmtUnsupportedError } from "../../../errors";
2
1
  import {
3
2
  type AstManager,
4
3
  FAMILY_ARITH,
@@ -24,7 +23,6 @@ import {
24
23
  OP_SEQ_PREFIX,
25
24
  OP_SEQ_UNIT,
26
25
  OP_STRING_FROM_CODE,
27
- OP_STRING_ITOS,
28
26
  OP_STRING_LT,
29
27
  OP_STRING_STOI,
30
28
  OP_STRING_TO_CODE,
@@ -36,7 +34,7 @@ import { FALSE_LITERAL, type Literal, TRUE_LITERAL, negate } from "./literal";
36
34
  import { isBinaryApp, isEmptySeq, mkConcatOf, mkEmptySeq, mkSeqApp } from "./seq-decl-plugin";
37
35
  import { SeqSkolem } from "./seq-skolem";
38
36
 
39
- export interface SeqAxiomsHost {
37
+ interface SeqAxiomsHost {
40
38
  rewrite(expr: number): number;
41
39
  mkEqLiteral(first: number, second: number): Literal;
42
40
  ensureEnode(expr: number): void;
@@ -62,7 +60,7 @@ export const getMinLengthOf = (manager: AstManager, seq: number): number => {
62
60
 
63
61
  const UINT_MAX = 0xffffffff;
64
62
 
65
- export const getMaxLengthOf = (manager: AstManager, seq: number): number => {
63
+ const getMaxLengthOf = (manager: AstManager, seq: number): number => {
66
64
  const getLength = (expr: number) => {
67
65
  if (isEmptySeq(manager, expr)) return 0;
68
66
  const op = manager.getOp(expr);
@@ -180,13 +178,8 @@ export class SeqAxioms {
180
178
  return result;
181
179
  }
182
180
 
183
- mkLen(seq: number) {
184
- return this.host.rewrite(this.mkSeq(OP_SEQ_LENGTH, [seq]));
185
- }
186
-
187
- private purify(expr: number | undefined) {
181
+ private purify(expr: number) {
188
182
  const manager = this.manager;
189
- if (expr === undefined) return undefined;
190
183
  if (manager.depths[expr] === 1 || manager.isValue(expr)) return expr;
191
184
  if (this.host.rewrite(expr) === expr) return expr;
192
185
  let result = this.purified.get(expr);
@@ -256,9 +249,9 @@ export class SeqAxioms {
256
249
  extractAxiom(expr: number) {
257
250
  const manager = this.manager;
258
251
  const [seqArg, indexArg, lengthArg] = manager.getArgs(expr);
259
- const seq = this.purify(seqArg)!;
260
- const index = this.purify(indexArg)!;
261
- const length = this.purify(lengthArg)!;
252
+ const seq = this.purify(seqArg);
253
+ const index = this.purify(indexArg);
254
+ const length = this.purify(lengthArg);
262
255
  if (this.smallSegmentAxiom(expr, seqArg, indexArg, lengthArg)) return;
263
256
  if (this.isTail(seq, indexArg, lengthArg)) {
264
257
  this.tailAxiom(expr, seq);
@@ -436,9 +429,9 @@ export class SeqAxioms {
436
429
  const args = manager.getArgs(index);
437
430
  const minusOne = this.mkInt(-1);
438
431
  const zero = this.mkInt(0);
439
- const offset = this.purify(args[2]);
440
- const pattern = this.purify(args[1])!;
441
- const text = this.purify(args[0])!;
432
+ const offset = args.length > 2 ? this.purify(args[2]) : undefined;
433
+ const pattern = this.purify(args[1]);
434
+ const text = this.purify(args[0]);
442
435
  const contains = this.mkSeq(OP_SEQ_CONTAINS, [text, pattern]);
443
436
  const isMinusOne = this.mkEq(index, minusOne);
444
437
  const isZero = this.mkEq(index, zero);
@@ -511,8 +504,8 @@ export class SeqAxioms {
511
504
  lastIndexofAxiom(index: number) {
512
505
  const manager = this.manager;
513
506
  const [textArg, patternArg] = manager.getArgs(index);
514
- const text = this.purify(textArg)!;
515
- const pattern = this.purify(patternArg)!;
507
+ const text = this.purify(textArg);
508
+ const pattern = this.purify(patternArg);
516
509
  const minusOne = this.mkInt(-1);
517
510
  const zero = this.mkInt(0);
518
511
  const skolem = this.skolem;
@@ -539,9 +532,9 @@ export class SeqAxioms {
539
532
  replaceAxiom(replace: number) {
540
533
  const manager = this.manager;
541
534
  const [source, patternArg, targetArg] = manager.getArgs(replace);
542
- const text = this.purify(source)!;
543
- const pattern = this.purify(patternArg)!;
544
- const target = this.purify(targetArg)!;
535
+ const text = this.purify(source);
536
+ const pattern = this.purify(patternArg);
537
+ const target = this.purify(targetArg);
545
538
  const skolem = this.skolem;
546
539
  const left = skolem.mkIndexofLeft(text, pattern);
547
540
  const right = skolem.mkIndexofRight(text, pattern);
@@ -565,8 +558,8 @@ export class SeqAxioms {
565
558
  atAxiom(expr: number) {
566
559
  const manager = this.manager;
567
560
  const [seqArg, indexArg] = manager.getArgs(expr);
568
- const seq = this.purify(seqArg)!;
569
- const index = this.purify(indexArg)!;
561
+ const seq = this.purify(seqArg);
562
+ const index = this.purify(indexArg);
570
563
  this.mkInt(0);
571
564
  const one = this.mkInt(1);
572
565
  const empty = this.mkEmpty(manager.sorts[expr]);
@@ -747,8 +740,8 @@ export class SeqAxioms {
747
740
  ltAxiom(expr: number) {
748
741
  const manager = this.manager;
749
742
  const [firstArg, secondArg] = manager.getArgs(expr);
750
- const first = this.purify(firstArg)!;
751
- const second = this.purify(secondArg)!;
743
+ const first = this.purify(firstArg);
744
+ const second = this.purify(secondArg);
752
745
  const charSort = manager.getSeqElementSort(manager.sorts[first]);
753
746
  const lt = expr;
754
747
  const gt = this.mkSeq(OP_STRING_LT, [second, first]);
@@ -895,8 +888,8 @@ export class SeqAxioms {
895
888
  private affixAxiom(expr: number, name: string, isPrefix: boolean) {
896
889
  const manager = this.manager;
897
890
  const [firstArg, secondArg] = manager.getArgs(expr);
898
- const first = this.purify(firstArg)!;
899
- const second = this.purify(secondArg)!;
891
+ const first = this.purify(firstArg);
892
+ const second = this.purify(secondArg);
900
893
  const firstLength = this.mkLenAxiom(first);
901
894
  const secondLength = this.mkLenAxiom(second);
902
895
  const isLonger = this.mkGe(this.mkSub(firstLength, secondLength), 1);
@@ -999,12 +992,4 @@ export class SeqAxioms {
999
992
  this.addClause([this.mkNot(tracker), this.mkLe(this.mkLenAxiom(target), limit)]);
1000
993
  return tracker;
1001
994
  }
1002
-
1003
- ubvAxiom(): never {
1004
- throw new SmtUnsupportedError("str.from_ubv in the theory of sequences");
1005
- }
1006
-
1007
- isItos(expr: number) {
1008
- return this.manager.getOp(expr) === OP_STRING_ITOS;
1009
- }
1010
995
  }
@@ -271,7 +271,7 @@ const SEQ_VARIANTS = new Map([
271
271
  [OP_INTERNAL_STRING_SUBSTR, OP_SEQ_EXTRACT],
272
272
  ]);
273
273
 
274
- const STRING_VARIANTS = new Map([...SEQ_VARIANTS].map(([variant, op]) => [op, variant]));
274
+ const STRING_VARIANTS = new Map([...SEQ_VARIANTS].map((entry) => [entry[1], entry[0]]));
275
275
 
276
276
  const getPsig = (op: number) => {
277
277
  const sig = SIGS.get(op);
@@ -63,7 +63,7 @@ import {
63
63
  import { type ReRewriter, getResultExpr } from "./seq-re-rewriter";
64
64
 
65
65
  export const DERIVATIVE_ANTIMIROV = 0;
66
- export const DERIVATIVE_BRZOZOWSKI = 1;
66
+ const DERIVATIVE_BRZOZOWSKI = 1;
67
67
  export const TRANSITION_BRZOZOWSKI = 0;
68
68
  export const TRANSITION_LIGHT_ANTIMIROV = 1;
69
69
 
@@ -1242,12 +1242,9 @@ export class Derive {
1242
1242
  }
1243
1243
 
1244
1244
  derivativeCofactors(regex: number, result: RefVector) {
1245
- const manager = this.manager;
1246
- const elementSort = manager.getSeqElementSort(manager.getReSeqSort(manager.sorts[regex]));
1247
- const element = manager.mkVar(0, elementSort);
1248
- const derivative = this.derive(DERIVATIVE_BRZOZOWSKI, element, regex);
1249
- // Deviation from Z3: a cached derivative leaves m_ele null there, which stops the pruning.
1250
- this.getCofactors(element, derivative, result);
1245
+ const derivative = this.deriveSymbolic(DERIVATIVE_BRZOZOWSKI, regex);
1246
+ // Like Z3, a cached derivative whose lookup reset the op caches leaves the element unset, which stops the interval pruning.
1247
+ this.getCofactors(this.element, derivative, result);
1251
1248
  }
1252
1249
 
1253
1250
  lightAntDerivativeCofactors(regex: number, result: RefVector) {
@@ -27,7 +27,7 @@ export interface SeqLength {
27
27
  value: Rational;
28
28
  }
29
29
 
30
- export interface SeqEqSolverHost {
30
+ interface SeqEqSolverHost {
31
31
  addConsequence(isUsingDeps: boolean, clause: number[]): void;
32
32
  addSolution(variable: number, term: number): void;
33
33
  expr2rep(expr: number): number;
@@ -41,7 +41,7 @@ export interface BinaryEq {
41
41
  y: number;
42
42
  }
43
43
 
44
- export interface TernaryEq {
44
+ interface TernaryEq {
45
45
  x: number;
46
46
  xs: number[];
47
47
  y1: number;
@@ -35,15 +35,15 @@ import {
35
35
  ViewWitness,
36
36
  } from "./seq-view-witness";
37
37
 
38
- export const ORIENTATION_FORWARD = 0;
39
- export const ORIENTATION_REVERSED = 1;
38
+ const ORIENTATION_FORWARD = 0;
39
+ const ORIENTATION_REVERSED = 1;
40
40
  export const ORIENTATION_RETRY = 2;
41
41
 
42
42
  const LIVE_STATE_CAP = 1 << 12;
43
43
  const COFACTOR_CACHE_CAP = 1 << 16;
44
44
  const LENGTH_CONSTRAINING_KEY = 2 ** 40;
45
45
 
46
- export interface Memberships {
46
+ interface Memberships {
47
47
  terms: number[];
48
48
  regexes: number[];
49
49
  deps: number[];
@@ -133,8 +133,10 @@ export class Monadic {
133
133
  this.pins.push(regex);
134
134
  this.pins.push(element);
135
135
  this.pins.pushOwned(derivative);
136
- if (!this.derivativeCache.has(regex)) this.derivativeCache.set(regex, new Map());
137
- this.derivativeCache.get(regex)!.set(element, derivative);
136
+ const derivatives = this.derivativeCache.get(regex);
137
+ if (derivatives === undefined)
138
+ this.derivativeCache.set(regex, new Map([[element, derivative]]));
139
+ else derivatives.set(element, derivative);
138
140
  return derivative;
139
141
  }
140
142
 
@@ -484,7 +484,8 @@ export class ReRewriter {
484
484
  left === right ? 0 : getId(left) < getId(right) ? -1 : 1;
485
485
  const composeResult = (suffix: number) => {
486
486
  let result = suffix;
487
- while (prefix.length > 0) result = compose(prefix.pop()!, result);
487
+ for (let regex = prefix.pop(); regex !== undefined; regex = prefix.pop())
488
+ result = compose(regex, result);
488
489
  return result;
489
490
  };
490
491
  let left = first;
@@ -57,7 +57,7 @@ export interface LenAbs {
57
57
  residues: bigint;
58
58
  }
59
59
 
60
- export interface ReInfo extends LenAbs {
60
+ interface ReInfo extends LenAbs {
61
61
  isKnown: boolean;
62
62
  isInterpreted: boolean;
63
63
  nullable: number;
@@ -117,7 +117,7 @@ export class RegexBisim {
117
117
  this.worklist.pop();
118
118
  const cofactors = new RefVector(manager);
119
119
  derive.derivativeCofactors(regex, cofactors);
120
- const leaves = cofactors.items.filter((_, index) => index % 2 === 1);
120
+ const leaves = cofactors.items.filter((_value, index) => index % 2 === 1);
121
121
  const status = this.areLeavesEquivalent(leaves);
122
122
  if (status === L_TRUE)
123
123
  for (const leaf of leaves) {
@@ -5,8 +5,8 @@ import type { ReRewriter } from "./seq-re-rewriter";
5
5
  import { isReEmpty } from "./seq-re-util";
6
6
 
7
7
  export const LIVE_FAILURE_NONE = 0;
8
- export const LIVE_FAILURE_STATE_CAP = 1;
9
- export const LIVE_FAILURE_RESOURCE = 2;
8
+ const LIVE_FAILURE_STATE_CAP = 1;
9
+ const LIVE_FAILURE_RESOURCE = 2;
10
10
 
11
11
  const NULLABLE_UNKNOWN = 2;
12
12
  const NULLABLE_UNDEF = 3;