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
@@ -75,6 +75,7 @@ import {
75
75
  TRUE_LITERAL,
76
76
  } from "./literal";
77
77
  import { UnionFind } from "./lp/union-find";
78
+ import type { ProtoModel } from "./proto-model";
78
79
  import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
79
80
  import { Theory } from "./theory";
80
81
 
@@ -247,6 +248,7 @@ export class TheoryBv extends Theory {
247
248
  private propQueue: number[] = [];
248
249
  private mergeAux: [number[], number[]] = [[], []];
249
250
  private bv2ints: Enode[] = [];
251
+ private model: ProtoModel | undefined;
250
252
 
251
253
  constructor(context: Context) {
252
254
  super(context, FAMILY_BV);
@@ -286,7 +288,7 @@ export class TheoryBv extends Theory {
286
288
  const isRelevant = context.isRelevant(owner);
287
289
  const bits = this.bits[thVar];
288
290
  bits.length = 0;
289
- const bitExprs = Array.from({ length: this.getBvSize(thVar) }, (_, index) =>
291
+ const bitExprs = Array.from({ length: this.getBvSize(thVar) }, (_value, index) =>
290
292
  mkBvApp(this.manager, OP_BIT2BOOL, [owner], [index]),
291
293
  );
292
294
  context.internalizeAll(bitExprs, true);
@@ -578,7 +580,7 @@ export class TheoryBv extends Theory {
578
580
  const numArgs = node.numArgs;
579
581
  const parameters = this.manager.funcDecls[this.manager.decls[term]].parameters;
580
582
  if (!isAssociative) {
581
- const args = Array.from({ length: numArgs }, (_, index) => this.getArgBits(node, index));
583
+ const args = Array.from({ length: numArgs }, (_value, index) => this.getArgBits(node, index));
582
584
  const bits: number[] = [];
583
585
  blast(this.blaster, args, parameters[0], bits);
584
586
  this.initBits(node, bits);
@@ -1193,8 +1195,16 @@ export class TheoryBv extends Theory {
1193
1195
  this.dropAll(clause);
1194
1196
  }
1195
1197
 
1198
+ initModel(model: ProtoModel) {
1199
+ this.model = model;
1200
+ }
1201
+
1196
1202
  mkValue(node: Enode) {
1203
+ const model = this.model;
1204
+ if (model === undefined) throw new SmtInvariantError("the model was not initialized");
1197
1205
  const thVar = this.getThVar(node);
1198
- return this.manager.mkBvNumeral(this.getFixedValue(thVar).value, this.getBvSize(thVar));
1206
+ const value = this.manager.mkBvNumeral(this.getFixedValue(thVar).value, this.getBvSize(thVar));
1207
+ model.registerValue(value);
1208
+ return value;
1199
1209
  }
1200
1210
  }
@@ -48,7 +48,7 @@ const CONVERTED_OPS = new Set([
48
48
  export const mkFpaConversion = (manager: AstManager) => {
49
49
  const theoryRewriter = new Rewriter(manager, {
50
50
  isEliminatingAnd: false,
51
- arith: { ...TACTIC_ARITH_OPTIONS, isArithIneqLhs: true },
51
+ arith: { ...TACTIC_ARITH_OPTIONS, isArithLhs: true },
52
52
  isRewritingPatterns: true,
53
53
  });
54
54
  const simp = new Rewriter(manager, {
@@ -125,6 +125,7 @@ export abstract class TheoryLraFinalCheck extends TheoryLraModel {
125
125
  this.context.setTrueFirstFlag(getVar(literal));
126
126
  }
127
127
  for (const lemma of nla.lemmas) this.falseCaseOfCheckNla(lemma);
128
+ if (!this.isPropagatingEqs()) return;
128
129
  for (const equality of nla.fixedEqualities)
129
130
  this.addEquality(equality.lpVar, equality.value, equality.explanation);
130
131
  for (const equality of nla.equalities)
@@ -86,10 +86,12 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
86
86
 
87
87
  init() {
88
88
  const manager = this.manager;
89
+ this.solver.settings.isPropagatingEqs = this.context.config.isArithPropagatingEqs;
89
90
  this.oneVar = this.addConst(manager.mkNumeral(1n));
90
91
  this.realOneVar = this.addConst(manager.mkRealNumeral(Rational.one));
91
92
  this.zeroVar = this.addConst(manager.mkNumeral(0n));
92
93
  this.realZeroVar = this.addConst(manager.mkRealNumeral(Rational.zero));
94
+ this.solver.settings.setRandomSeed(this.context.params.randomSeed ?? 0);
93
95
  }
94
96
 
95
97
  private addConst(expr: number) {
@@ -33,11 +33,11 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
33
33
  private delayIneqsQhead = 0;
34
34
  protected explanation = new Explanation();
35
35
  protected coreLiterals: Literal[] = [];
36
- protected numConflicts = 0;
37
36
  private lowerTerms: (TermBound | undefined)[] = [];
38
37
  private upperTerms: (TermBound | undefined)[] = [];
39
38
  protected isModelInitialized = false;
40
39
  private activeInfEpsConstraints: number[] = [];
40
+ protected numConflicts = 0;
41
41
 
42
42
  canPropagate() {
43
43
  return (
@@ -131,11 +131,16 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
131
131
  : bound.isLower
132
132
  ? bound.value.sub(Rational.one)
133
133
  : bound.value.add(Rational.one);
134
- if (isTrue ? bound.eps.isZero() : bound.isInt)
134
+ if (this.isPropagatingEqs() && (isTrue ? bound.eps.isZero() : bound.isInt))
135
135
  this.propagateEqs(bound.column, constraint, kind, bound, value);
136
136
  return true;
137
137
  }
138
138
 
139
+ protected isPropagatingEqs() {
140
+ const config = this.context.config;
141
+ return config.isArithPropagatingEqs && this.numConflicts < config.arithPropagationThreshold;
142
+ }
143
+
139
144
  private propagateEqs(
140
145
  column: number,
141
146
  constraint: number,
@@ -256,7 +261,7 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
256
261
  }
257
262
 
258
263
  protected addEq(first: number, second: number, explanation: Explanation, isFixed: boolean) {
259
- if (this.context.isInconsistent()) return false;
264
+ if (this.context.isInconsistent() || !this.isPropagatingEqs()) return false;
260
265
  const v1 = this.solver.getExternal(first);
261
266
  const v2 = this.solver.getExternal(second);
262
267
  if (v1 === NULL_THEORY_VAR || v2 === NULL_THEORY_VAR) return false;
@@ -299,6 +304,9 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
299
304
  }
300
305
 
301
306
  private propagateBoundsWithLpSolver() {
307
+ const config = this.context.config;
308
+ if (!config.isArithBoundPropagating || this.numConflicts >= config.arithPropagationThreshold)
309
+ return;
302
310
  this.bp.init();
303
311
  this.bp.propagateBoundsForTouchedRows();
304
312
  if (this.context.checkCanceled()) return;
@@ -230,7 +230,7 @@ export class TheoryLra extends TheoryLraFinalCheck {
230
230
  }
231
231
 
232
232
  initSearchEh() {
233
- this.numConflicts = 0;
234
233
  this.restartPairs = [];
234
+ this.numConflicts = 0;
235
235
  }
236
236
  }
@@ -1,5 +1,13 @@
1
- import { SmtInvariantError, SmtUnsupportedError } from "../../../errors";
2
- import { FAMILY_PB, OP_AT_LEAST_K, OP_AT_MOST_K, OP_PB_EQ, OP_PB_GE, OP_PB_LE } from "./ast";
1
+ import { SmtInvariantError } from "../../../errors";
2
+ import {
3
+ FAMILY_PB,
4
+ OP_AT_LEAST_K,
5
+ OP_AT_MOST_K,
6
+ OP_PB_AUX_BOOL,
7
+ OP_PB_EQ,
8
+ OP_PB_GE,
9
+ OP_PB_LE,
10
+ } from "./ast";
3
11
  import { mkNot } from "./ast-util";
4
12
  import { BinJustification, CLS_TH_LEMMA } from "./clause";
5
13
  import type { Context } from "./context";
@@ -221,7 +229,6 @@ class Card {
221
229
  constructor(
222
230
  public lit: Literal,
223
231
  public k: number,
224
- readonly isAux: boolean,
225
232
  ) {}
226
233
 
227
234
  get size() {
@@ -309,6 +316,10 @@ export class TheoryPb extends Theory {
309
316
  const context = this.context;
310
317
  const manager = this.manager;
311
318
  if (context.isBInternalized(atom)) return true;
319
+ if (manager.getOp(atom) === OP_PB_AUX_BOOL) {
320
+ context.setVarTheory(context.mkBoolVar(atom), this.id);
321
+ return true;
322
+ }
312
323
  if (this.internalizeCard(atom)) return true;
313
324
  const boolVar = context.mkBoolVar(atom);
314
325
  context.setVarTheory(boolVar, this.id);
@@ -317,7 +328,7 @@ export class TheoryPb extends Theory {
317
328
  const args = manager.getArgs(atom);
318
329
  const op = manager.getOp(atom);
319
330
  if (op === OP_PB_EQ) {
320
- const coeffs = args.map((_, index) => getPbCoeff(manager, decl, index));
331
+ const coeffs = args.map((_value, index) => getPbCoeff(manager, decl, index));
321
332
  const sum = coeffs.reduce((total, coeff) => total.add(coeff), Rational.zero);
322
333
  const k = getPbK(manager, decl);
323
334
  const le = mkPbGe(
@@ -395,8 +406,14 @@ export class TheoryPb extends Theory {
395
406
  hasBoolVar = true;
396
407
  isNot = !isNot;
397
408
  }
398
- if (!hasBoolVar)
399
- throw new SmtUnsupportedError("pseudo-Boolean arguments that another theory owns");
409
+ if (!hasBoolVar) {
410
+ const proxy = manager.mkPbAuxBool();
411
+ const definition = manager.mkEq(proxy, arg);
412
+ context.internalize(definition, false);
413
+ boolVar = context.getBoolVar(proxy);
414
+ context.mkThAxiom([mkLiteral(context.getBoolVar(definition))]);
415
+ context.markAsRelevant(proxy);
416
+ }
400
417
  return mkLiteral(boolVar, isNot);
401
418
  }
402
419
 
@@ -473,7 +490,7 @@ export class TheoryPb extends Theory {
473
490
  context.mkThAxiom([negate(lit)]);
474
491
  return true;
475
492
  }
476
- const card = new Card(lit, bound, manager.getOp(atom) === OP_AT_LEAST_K);
493
+ const card = new Card(lit, bound);
477
494
  for (const arg of args) card.addArg(this.compileArg(arg));
478
495
  if (bound === card.size) this.card2conjunction(card);
479
496
  else if (card.size === 1) this.card2disjunction(card);
@@ -30,7 +30,7 @@ import { getConcat, mkSeqApp } from "./seq-decl-plugin";
30
30
  import type { EqPair } from "./seq-rewriter";
31
31
  import { type DecomposedEq, type DepEq, type Ne, TheorySeqState } from "./theory-seq-state";
32
32
 
33
- export interface DepState {
33
+ interface DepState {
34
34
  dep: Dependency;
35
35
  isChanged: boolean;
36
36
  }
@@ -1,6 +1,5 @@
1
1
  import {
2
2
  type AstManager,
3
- OP_ADD,
4
3
  OP_GE,
5
4
  OP_LE,
6
5
  OP_SEQ_CONCAT,
@@ -53,7 +52,7 @@ export interface Ne {
53
52
  dep: Dependency;
54
53
  }
55
54
 
56
- export interface Nc {
55
+ interface Nc {
57
56
  contains: number;
58
57
  lengthGreater: Literal;
59
58
  dep: Dependency;
@@ -64,7 +63,7 @@ interface ExprDep {
64
63
  dep: Dependency;
65
64
  }
66
65
 
67
- export class ScopedVector<T> {
66
+ class ScopedVector<T> {
68
67
  items: T[] = [];
69
68
  private undoIndexes: number[] = [];
70
69
  private undoValues: T[] = [];
@@ -146,10 +145,6 @@ class SolutionMap {
146
145
  private deps: Dependency[] = [];
147
146
  private limits: number[] = [];
148
147
 
149
- get isEmpty() {
150
- return this.map.size === 0;
151
- }
152
-
153
148
  private reducesTo(input: number, expr: number) {
154
149
  let current = input;
155
150
  while (current !== expr) {
@@ -237,10 +232,6 @@ class ExclusionTable {
237
232
 
238
233
  constructor(private manager: AstManager) {}
239
234
 
240
- get isEmpty() {
241
- return this.table.size === 0;
242
- }
243
-
244
235
  private getKey(first: number, second: number) {
245
236
  return this.manager.ids[first] > this.manager.ids[second]
246
237
  ? `${second},${first}`
@@ -472,10 +463,6 @@ export abstract class TheorySeqState extends Theory {
472
463
  return this.rewrite(this.mkArith(OP_SUB, [first, second]));
473
464
  }
474
465
 
475
- protected mkAdd(first: number, second: number) {
476
- return this.rewrite(this.mkArith(OP_ADD, [first, second]));
477
- }
478
-
479
466
  protected mkLength(seq: number) {
480
467
  return mkSeqApp(this.manager, OP_SEQ_LENGTH, [seq]);
481
468
  }
@@ -518,12 +505,6 @@ export abstract class TheorySeqState extends Theory {
518
505
  return dep;
519
506
  }
520
507
 
521
- protected addDependency(dep: Dependency, first: Enode, second: Enode) {
522
- return first === second
523
- ? dep
524
- : mkJoin(dep, this.mkAssumption({ first, second, literal: undefined }));
525
- }
526
-
527
508
  protected linearizeOf(dep: Dependency, eqs: Enode[], literals: Literal[]) {
528
509
  for (const index of linearize([dep])) {
529
510
  const assumption = this.assumptions[index];
@@ -448,6 +448,7 @@ export const tseitinCnf = (manager: AstManager, goal: Goal) => {
448
448
  return;
449
449
  }
450
450
  while (frames.length > 0) {
451
+ manager.limit.checkpoint();
451
452
  const frame = frames[frames.length - 1];
452
453
  const isFirst = frame.isFirst;
453
454
  frame.isFirst = false;
@@ -113,12 +113,12 @@ export const loadFingerprints = (table: FingerprintTable, path: string, isSafe:
113
113
  table.clear();
114
114
  (buckets !== undefined && isBlock(buckets) ? buckets.fields : [])
115
115
  .flatMap((bucket) => readBucket(bucket).toReversed())
116
- .forEach(([key, record]) => {
117
- if (typeof key !== "string" || !isBlock(record))
116
+ .forEach((entry) => {
117
+ if (typeof entry[0] !== "string" || !isBlock(entry[1]))
118
118
  throw new TlaProofError("corrupted fingerprint file");
119
119
  table.set(
120
- key,
121
- record.fields.map((result, field) => (isTrusted(result, field) ? result : 0)),
120
+ entry[0],
121
+ entry[1].fields.map((result, field) => (isTrusted(result, field) ? result : 0)),
122
122
  );
123
123
  });
124
124
  };
@@ -226,18 +226,18 @@ export const getKnownResults = (table: FingerprintTable) => {
226
226
  const storedResults = new Map<ProofAttempt, OcamlValue>();
227
227
  const storedRecords = new Map<Map<string, ProofAttempt>, OcamlValue[]>();
228
228
  const results = new Map(
229
- [...table].map(([fingerprint, record]) => {
229
+ [...table].map((entry) => {
230
230
  const attempts = new Map(
231
231
  STORED_PROVERS.flatMap((prover) => {
232
- const stored = record[PROVERS[prover].field];
232
+ const stored = entry[1][PROVERS[prover].field];
233
233
  const result = decodeResult(prover, getField(stored, 0));
234
234
  if (!result) return [];
235
235
  storedResults.set(result, stored);
236
236
  return [[prover, result]];
237
237
  }),
238
238
  );
239
- storedRecords.set(attempts, record);
240
- return [fingerprint, attempts];
239
+ storedRecords.set(attempts, entry[1]);
240
+ return [entry[0], attempts];
241
241
  }),
242
242
  );
243
243
  const save = (path: string) => {
@@ -262,8 +262,11 @@ export const createIndex = (exprs: Expressions) => {
262
262
  const suspect = group[0];
263
263
  const count = suspect.records.length;
264
264
  const missing = [
265
- ...Array.from({ length: count - suspect.cursor }, (_, offset) => suspect.cursor + offset),
266
- ...Array.from({ length: suspect.cursor }, (_, offset) => offset),
265
+ ...Array.from(
266
+ { length: count - suspect.cursor },
267
+ (_value, offset) => suspect.cursor + offset,
268
+ ),
269
+ ...Array.from({ length: suspect.cursor }, (_value, offset) => offset),
267
270
  ].find((index) => !suspect.records[index].isPresent);
268
271
  if (missing === undefined) return suspect.proof;
269
272
  suspects = [group.slice(1), ...suspects.slice(1)];
@@ -129,7 +129,7 @@ const getInstance = (pieces: Piece[], getValue: (piece: Progression) => number)
129
129
  const expandPattern = (count: number, text: string, isReversed: boolean) => {
130
130
  const pattern = parsePattern(text);
131
131
  if (pattern === undefined) return undefined;
132
- const positions = Array.from({ length: count }, (_, position) =>
132
+ const positions = Array.from({ length: count }, (_value, position) =>
133
133
  isReversed ? count - 1 - position : position,
134
134
  );
135
135
  return positions
@@ -56,7 +56,7 @@ const toBase26 = (number: number): string =>
56
56
  : `${toBase26(Math.floor(number / 26))}${String.fromCharCode(97 + (number % 26))}`;
57
57
 
58
58
  const getPairs = <Item>(items: Item[]): [Item, Item][] =>
59
- Array.from({ length: Math.floor(items.length / 2) }, (_, position) => [
59
+ Array.from({ length: Math.floor(items.length / 2) }, (_value, position) => [
60
60
  items[2 * position],
61
61
  items[2 * position + 1],
62
62
  ]);
@@ -367,7 +367,7 @@ export const printIsar = (proof: MlProof, context: IsarContext): string | undefi
367
367
  dict,
368
368
  formulas,
369
369
  subproof,
370
- (_, position) => `by (rule zenon_${lemma}_${position} [OF ${conclusionName}])\n`,
370
+ (_value, position) => `by (rule zenon_${lemma}_${position} [OF ${conclusionName}])\n`,
371
371
  );
372
372
  };
373
373
 
@@ -167,7 +167,7 @@ export const separate = (predefined: string[], phrases: Phrase[]) => {
167
167
  ...definitions.slice(previous + 1),
168
168
  ];
169
169
  const dependencyIndex = dependencies.findIndex((candidate) => candidate[0] === symbol);
170
- dependencies = dependencies.filter((_, position) => position !== dependencyIndex);
170
+ dependencies = dependencies.filter((_value, position) => position !== dependencyIndex);
171
171
  multiple.unshift(symbol);
172
172
  hypotheses.unshift(hypothesis, { formula: removed.origin, goalness: removed.goalness });
173
173
  } else {