tla-ts 0.0.10-dev.c92e6a4ea → 0.0.10-dev.d166e0ae9

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 (235) 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 +13 -3
  7. package/dist/index.d.ts +13 -3
  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 +68 -68
  14. package/dist/prove.js +78 -78
  15. package/dist/run.cjs +42 -42
  16. package/dist/run.js +44 -44
  17. package/dist/tlapm.cjs +1 -1
  18. package/dist/tlapm.js +2 -2
  19. package/dist/transfer.cjs +45 -43
  20. package/dist/transfer.js +45 -43
  21. package/dist/worker.cjs +7 -7
  22. package/dist/worker.js +7 -7
  23. package/package.json +1 -1
  24. package/src/ast.ts +11 -1
  25. package/src/bags.ts +50 -29
  26. package/src/builtins.ts +4 -3
  27. package/src/check-failure.ts +9 -6
  28. package/src/check-trace.ts +116 -64
  29. package/src/check.ts +356 -173
  30. package/src/cli/tlc-output.ts +1 -0
  31. package/src/cli/tlc.ts +4 -3
  32. package/src/cli/xml-exporter.ts +1 -1
  33. package/src/codegen.ts +34 -13
  34. package/src/coverage.ts +3 -0
  35. package/src/dependencies.ts +61 -13
  36. package/src/dfid.ts +22 -10
  37. package/src/environment.ts +71 -35
  38. package/src/errors.ts +7 -0
  39. package/src/evaluate.ts +149 -54
  40. package/src/exit-codes.ts +29 -15
  41. package/src/instances.ts +16 -6
  42. package/src/java-hash.ts +14 -0
  43. package/src/java-overrides.ts +2 -2
  44. package/src/levels.ts +186 -97
  45. package/src/liveness-checker.ts +131 -83
  46. package/src/liveness.ts +52 -11
  47. package/src/obligations/index.ts +1 -1
  48. package/src/obligations/normalize.ts +1 -4
  49. package/src/obligations/printer.ts +5 -5
  50. package/src/obligations/source.ts +2 -0
  51. package/src/parser.ts +115 -145
  52. package/src/prover/isabelle/isar/attrib.ts +4 -4
  53. package/src/prover/isabelle/isar/rule-cases.ts +8 -6
  54. package/src/prover/isabelle/provers/clasimp.ts +1 -1
  55. package/src/prover/isabelle/provers/hypsubst.ts +2 -2
  56. package/src/prover/isabelle/pure/rewriter.ts +3 -3
  57. package/src/prover/isabelle/pure/term.ts +3 -3
  58. package/src/prover/prep/md5.ts +26 -29
  59. package/src/prover/smt/rewrite.ts +2 -7
  60. package/src/prover/smt/simplify.ts +1 -1
  61. package/src/prover/smt/solver/arith-rewriter.ts +11 -3
  62. package/src/prover/smt/solver/array-rewriter.ts +12 -2
  63. package/src/prover/smt/solver/asserted-formulas.ts +169 -58
  64. package/src/prover/smt/solver/ast-lt.ts +1 -1
  65. package/src/prover/smt/solver/ast.ts +63 -14
  66. package/src/prover/smt/solver/auf-solver.ts +23 -12
  67. package/src/prover/smt/solver/bit-blast-tactic.ts +26 -0
  68. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  69. package/src/prover/smt/solver/bound-simplifier.ts +11 -13
  70. package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
  71. package/src/prover/smt/solver/bv-rewriter.ts +1 -1
  72. package/src/prover/smt/solver/card2bv.ts +35 -18
  73. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
  74. package/src/prover/smt/solver/context.ts +67 -13
  75. package/src/prover/smt/solver/ctx-simplify.ts +1 -2
  76. package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
  77. package/src/prover/smt/solver/dependent-expr-state.ts +26 -15
  78. package/src/prover/smt/solver/diff-neq.ts +1 -2
  79. package/src/prover/smt/solver/dt2bv-tactic.ts +36 -20
  80. package/src/prover/smt/solver/elim-bounds.ts +89 -0
  81. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  82. package/src/prover/smt/solver/elim-uncnstr.ts +5 -8
  83. package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
  84. package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
  85. package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
  86. package/src/prover/smt/solver/euf/egraph.ts +4 -11
  87. package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
  88. package/src/prover/smt/solver/euf/mam.ts +1 -5
  89. package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
  90. package/src/prover/smt/solver/euf/th-solver.ts +0 -7
  91. package/src/prover/smt/solver/expr2polynomial.ts +204 -79
  92. package/src/prover/smt/solver/factor.ts +36 -14
  93. package/src/prover/smt/solver/fd-solver.ts +148 -39
  94. package/src/prover/smt/solver/fix-dl-var.ts +1 -2
  95. package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
  96. package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
  97. package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
  98. package/src/prover/smt/solver/goal.ts +6 -3
  99. package/src/prover/smt/solver/goal2nlsat.ts +57 -30
  100. package/src/prover/smt/solver/hashtable.ts +4 -0
  101. package/src/prover/smt/solver/internalizer.ts +1 -1
  102. package/src/prover/smt/solver/logic-tactics.ts +9 -2
  103. package/src/prover/smt/solver/lp/lp-settings.ts +5 -1
  104. package/src/prover/smt/solver/lp/nla-core.ts +1 -1
  105. package/src/prover/smt/solver/lp/nla-grobner.ts +2 -2
  106. package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
  107. package/src/prover/smt/solver/lp/pdd.ts +2 -3
  108. package/src/prover/smt/solver/lp/union-find.ts +1 -1
  109. package/src/prover/smt/solver/mam-compiler.ts +1 -1
  110. package/src/prover/smt/solver/maxcore.ts +2 -1
  111. package/src/prover/smt/solver/maxsmt-base.ts +1 -0
  112. package/src/prover/smt/solver/model-based-opt.ts +1 -1
  113. package/src/prover/smt/solver/model-checker.ts +1 -1
  114. package/src/prover/smt/solver/model-evaluator.ts +2 -0
  115. package/src/prover/smt/solver/model-generator.ts +85 -43
  116. package/src/prover/smt/solver/mpf.ts +2 -4
  117. package/src/prover/smt/solver/mus.ts +2 -3
  118. package/src/prover/smt/solver/muz/dl-context.ts +22 -44
  119. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
  120. package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
  121. package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
  122. package/src/prover/smt/solver/muz/hnf.ts +2 -2
  123. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
  124. package/src/prover/smt/solver/muz/horn-tactic.ts +15 -2
  125. package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
  126. package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
  127. package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
  128. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -1
  129. package/src/prover/smt/solver/nlqsat.ts +1 -1
  130. package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
  131. package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
  132. package/src/prover/smt/solver/nlsat/explain.ts +375 -217
  133. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
  134. package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
  135. package/src/prover/smt/solver/nlsat/solver.ts +74 -64
  136. package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
  137. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
  138. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
  139. package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
  140. package/src/prover/smt/solver/nnf.ts +6 -2
  141. package/src/prover/smt/solver/opt-context.ts +21 -7
  142. package/src/prover/smt/solver/opt-nlsat.ts +29 -18
  143. package/src/prover/smt/solver/opt-pareto.ts +19 -0
  144. package/src/prover/smt/solver/opt-preprocess.ts +1 -1
  145. package/src/prover/smt/solver/opt-solver.ts +10 -6
  146. package/src/prover/smt/solver/optsmt.ts +1 -1
  147. package/src/prover/smt/solver/parallel-tactic.ts +1 -1
  148. package/src/prover/smt/solver/pb-rewriter.ts +1 -4
  149. package/src/prover/smt/solver/poly-rewriter.ts +75 -18
  150. package/src/prover/smt/solver/probes.ts +88 -23
  151. package/src/prover/smt/solver/proto-model.ts +8 -8
  152. package/src/prover/smt/solver/push-app-ite.ts +37 -0
  153. package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
  154. package/src/prover/smt/solver/qe-lite.ts +2 -2
  155. package/src/prover/smt/solver/qe.ts +3 -2
  156. package/src/prover/smt/solver/qsat.ts +23 -8
  157. package/src/prover/smt/solver/quantifier-manager.ts +14 -9
  158. package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
  159. package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
  160. package/src/prover/smt/solver/rewriter.ts +31 -25
  161. package/src/prover/smt/solver/rlimit.ts +4 -0
  162. package/src/prover/smt/solver/sat/config.ts +1 -1
  163. package/src/prover/smt/solver/sat/goal2sat.ts +0 -1
  164. package/src/prover/smt/solver/sat/inc-sat-solver.ts +81 -28
  165. package/src/prover/smt/solver/sat/model-converter.ts +1 -1
  166. package/src/prover/smt/solver/sat/pb-solver.ts +1 -1
  167. package/src/prover/smt/solver/sat/sat-tactic.ts +17 -7
  168. package/src/prover/smt/solver/sat/sat2goal.ts +10 -7
  169. package/src/prover/smt/solver/sat/simplifier.ts +1 -1
  170. package/src/prover/smt/solver/sat/solver.ts +25 -47
  171. package/src/prover/smt/solver/seq-axioms.ts +20 -35
  172. package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
  173. package/src/prover/smt/solver/seq-derive.ts +2 -2
  174. package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
  175. package/src/prover/smt/solver/seq-monadic.ts +7 -5
  176. package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
  177. package/src/prover/smt/solver/seq-re-util.ts +1 -1
  178. package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
  179. package/src/prover/smt/solver/seq-regex-live.ts +2 -2
  180. package/src/prover/smt/solver/seq-rewriter.ts +31 -29
  181. package/src/prover/smt/solver/seq-skolem.ts +0 -23
  182. package/src/prover/smt/solver/seq-view-witness.ts +4 -4
  183. package/src/prover/smt/solver/smt-consequences.ts +1 -1
  184. package/src/prover/smt/solver/smt-kernel.ts +48 -7
  185. package/src/prover/smt/solver/smt-setup.ts +96 -10
  186. package/src/prover/smt/solver/smtlib-parser.ts +589 -224
  187. package/src/prover/smt/solver/smtlib-script.ts +674 -195
  188. package/src/prover/smt/solver/solve-eqs.ts +36 -37
  189. package/src/prover/smt/solver/solver.ts +18 -3
  190. package/src/prover/smt/solver/tactic.ts +332 -189
  191. package/src/prover/smt/solver/theory-bv.ts +13 -3
  192. package/src/prover/smt/solver/theory-fpa.ts +1 -1
  193. package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
  194. package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
  195. package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
  196. package/src/prover/smt/solver/theory-lra.ts +1 -1
  197. package/src/prover/smt/solver/theory-pb.ts +24 -7
  198. package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
  199. package/src/prover/smt/solver/theory-seq-state.ts +2 -21
  200. package/src/prover/smt/solver/tseitin-cnf.ts +1 -0
  201. package/src/prover/tlapm/cache.ts +8 -8
  202. package/src/prover/zenon/index-table.ts +5 -2
  203. package/src/prover/zenon/isar-case.ts +1 -1
  204. package/src/prover/zenon/isar.ts +2 -2
  205. package/src/prover/zenon/phrase.ts +1 -1
  206. package/src/resolve.ts +1071 -251
  207. package/src/runtime.ts +5 -1
  208. package/src/sany/builtins.ts +10 -10
  209. package/src/sany/generation.ts +2 -13
  210. package/src/sany/generator-definitions.ts +3 -1
  211. package/src/sany/generator-expressions.ts +38 -30
  212. package/src/sany/generator-proofs.ts +6 -3
  213. package/src/sany/generator.ts +2 -1
  214. package/src/sany/lexer.ts +3 -3
  215. package/src/sany/modules.ts +4 -2
  216. package/src/sany/nodes.ts +1 -1
  217. package/src/sany/selectors.ts +11 -6
  218. package/src/sany/xml.ts +2 -3
  219. package/src/search.ts +197 -117
  220. package/src/simulate.ts +165 -102
  221. package/src/spec-description.ts +8 -6
  222. package/src/standard-modules.ts +56 -22
  223. package/src/subexpressions.ts +518 -123
  224. package/src/successors.ts +10 -3
  225. package/src/symmetry.ts +2 -1
  226. package/src/tlc/jar-data.ts +10 -0
  227. package/src/tlc/messages.ts +3 -3
  228. package/src/tlc/random.ts +2 -1
  229. package/src/tlc/replay.ts +27 -14
  230. package/src/tlc/tlc-operators.ts +10 -8
  231. package/src/tlc/tlcext-operators.ts +26 -10
  232. package/src/tlc/trace-spec.ts +9 -22
  233. package/src/typed-tier.ts +44 -27
  234. package/src/typescript/types.ts +2 -2
  235. package/src/values.ts +135 -78
@@ -1,5 +1,5 @@
1
1
  import type { AstManager } from "./ast";
2
- import type { Goal } from "./goal";
2
+ import type { Definition, Goal } from "./goal";
3
3
 
4
4
  // The formula read last stays referenced, as m_dep, until the next read or the end of the tactic.
5
5
  export class DependentExprState {
@@ -36,15 +36,18 @@ export class DependentExprState {
36
36
  const manager = this.manager;
37
37
  const goal = this.goal;
38
38
  let rewritten = -1;
39
- this.forEachIndex((index) => {
40
- const form = this.get(index);
41
- const next = rewrite(form);
42
- if (next === -1) return;
39
+ try {
40
+ this.forEachIndex((index) => {
41
+ const form = this.get(index);
42
+ const next = rewrite(form);
43
+ if (next === -1) return;
44
+ if (rewritten !== -1) manager.decRef(rewritten);
45
+ rewritten = next;
46
+ if (rewritten !== form) goal.update(index, rewritten, goal.getDependency(index));
47
+ });
48
+ } finally {
43
49
  if (rewritten !== -1) manager.decRef(rewritten);
44
- rewritten = next;
45
- if (rewritten !== form) goal.update(index, rewritten, goal.getDependency(index));
46
- });
47
- if (rewritten !== -1) manager.decRef(rewritten);
50
+ }
48
51
  }
49
52
 
50
53
  hasQuantifiers() {
@@ -60,6 +63,13 @@ export class DependentExprState {
60
63
  }
61
64
  }
62
65
 
66
+ export const finishSimplifier = (goal: Goal, definitions: Definition[] = []) => {
67
+ goal.elimTrue();
68
+ goal.elimRedundancies();
69
+ goal.depth++;
70
+ if (goal.isModelsEnabled) goal.addDefinitions(definitions);
71
+ };
72
+
63
73
  interface Simplifier {
64
74
  reduce(): void;
65
75
  release(): void;
@@ -72,10 +82,11 @@ export const runSimplifier = (
72
82
  ) => {
73
83
  const state = new DependentExprState(goal.manager, goal);
74
84
  const simplifier = create(state);
75
- if (!goal.isProofsEnabled || isSupportingProofs) simplifier.reduce();
76
- goal.elimTrue();
77
- goal.elimRedundancies();
78
- goal.depth++;
79
- simplifier.release();
80
- state.release();
85
+ try {
86
+ if (!goal.isProofsEnabled || isSupportingProofs) simplifier.reduce();
87
+ finishSimplifier(goal);
88
+ } finally {
89
+ simplifier.release();
90
+ state.release();
91
+ }
81
92
  };
@@ -151,8 +151,7 @@ class DiffNeq {
151
151
  }
152
152
 
153
153
  private resolveConflict() {
154
- while (this.stack.length > 0) {
155
- const value = this.stack.pop() as number;
154
+ for (let value = this.stack.pop(); value !== undefined; value = this.stack.pop()) {
156
155
  const next = this.chooseValue(this.stack.length, value + 1);
157
156
  if (next !== -1) {
158
157
  this.stack.push(next);
@@ -228,33 +228,49 @@ export const createDt2BvTactic = (manager: AstManager) => {
228
228
  else argsCannotBeFd(expr);
229
229
  }
230
230
  for (const sort of nonFdSorts) fdSorts.delete(sort);
231
- if (fdSorts.size > 0) runEnum2Bv(manager, goal, fdSorts);
231
+ if (fdSorts.size > 0)
232
+ runEnum2Bv(
233
+ manager,
234
+ goal,
235
+ (visit) => {
236
+ const size = goal.forms.size;
237
+ for (let index = 0; index < size && !goal.isInconsistent; index++) visit(index);
238
+ },
239
+ fdSorts,
240
+ );
232
241
  goal.depth++;
233
242
  return [goal];
234
243
  };
235
244
  };
236
245
 
237
- export const runEnum2Bv = (manager: AstManager, goal: Goal, fdSorts?: Set<number>) => {
246
+ export const runEnum2Bv = (
247
+ manager: AstManager,
248
+ goal: Goal,
249
+ forEachIndex: (visit: (index: number) => void) => void,
250
+ fdSorts?: Set<number>,
251
+ ) => {
238
252
  const rewriter = new Enum2BvRewriter(manager, fdSorts);
239
253
  let rewritten = -1;
240
- const size = goal.forms.size;
241
- for (let index = 0; index < size && !goal.isInconsistent; index++) {
242
- const next = rewriter.rewrite(goal.forms.items[index]);
254
+ try {
255
+ forEachIndex((index) => {
256
+ const next = rewriter.rewrite(goal.forms.items[index]);
257
+ release(manager, rewritten);
258
+ rewritten = next;
259
+ goal.update(index, rewritten);
260
+ });
261
+ const bounds = new RefVector(manager);
262
+ for (const bound of rewriter.bounds.items) bounds.push(bound);
263
+ rewriter.bounds.reset();
264
+ for (const bound of bounds.items) goal.assert(bound);
265
+ const definitions: Definition[] = [];
266
+ for (const entry of rewriter.enumIndexes)
267
+ definitions.push({ decl: rewriter.enumBvs[entry[1]], def: -1 });
268
+ for (const entry of rewriter.enumIndexes)
269
+ definitions.push({ decl: entry[0], def: rewriter.enumDefs.items[entry[1]] });
270
+ if (definitions.length > 0) goal.addDefinitions(definitions);
271
+ bounds.reset();
272
+ } finally {
243
273
  release(manager, rewritten);
244
- rewritten = next;
245
- goal.update(index, rewritten);
274
+ rewriter.release();
246
275
  }
247
- const bounds = new RefVector(manager);
248
- for (const bound of rewriter.bounds.items) bounds.push(bound);
249
- rewriter.bounds.reset();
250
- for (const bound of bounds.items) goal.assert(bound);
251
- const definitions: Definition[] = [];
252
- for (const entry of rewriter.enumIndexes)
253
- definitions.push({ decl: rewriter.enumBvs[entry[1]], def: -1 });
254
- for (const entry of rewriter.enumIndexes)
255
- definitions.push({ decl: entry[0], def: rewriter.enumDefs.items[entry[1]] });
256
- if (definitions.length > 0) goal.addDefinitions(definitions);
257
- bounds.reset();
258
- release(manager, rewritten);
259
- rewriter.release();
260
276
  };
@@ -0,0 +1,89 @@
1
+ import {
2
+ type AstManager,
3
+ KIND_VAR,
4
+ OP_ADD,
5
+ OP_GE,
6
+ OP_LE,
7
+ OP_MUL,
8
+ OP_NOT,
9
+ OP_OR,
10
+ QUANTIFIER_FORALL,
11
+ } from "./ast";
12
+ import { Rational } from "./rational";
13
+ import { RewriterTpl } from "./rewriter-tpl";
14
+ import { collectUsedVars, elimUnusedVars } from "./var-subst";
15
+
16
+ interface Bound {
17
+ lower: number;
18
+ upper: number;
19
+ }
20
+
21
+ const getBound = (manager: AstManager, atom: number): Bound | undefined => {
22
+ const isNegated = manager.getOp(atom) === OP_NOT;
23
+ const inequality = isNegated ? manager.getArg(atom, 0) : atom;
24
+ const op = manager.getOp(inequality);
25
+ if ((op !== OP_LE && op !== OP_GE) || !manager.isNumeral(manager.getArg(inequality, 1)))
26
+ return undefined;
27
+ const isLe = (op === OP_LE) !== isNegated;
28
+ const term = manager.getArg(inequality, 0);
29
+ const bound = { lower: -1, upper: -1 };
30
+ if (manager.kinds[term] === KIND_VAR) bound.upper = term;
31
+ else if (manager.getOp(term) === OP_ADD && manager.getNumArgs(term) === 2) {
32
+ const first = manager.getArg(term, 0);
33
+ if (manager.kinds[first] === KIND_VAR) bound.upper = first;
34
+ else if (!manager.isGroundApp(first)) return undefined;
35
+ const second = manager.getArg(term, 1);
36
+ if (
37
+ manager.getOp(second) !== OP_MUL ||
38
+ !manager.isNumeral(manager.getArg(second, 0)) ||
39
+ !manager.getRationalValue(manager.getArg(second, 0)).equals(Rational.minusOne)
40
+ )
41
+ return undefined;
42
+ const negated = manager.getArg(second, 1);
43
+ if (manager.kinds[negated] === KIND_VAR) bound.lower = negated;
44
+ else if (!manager.isGroundApp(negated)) return undefined;
45
+ } else return undefined;
46
+ return isLe ? bound : { lower: bound.upper, upper: bound.lower };
47
+ };
48
+
49
+ export class ElimBoundsRw extends RewriterTpl {
50
+ reduceQuantifier(expr: number, body: number) {
51
+ const manager = this.manager;
52
+ const data = manager.getQuantifier(expr);
53
+ if (data.kind !== QUANTIFIER_FORALL) return -1;
54
+ const numVars = data.sorts.length;
55
+ const atoms = manager.getOp(body) === OP_OR ? manager.getArgs(body) : [body];
56
+ const isUsed = Array.from({ length: numVars }, () => false);
57
+ for (const atom of atoms)
58
+ if (getBound(manager, atom) === undefined)
59
+ for (const [index, isVarUsed] of collectUsedVars(manager, atom, numVars).entries())
60
+ if (isVarUsed) isUsed[index] = true;
61
+ if (isUsed.every((isVarUsed) => isVarUsed)) return -1;
62
+ const isCandidate = (variable: number) =>
63
+ variable !== -1 && manager.values[variable] < numVars && !isUsed[manager.values[variable]];
64
+ const lowers = new Set<number>();
65
+ const uppers = new Set<number>();
66
+ for (const atom of atoms) {
67
+ const bound = getBound(manager, atom);
68
+ if (bound === undefined) continue;
69
+ if (isCandidate(bound.lower)) lowers.add(bound.lower);
70
+ if (isCandidate(bound.upper)) uppers.add(bound.upper);
71
+ }
72
+ const candidates = new Set(
73
+ [...lowers, ...uppers].filter((variable) => !lowers.has(variable) || !uppers.has(variable)),
74
+ );
75
+ if (candidates.size === 0) return -1;
76
+ const kept = atoms.filter((atom) => {
77
+ const bound = getBound(manager, atom);
78
+ return bound === undefined || (!candidates.has(bound.lower) && !candidates.has(bound.upper));
79
+ });
80
+ if (kept.length === atoms.length) return -1;
81
+ if (kept.length === 0) {
82
+ manager.incRef(manager.falseExpr);
83
+ return manager.falseExpr;
84
+ }
85
+ return manager.withTemporaries(() =>
86
+ elimUnusedVars(manager, manager.mkQuantifier({ ...data, body: manager.mkOr(kept) })),
87
+ );
88
+ }
89
+ }
@@ -0,0 +1,48 @@
1
+ import { type AstManager, OP_ITE, SORT_BOOL } from "./ast";
2
+ import type { Definition, Goal } from "./goal";
3
+ import { DefinedNames } from "./nnf";
4
+ import { RewriterTpl } from "./rewriter-tpl";
5
+
6
+ class ElimTermIteRw extends RewriterTpl {
7
+ readonly hidden: Definition[] = [];
8
+
9
+ constructor(
10
+ manager: AstManager,
11
+ private names: DefinedNames,
12
+ private goal: Goal,
13
+ ) {
14
+ super(manager);
15
+ }
16
+
17
+ reduceApp(decl: number, args: number[], sort: number) {
18
+ const manager = this.manager;
19
+ if (decl !== OP_ITE || sort === SORT_BOOL) return -1;
20
+ const ite = manager.mkApp(OP_ITE, args, sort);
21
+ manager.incRef(ite);
22
+ const named = this.names.mkName(ite);
23
+ if (named.definition !== -1) {
24
+ this.goal.assert(named.definition);
25
+ if (this.goal.isModelsEnabled) this.hidden.push({ decl: manager.decls[named.name], def: -1 });
26
+ }
27
+ manager.incRef(named.name);
28
+ if (named.definition !== -1) manager.decRef(named.definition);
29
+ manager.decRef(ite);
30
+ return named.name;
31
+ }
32
+ }
33
+
34
+ export const runElimTermIte = (manager: AstManager) => (goal: Goal) => {
35
+ const names = new DefinedNames(manager, null);
36
+ const rewriter = new ElimTermIteRw(manager, names, goal);
37
+ const size = goal.forms.size;
38
+ for (let index = 0; index < size && !goal.isInconsistent; index++) {
39
+ const result = rewriter.rewrite(goal.forms.items[index]);
40
+ goal.update(index, result, goal.getDependency(index));
41
+ manager.decRef(result);
42
+ }
43
+ if (rewriter.hidden.length > 0) goal.addDefinitions(rewriter.hidden);
44
+ goal.depth++;
45
+ names.release();
46
+ rewriter.release();
47
+ return [goal];
48
+ };
@@ -59,8 +59,7 @@ export const collectUnconstrained = (manager: AstManager, goal: Goal) => {
59
59
  const repeated = new Set<number>();
60
60
  for (const form of goal.forms.items) {
61
61
  const todo = [form];
62
- while (todo.length > 0) {
63
- const expr = todo.pop() as number;
62
+ for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
64
63
  const isConst = manager.kinds[expr] === KIND_APP && manager.isUninterpretedConst(expr);
65
64
  if (visited.has(expr)) {
66
65
  if (isConst) repeated.add(expr);
@@ -82,8 +81,7 @@ export const disableQuantified = (manager: AstManager, goal: Goal, bodies: RefVe
82
81
  const disabled = new Set<number>();
83
82
  const visited = new Set<number>();
84
83
  const todo = [...goal.forms.items];
85
- while (todo.length > 0) {
86
- const expr = todo.pop() as number;
84
+ for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
87
85
  if (visited.has(expr)) continue;
88
86
  visited.add(expr);
89
87
  if (manager.kinds[expr] === KIND_QUANTIFIER) {
@@ -92,8 +90,7 @@ export const disableQuantified = (manager: AstManager, goal: Goal, bodies: RefVe
92
90
  if (disabled.has(body)) continue;
93
91
  bodies.push(body);
94
92
  const marks = [body];
95
- while (marks.length > 0) {
96
- const marked = marks.pop() as number;
93
+ for (let marked = marks.pop(); marked !== undefined; marked = marks.pop()) {
97
94
  if (disabled.has(marked)) continue;
98
95
  disabled.add(marked);
99
96
  if (manager.kinds[marked] === KIND_APP) manager.pushArgs(marked, marks);
@@ -259,7 +256,7 @@ class UncnstrRewriter extends RewriterTpl {
259
256
  if (index === -1) return -1;
260
257
  const found = this.mkFreshFor(decl, args, sort);
261
258
  if (!found.isNew) return found.fresh;
262
- const rest = args.filter((_, other) => other !== index);
259
+ const rest = args.filter((_value, other) => other !== index);
263
260
  const restExpr =
264
261
  rest.length === 0
265
262
  ? -1
@@ -525,7 +522,7 @@ export const elimUncnstr = (manager: AstManager, goal: Goal, bodies: RefVector)
525
522
  const rewritten = rewriter.rewrite(form);
526
523
  if (rewritten !== form) {
527
524
  isModified = true;
528
- goal.update(index, rewritten);
525
+ goal.update(index, rewritten, goal.dependencies[index]);
529
526
  }
530
527
  manager.decRef(rewritten);
531
528
  }
@@ -67,7 +67,7 @@ const mkInternalizeState = (): InternalizeState => ({
67
67
 
68
68
  const MAX_POWER_DEGREE = 10;
69
69
 
70
- export const isUnderspecified = (op: number) =>
70
+ const isUnderspecified = (op: number) =>
71
71
  op === OP_DIV ||
72
72
  op === OP_IDIV ||
73
73
  op === OP_REM ||
@@ -32,7 +32,7 @@ export interface AxiomRecord {
32
32
  readonly select: Enode | null;
33
33
  }
34
34
 
35
- export interface VarData {
35
+ interface VarData {
36
36
  isPropUpward: boolean;
37
37
  hasDefault: boolean;
38
38
  readonly lambdas: Enode[];
@@ -71,7 +71,7 @@ import { type Enode, NULL_THEORY_VAR } from "./egraph";
71
71
  import type { EufSolver } from "./euf-solver";
72
72
  import { ThSolver } from "./th-solver";
73
73
 
74
- export interface ZeroOneBit {
74
+ interface ZeroOneBit {
75
75
  readonly owner: number;
76
76
  readonly index: number;
77
77
  readonly isTrue: boolean;
@@ -23,8 +23,8 @@ export const NULL_THEORY_VAR = -1;
23
23
  export const NULL_BOOL_VAR = -1;
24
24
 
25
25
  const J_AXIOM = 0;
26
- export const J_CONGRUENCE = 1;
27
- export const J_EXTERNAL = 2;
26
+ const J_CONGRUENCE = 1;
27
+ const J_EXTERNAL = 2;
28
28
 
29
29
  export interface Justification {
30
30
  readonly kind: number;
@@ -32,7 +32,7 @@ export interface Justification {
32
32
  readonly external: number;
33
33
  }
34
34
 
35
- export const AXIOM: Justification = {
35
+ const AXIOM: Justification = {
36
36
  kind: J_AXIOM,
37
37
  isCommutative: false,
38
38
  external: 0,
@@ -490,8 +490,7 @@ export class Egraph {
490
490
  }
491
491
  const rootVar = root.getThVar(id);
492
492
  node.replaceThVar(thVar, id);
493
- // Deviation from Z3: the undo gives the node back its own variable. Z3 gives it the root's,
494
- // which later equates the wrong terms.
493
+ // Deviation from Z3: the undo gives the node back its own variable, where Z3 gives it the root's and later equates the wrong terms.
495
494
  this.updates.push({
496
495
  tag: U_REPLACE_TH_VAR,
497
496
  r1: node,
@@ -523,12 +522,6 @@ export class Egraph {
523
522
  this.push(U_TOGGLE_CGC, node);
524
523
  }
525
524
 
526
- setRelevant(node: Enode) {
527
- if (node.isRelevant) return;
528
- node.isRelevant = true;
529
- this.push(U_SET_RELEVANT, node);
530
- }
531
-
532
525
  private toggleCgcEnabled(node: Enode, isBacktracking: boolean) {
533
526
  const isEnabled = !node.isCgcEnabled;
534
527
  node.isCgcEnabled = isEnabled;
@@ -465,8 +465,7 @@ export class EufSolver implements SatExtension {
465
465
  let generation = 0;
466
466
  const visited = new Set<number>();
467
467
  const todo = [expr];
468
- while (todo.length > 0) {
469
- const current = todo.pop() as number;
468
+ for (let current = todo.pop(); current !== undefined; current = todo.pop()) {
470
469
  if (visited.has(current)) continue;
471
470
  visited.add(current);
472
471
  const node = this.egraph.find(current);
@@ -42,7 +42,7 @@ import { type Egraph, type Enode, getClass } from "./egraph";
42
42
  import type { TrailStack } from "./th-solver";
43
43
 
44
44
  // euf::mam_solver: the solver whose trail undoes the matcher.
45
- export interface MamSolver {
45
+ interface MamSolver {
46
46
  readonly manager: AstManager;
47
47
  readonly egraph: Egraph;
48
48
  readonly trail: TrailStack;
@@ -590,10 +590,6 @@ export class Mam implements LabelHasher<Enode> {
590
590
  return this.ctx.egraph.find(expr) ?? null;
591
591
  }
592
592
 
593
- canPropagate() {
594
- return this.toMatch.length > 0 || this.newPatterns.length > 0;
595
- }
596
-
597
593
  private setLbls(root: Enode, isParent: boolean, hash: number) {
598
594
  const low = isParent ? root.plbls : root.lbls;
599
595
  const high = isParent ? root.plblsHigh : root.lblsHigh;
@@ -493,8 +493,7 @@ export class Ematch {
493
493
  const manager = this.ctx.manager;
494
494
  const todo = [expr];
495
495
  const marked = new Set<number>();
496
- while (todo.length > 0) {
497
- const term = todo.pop() as number;
496
+ for (let term = todo.pop(); term !== undefined; term = todo.pop()) {
498
497
  if (marked.has(term)) continue;
499
498
  marked.add(term);
500
499
  if (manager.isGroundApp(term)) {
@@ -25,10 +25,6 @@ export class TrailStack {
25
25
  this.scopes.length -= numScopes;
26
26
  while (this.undos.length > lim) (this.undos.pop() as () => void)();
27
27
  }
28
-
29
- get numScopes() {
30
- return this.scopes.length;
31
- }
32
28
  }
33
29
 
34
30
  // A th_explain: the literals and equalities that explain a propagation or a conflict.
@@ -109,9 +105,6 @@ export abstract class ThSolver {
109
105
  isBetaRedex(_parent: Enode, _node: Enode) {
110
106
  return false;
111
107
  }
112
- isFixed(_thVar: number, _lits: number[]): number {
113
- return -1;
114
- }
115
108
  addValue(_node: Enode, _model: ProtoModel, _values: (number | undefined)[]) {}
116
109
  addDep(node: Enode, deps: Dependencies) {
117
110
  deps.set(node, null);