tla-ts 0.0.10-dev.d618a2d79 → 0.0.10-dev.e3e5dd576

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 (252) 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 +53 -53
  5. package/dist/index.cjs +1 -1
  6. package/dist/index.d.cts +18 -4
  7. package/dist/index.d.ts +18 -4
  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 +56 -56
  14. package/dist/prove.js +78 -78
  15. package/dist/run.cjs +40 -44
  16. package/dist/run.js +42 -46
  17. package/dist/tlapm.cjs +1 -1
  18. package/dist/tlapm.js +2 -2
  19. package/dist/transfer.cjs +49 -44
  20. package/dist/transfer.js +48 -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 +14 -2
  25. package/src/bags.ts +50 -29
  26. package/src/builtins.ts +4 -3
  27. package/src/check-failure.ts +13 -11
  28. package/src/check-trace.ts +116 -64
  29. package/src/check.ts +516 -280
  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 +18 -4
  33. package/src/cli/tlc.ts +18 -12
  34. package/src/cli/xml-exporter.ts +1 -1
  35. package/src/codegen.ts +23 -10
  36. package/src/coverage.ts +190 -1
  37. package/src/dependencies.ts +68 -15
  38. package/src/dfid.ts +101 -36
  39. package/src/environment.ts +123 -38
  40. package/src/errors.ts +7 -0
  41. package/src/evaluate.ts +370 -99
  42. package/src/exit-codes.ts +28 -14
  43. package/src/instances.ts +135 -11
  44. package/src/java-hash.ts +14 -0
  45. package/src/java-overrides.ts +2 -2
  46. package/src/levels.ts +675 -236
  47. package/src/lexer.ts +12 -2
  48. package/src/liveness-checker.ts +179 -60
  49. package/src/liveness.ts +51 -10
  50. package/src/obligations/index.ts +1 -1
  51. package/src/obligations/normalize.ts +1 -4
  52. package/src/obligations/printer.ts +5 -5
  53. package/src/obligations/source.ts +2 -0
  54. package/src/parallel-worker.ts +8 -2
  55. package/src/parallel.ts +5 -0
  56. package/src/parser.ts +180 -149
  57. package/src/prover/isabelle/isar/attrib.ts +4 -4
  58. package/src/prover/isabelle/isar/rule-cases.ts +8 -6
  59. package/src/prover/isabelle/provers/clasimp.ts +1 -1
  60. package/src/prover/isabelle/provers/hypsubst.ts +2 -2
  61. package/src/prover/isabelle/pure/rewriter.ts +3 -3
  62. package/src/prover/isabelle/pure/term.ts +3 -3
  63. package/src/prover/prep/md5.ts +26 -29
  64. package/src/prover/smt/rewrite.ts +2 -7
  65. package/src/prover/smt/simplify.ts +1 -1
  66. package/src/prover/smt/solver/arith-rewriter.ts +11 -3
  67. package/src/prover/smt/solver/array-rewriter.ts +12 -2
  68. package/src/prover/smt/solver/asserted-formulas.ts +171 -58
  69. package/src/prover/smt/solver/ast-lt.ts +1 -1
  70. package/src/prover/smt/solver/ast.ts +66 -14
  71. package/src/prover/smt/solver/auf-solver.ts +23 -12
  72. package/src/prover/smt/solver/bit-blast-tactic.ts +27 -1
  73. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  74. package/src/prover/smt/solver/bound-simplifier.ts +11 -13
  75. package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
  76. package/src/prover/smt/solver/bv-rewriter.ts +1 -1
  77. package/src/prover/smt/solver/card2bv.ts +35 -18
  78. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
  79. package/src/prover/smt/solver/context.ts +84 -15
  80. package/src/prover/smt/solver/ctx-simplify.ts +1 -2
  81. package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
  82. package/src/prover/smt/solver/dependent-expr-state.ts +28 -16
  83. package/src/prover/smt/solver/diff-neq.ts +1 -2
  84. package/src/prover/smt/solver/dt2bv-tactic.ts +57 -21
  85. package/src/prover/smt/solver/elim-bounds.ts +89 -0
  86. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  87. package/src/prover/smt/solver/elim-uncnstr.ts +5 -8
  88. package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
  89. package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
  90. package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
  91. package/src/prover/smt/solver/euf/egraph.ts +4 -11
  92. package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
  93. package/src/prover/smt/solver/euf/mam.ts +1 -5
  94. package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
  95. package/src/prover/smt/solver/euf/th-solver.ts +0 -7
  96. package/src/prover/smt/solver/expr2polynomial.ts +204 -79
  97. package/src/prover/smt/solver/factor.ts +36 -14
  98. package/src/prover/smt/solver/fd-solver.ts +608 -139
  99. package/src/prover/smt/solver/fix-dl-var.ts +1 -2
  100. package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
  101. package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
  102. package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
  103. package/src/prover/smt/solver/goal.ts +6 -3
  104. package/src/prover/smt/solver/goal2nlsat.ts +57 -30
  105. package/src/prover/smt/solver/hashtable.ts +4 -0
  106. package/src/prover/smt/solver/internalizer.ts +1 -1
  107. package/src/prover/smt/solver/logic-tactics.ts +15 -5
  108. package/src/prover/smt/solver/lp/core-solver.ts +12 -8
  109. package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
  110. package/src/prover/smt/solver/lp/lp-settings.ts +6 -2
  111. package/src/prover/smt/solver/lp/nla-core.ts +1 -1
  112. package/src/prover/smt/solver/lp/nla-grobner.ts +158 -80
  113. package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
  114. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -2
  115. package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -20
  116. package/src/prover/smt/solver/lp/pdd-solver.ts +72 -39
  117. package/src/prover/smt/solver/lp/pdd.ts +725 -290
  118. package/src/prover/smt/solver/lp/union-find.ts +1 -1
  119. package/src/prover/smt/solver/mam-compiler.ts +1 -1
  120. package/src/prover/smt/solver/maxcore.ts +2 -1
  121. package/src/prover/smt/solver/maxsmt-base.ts +1 -0
  122. package/src/prover/smt/solver/model-based-opt.ts +1 -1
  123. package/src/prover/smt/solver/model-checker.ts +1 -1
  124. package/src/prover/smt/solver/model-evaluator.ts +2 -0
  125. package/src/prover/smt/solver/model-generator.ts +85 -43
  126. package/src/prover/smt/solver/mpf.ts +2 -4
  127. package/src/prover/smt/solver/mus.ts +2 -3
  128. package/src/prover/smt/solver/muz/dl-context.ts +22 -44
  129. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
  130. package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
  131. package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
  132. package/src/prover/smt/solver/muz/hnf.ts +2 -2
  133. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
  134. package/src/prover/smt/solver/muz/horn-tactic.ts +15 -2
  135. package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
  136. package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
  137. package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
  138. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -1
  139. package/src/prover/smt/solver/nlqsat.ts +1 -1
  140. package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
  141. package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
  142. package/src/prover/smt/solver/nlsat/explain.ts +375 -217
  143. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
  144. package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
  145. package/src/prover/smt/solver/nlsat/solver.ts +74 -64
  146. package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
  147. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
  148. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
  149. package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
  150. package/src/prover/smt/solver/nnf.ts +6 -2
  151. package/src/prover/smt/solver/opt-context.ts +21 -7
  152. package/src/prover/smt/solver/opt-nlsat.ts +29 -18
  153. package/src/prover/smt/solver/opt-pareto.ts +19 -0
  154. package/src/prover/smt/solver/opt-preprocess.ts +1 -1
  155. package/src/prover/smt/solver/opt-solver.ts +10 -6
  156. package/src/prover/smt/solver/optsmt.ts +1 -1
  157. package/src/prover/smt/solver/parallel-tactic.ts +1 -1
  158. package/src/prover/smt/solver/pb-rewriter.ts +1 -4
  159. package/src/prover/smt/solver/poly-rewriter.ts +75 -18
  160. package/src/prover/smt/solver/probes.ts +88 -23
  161. package/src/prover/smt/solver/proto-model.ts +8 -8
  162. package/src/prover/smt/solver/push-app-ite.ts +37 -0
  163. package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
  164. package/src/prover/smt/solver/qe-lite.ts +2 -2
  165. package/src/prover/smt/solver/qe.ts +3 -2
  166. package/src/prover/smt/solver/qsat.ts +23 -8
  167. package/src/prover/smt/solver/quantifier-manager.ts +14 -9
  168. package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
  169. package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
  170. package/src/prover/smt/solver/rewriter.ts +31 -25
  171. package/src/prover/smt/solver/rlimit.ts +7 -3
  172. package/src/prover/smt/solver/sat/config.ts +1 -1
  173. package/src/prover/smt/solver/sat/goal2sat.ts +65 -12
  174. package/src/prover/smt/solver/sat/inc-sat-solver.ts +129 -43
  175. package/src/prover/smt/solver/sat/model-converter.ts +1 -1
  176. package/src/prover/smt/solver/sat/pb-constraint.ts +7 -0
  177. package/src/prover/smt/solver/sat/pb-solver.ts +26 -7
  178. package/src/prover/smt/solver/sat/sat-tactic.ts +17 -7
  179. package/src/prover/smt/solver/sat/sat2goal.ts +72 -48
  180. package/src/prover/smt/solver/sat/simplifier.ts +1 -1
  181. package/src/prover/smt/solver/sat/solver.ts +27 -47
  182. package/src/prover/smt/solver/seq-axioms.ts +20 -35
  183. package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
  184. package/src/prover/smt/solver/seq-derive.ts +2 -2
  185. package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
  186. package/src/prover/smt/solver/seq-monadic.ts +7 -5
  187. package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
  188. package/src/prover/smt/solver/seq-re-util.ts +1 -1
  189. package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
  190. package/src/prover/smt/solver/seq-regex-live.ts +2 -2
  191. package/src/prover/smt/solver/seq-rewriter.ts +31 -29
  192. package/src/prover/smt/solver/seq-skolem.ts +0 -23
  193. package/src/prover/smt/solver/seq-view-witness.ts +4 -4
  194. package/src/prover/smt/solver/smt-consequences.ts +1 -1
  195. package/src/prover/smt/solver/smt-kernel.ts +48 -7
  196. package/src/prover/smt/solver/smt-setup.ts +106 -13
  197. package/src/prover/smt/solver/smtlib-parser.ts +589 -224
  198. package/src/prover/smt/solver/smtlib-script.ts +713 -210
  199. package/src/prover/smt/solver/solve-eqs.ts +36 -37
  200. package/src/prover/smt/solver/solver.ts +18 -3
  201. package/src/prover/smt/solver/tactic.ts +350 -195
  202. package/src/prover/smt/solver/theory-bv.ts +13 -3
  203. package/src/prover/smt/solver/theory-fpa.ts +1 -1
  204. package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
  205. package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
  206. package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
  207. package/src/prover/smt/solver/theory-lra-state.ts +1 -1
  208. package/src/prover/smt/solver/theory-lra.ts +1 -1
  209. package/src/prover/smt/solver/theory-pb.ts +24 -7
  210. package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
  211. package/src/prover/smt/solver/theory-seq-state.ts +2 -21
  212. package/src/prover/smt/solver/theory-without-terms.ts +24 -0
  213. package/src/prover/smt/solver/tseitin-cnf.ts +1 -0
  214. package/src/prover/tlapm/cache.ts +8 -8
  215. package/src/prover/zenon/index-table.ts +5 -2
  216. package/src/prover/zenon/isar-case.ts +1 -1
  217. package/src/prover/zenon/isar.ts +2 -2
  218. package/src/prover/zenon/phrase.ts +1 -1
  219. package/src/resolve.ts +1274 -257
  220. package/src/runtime.ts +7 -1
  221. package/src/sany/builtins.ts +10 -10
  222. package/src/sany/generation.ts +5 -15
  223. package/src/sany/generator-def-entries.ts +123 -36
  224. package/src/sany/generator-definitions.ts +5 -3
  225. package/src/sany/generator-expressions.ts +60 -37
  226. package/src/sany/generator-proofs.ts +18 -12
  227. package/src/sany/generator.ts +12 -6
  228. package/src/sany/lexer.ts +15 -7
  229. package/src/sany/modules.ts +4 -2
  230. package/src/sany/nodes.ts +1 -1
  231. package/src/sany/selectors.ts +11 -6
  232. package/src/sany/xml.ts +2 -3
  233. package/src/search.ts +319 -135
  234. package/src/simulate.ts +235 -182
  235. package/src/spec-description.ts +8 -6
  236. package/src/standard-definitions.ts +1 -0
  237. package/src/standard-modules.ts +56 -22
  238. package/src/subexpressions.ts +564 -138
  239. package/src/successors.ts +37 -13
  240. package/src/symmetry.ts +2 -1
  241. package/src/tlc/jar-data.ts +10 -0
  242. package/src/tlc/messages.ts +3 -3
  243. package/src/tlc/order.ts +14 -3
  244. package/src/tlc/random.ts +2 -1
  245. package/src/tlc/replay.ts +67 -43
  246. package/src/tlc/tlc-operators.ts +10 -8
  247. package/src/tlc/tlcext-operators.ts +44 -15
  248. package/src/tlc/trace-spec.ts +9 -22
  249. package/src/trace-liveness.ts +529 -0
  250. package/src/typed-tier.ts +52 -31
  251. package/src/typescript/types.ts +2 -2
  252. package/src/values.ts +150 -79
@@ -20,35 +20,32 @@ export const getMd5 = (text: string): string => {
20
20
  const words = Array.from({ length: 16 }, (_value, index) =>
21
21
  view.getUint32(offset + index * 4, true),
22
22
  );
23
- const mixedState = Array.from({ length: 64 }).reduce<number[]>(
24
- ([innerA, innerB, innerC, innerD], _value, index) => {
25
- const round = Math.floor(index / 16);
26
- const mixed =
27
- round === 0
28
- ? (innerB & innerC) | (~innerB & innerD)
29
- : round === 1
30
- ? (innerD & innerB) | (~innerD & innerC)
31
- : round === 2
32
- ? innerB ^ innerC ^ innerD
33
- : innerC ^ (innerB | ~innerD);
34
- const word =
35
- round === 0
36
- ? index
37
- : round === 1
38
- ? (5 * index + 1) % 16
39
- : round === 2
40
- ? (3 * index + 5) % 16
41
- : (7 * index) % 16;
42
- const sum = (innerA + mixed + CONSTANTS[index] + words[word]) | 0;
43
- return [
44
- innerD,
45
- (innerB + rotate(sum, SHIFTS[round * 4 + (index % 4)])) | 0,
46
- innerB,
47
- innerC,
48
- ];
49
- },
50
- state,
51
- );
23
+ const mixedState = Array.from({ length: 64 }).reduce<number[]>((state, _value, index) => {
24
+ const round = Math.floor(index / 16);
25
+ const mixed =
26
+ round === 0
27
+ ? (state[1] & state[2]) | (~state[1] & state[3])
28
+ : round === 1
29
+ ? (state[3] & state[1]) | (~state[3] & state[2])
30
+ : round === 2
31
+ ? state[1] ^ state[2] ^ state[3]
32
+ : state[2] ^ (state[1] | ~state[3]);
33
+ const word =
34
+ round === 0
35
+ ? index
36
+ : round === 1
37
+ ? (5 * index + 1) % 16
38
+ : round === 2
39
+ ? (3 * index + 5) % 16
40
+ : (7 * index) % 16;
41
+ const sum = (state[0] + mixed + CONSTANTS[index] + words[word]) | 0;
42
+ return [
43
+ state[3],
44
+ (state[1] + rotate(sum, SHIFTS[round * 4 + (index % 4)])) | 0,
45
+ state[1],
46
+ state[2],
47
+ ];
48
+ }, state);
52
49
  state.splice(0, 4, ...state.map((word, index) => (word + mixedState[index]) | 0));
53
50
  }
54
51
  return state
@@ -296,7 +296,7 @@ const invert = (mode: Mode): Mode => ({
296
296
  : "Neither",
297
297
  });
298
298
 
299
- export const encodeIdv = (encoder: Encoder, expression: Expr, env: Env | undefined, mode: Mode) =>
299
+ const encodeIdv = (encoder: Encoder, expression: Expr, env: Env | undefined, mode: Mode) =>
300
300
  toIdv(encode(encoder, expression, env, clearPolarity(mode)));
301
301
 
302
302
  export const encodeBool = (encoder: Encoder, expression: Expr, env: Env | undefined, mode: Mode) =>
@@ -917,12 +917,7 @@ const encodeSequent = (
917
917
  );
918
918
  };
919
919
 
920
- export const encode = (
921
- encoder: Encoder,
922
- expression: Expr,
923
- env: Env | undefined,
924
- mode: Mode,
925
- ): Term => {
920
+ const encode = (encoder: Encoder, expression: Expr, env: Env | undefined, mode: Mode): Term => {
926
921
  switch (expression.kind) {
927
922
  case "Ix":
928
923
  return encodeReference(encoder, getBinding(env, expression.index), [], env, mode);
@@ -307,7 +307,7 @@ const getMembership = (polarity: Polarity, element: Expr, set: Expr): Expr | und
307
307
  items: [
308
308
  builtin("Eq", [
309
309
  left,
310
- { kind: "Tuple", elements: factors.map((_, index) => component(index)) },
310
+ { kind: "Tuple", elements: factors.map((_value, index) => component(index)) },
311
311
  ]),
312
312
  ...factors.map((factor, index) => mem(component(index), factor)),
313
313
  ],
@@ -41,6 +41,7 @@ import { Anum } from "./nlsat/algebraic";
41
41
  export const KERNEL_ARITH_OPTIONS: ArithRewriterOptions = {
42
42
  isSom: true,
43
43
  isSortSums: true,
44
+ isArithLhs: false,
44
45
  isArithIneqLhs: true,
45
46
  isGcdRounding: true,
46
47
  isAnumSimp: true,
@@ -52,6 +53,7 @@ export const KERNEL_ARITH_OPTIONS: ArithRewriterOptions = {
52
53
  export const TACTIC_ARITH_OPTIONS: ArithRewriterOptions = {
53
54
  isSom: false,
54
55
  isSortSums: false,
56
+ isArithLhs: false,
55
57
  isArithIneqLhs: false,
56
58
  isGcdRounding: false,
57
59
  isAnumSimp: true,
@@ -118,7 +120,8 @@ export class ArithRewriter extends PolyRewriter {
118
120
  ]),
119
121
  2,
120
122
  );
121
- if (!this.isArithTerm(left) && !this.isArithTerm(right)) return undefined;
123
+ if (!this.options.isArithLhs && !this.isArithTerm(left) && !this.isArithTerm(right))
124
+ return undefined;
122
125
  return this.mkLeGeEq(left, right, KIND_EQ);
123
126
  }
124
127
 
@@ -1259,7 +1262,12 @@ export class ArithRewriter extends PolyRewriter {
1259
1262
  sides[index] = expr;
1260
1263
  };
1261
1264
  const cancelled = manager.withTemporaries(
1262
- () => this.cancelMonomials(originalLeft, originalRight, this.options.isArithIneqLhs),
1265
+ () =>
1266
+ this.cancelMonomials(
1267
+ originalLeft,
1268
+ originalRight,
1269
+ this.options.isArithIneqLhs || this.options.isArithLhs,
1270
+ ),
1263
1271
  (result) => (result === undefined ? [] : [result.lhs, result.rhs]),
1264
1272
  );
1265
1273
  if (cancelled !== undefined) sides.push(cancelled.lhs, cancelled.rhs);
@@ -1366,7 +1374,7 @@ export class ArithRewriter extends PolyRewriter {
1366
1374
  return this.reduce(manager.mkAnd([mkUpper(), lower]), 3);
1367
1375
  }
1368
1376
  const negated =
1369
- this.options.isArithIneqLhs && this.manager.isNumeral(right)
1377
+ (this.options.isArithLhs || this.options.isArithIneqLhs) && this.manager.isNumeral(right)
1370
1378
  ? this.getNegatedPolynomial(left)
1371
1379
  : undefined;
1372
1380
  if (negated !== undefined) {
@@ -24,6 +24,7 @@ export class ArrayRewriter {
24
24
  constructor(
25
25
  private manager: AstManager,
26
26
  private isSortingStore = false,
27
+ private isExpandingSelects = false,
27
28
  ) {}
28
29
 
29
30
  private isOp(expr: number, op: number) {
@@ -193,7 +194,12 @@ export class ArrayRewriter {
193
194
  (index, position) =>
194
195
  manager.isValue(index) && manager.isValue(manager.getArg(array, position + 1)),
195
196
  );
196
- if (!this.isOp(base, OP_CONST_ARRAY) && !areValues) return undefined;
197
+ if (
198
+ !this.isOp(base, OP_CONST_ARRAY) &&
199
+ !areValues &&
200
+ !(this.isExpandingSelects && manager.getRefCount(base) === 1)
201
+ )
202
+ return undefined;
197
203
  const selectBase = this.mkApp(OP_SELECT, [base, ...indices]);
198
204
  const value = manager.getArg(array, indices.length + 1);
199
205
  const eqs = indices.map((index, position) =>
@@ -208,7 +214,11 @@ export class ArrayRewriter {
208
214
  if (this.isOp(array, OP_ITE)) {
209
215
  const thenArray = manager.getArg(array, 1);
210
216
  const elseArray = manager.getArg(array, 2);
211
- if (manager.getRefCount(thenArray) !== 1 && manager.getRefCount(elseArray) !== 1)
217
+ if (
218
+ !this.isExpandingSelects &&
219
+ manager.getRefCount(thenArray) !== 1 &&
220
+ manager.getRefCount(elseArray) !== 1
221
+ )
212
222
  return undefined;
213
223
  const thenSelect = this.mkApp(OP_SELECT, [thenArray, ...indices]);
214
224
  const elseSelect = this.mkApp(OP_SELECT, [elseArray, ...indices]);
@@ -14,10 +14,12 @@ import {
14
14
  import { mkNot } from "./ast-util";
15
15
  import { simplifyInjAxiom } from "./inj-axiom";
16
16
  import { MacroManager } from "./macro-finder";
17
+ import { ElimBoundsRw } from "./elim-bounds";
17
18
  import { DefinedNames, Nnf } from "./nnf";
18
19
  import { PatternInference } from "./pattern-inference";
19
20
  import { MaxBvSharing } from "./maximize-ac-sharing";
20
21
  import { PullQuant } from "./pull-quant";
22
+ import { NgPushAppIteRw } from "./push-app-ite";
21
23
  import { RefVector } from "./ref-vector";
22
24
  import { KERNEL_REWRITER_OPTIONS, Rewriter } from "./rewriter";
23
25
  import { RewriterTpl } from "./rewriter-tpl";
@@ -68,6 +70,43 @@ export class PatternInferenceRw extends RewriterTpl {
68
70
  }
69
71
  }
70
72
 
73
+ // Like Z3's, it keeps the definitions it made until a pop, and each reduce asserts them all again.
74
+ class ElimTermIteRw extends RewriterTpl {
75
+ readonly definitions: RefVector;
76
+ private lims: number[] = [];
77
+
78
+ constructor(
79
+ manager: AstManager,
80
+ private names: DefinedNames,
81
+ ) {
82
+ super(manager);
83
+ this.definitions = new RefVector(manager);
84
+ }
85
+
86
+ reduceApp(decl: number, args: number[], sort: number) {
87
+ const manager = this.manager;
88
+ if (decl !== OP_ITE || sort === SORT_BOOL) return -1;
89
+ const ite = manager.mkApp(OP_ITE, args, sort);
90
+ manager.incRef(ite);
91
+ const named = this.names.mkName(ite);
92
+ manager.decRef(ite);
93
+ if (named.definition === -1) return -1;
94
+ this.definitions.push(named.definition);
95
+ manager.decRef(named.definition);
96
+ manager.incRef(named.name);
97
+ return named.name;
98
+ }
99
+
100
+ push() {
101
+ this.lims.push(this.definitions.size);
102
+ }
103
+
104
+ pop() {
105
+ this.definitions.shrink(this.lims[this.lims.length - 1]);
106
+ this.lims.pop();
107
+ }
108
+ }
109
+
71
110
  const isGreater = (manager: AstManager, left: number, right: number): boolean => {
72
111
  if (left === right) return false;
73
112
  const isLeftValue = manager.isValue(left);
@@ -156,9 +195,15 @@ export class AssertedFormulas {
156
195
  private isReducePending = true;
157
196
  private isNnfCnf = true;
158
197
  private isEq2Ineq = false;
198
+ private isEliminatingTermIte = false;
199
+ private isLiftingNonGroundIte = false;
200
+ private isEliminatingBounds = false;
159
201
  private names: DefinedNames;
202
+ private termIteElim: ElimTermIteRw;
160
203
  private patternInference: PatternInferenceRw;
161
204
  private bvSharing: MaxBvSharing;
205
+ private ngLiftIte: NgPushAppIteRw;
206
+ private boundsElim: ElimBoundsRw;
162
207
  hasQuantifiers = false;
163
208
  readonly macros: MacroManager;
164
209
  isInconsistent = false;
@@ -177,8 +222,11 @@ export class AssertedFormulas {
177
222
  // string literals reach the seq theory as concatenations of units.
178
223
  this.rewriter = new Rewriter(manager, { ...KERNEL_REWRITER_OPTIONS, isCoalescingChars: false });
179
224
  this.names = new DefinedNames(manager);
225
+ this.termIteElim = new ElimTermIteRw(manager, this.names);
180
226
  this.patternInference = new PatternInferenceRw(manager, new PatternInference(manager));
181
227
  this.bvSharing = new MaxBvSharing(manager);
228
+ this.ngLiftIte = new NgPushAppIteRw(manager);
229
+ this.boundsElim = new ElimBoundsRw(manager);
182
230
  }
183
231
 
184
232
  push() {
@@ -196,6 +244,7 @@ export class AssertedFormulas {
196
244
  this.bvSharing.popScope();
197
245
  this.macros.popScope();
198
246
  this.names.pop();
247
+ this.termIteElim.pop();
199
248
  this.substitution.pop();
200
249
  this.formulas.shrink(scope.numFormulas);
201
250
  this.qhead = scope.numFormulas;
@@ -204,9 +253,12 @@ export class AssertedFormulas {
204
253
 
205
254
  private forcePush() {
206
255
  for (; this.numLazyScopes > 0; this.numLazyScopes--) {
256
+ this.reduce();
257
+ this.commit();
207
258
  this.substitution.push();
208
259
  this.scopes.push({ numFormulas: this.formulas.size, isInconsistent: this.isInconsistent });
209
260
  this.names.push();
261
+ this.termIteElim.push();
210
262
  this.macros.pushScope();
211
263
  this.bvSharing.pushScope();
212
264
  }
@@ -232,9 +284,22 @@ export class AssertedFormulas {
232
284
  setup(config: SmtConfig) {
233
285
  this.isNnfCnf = config.isNnfCnf;
234
286
  this.isEq2Ineq = config.isEq2Ineq;
287
+ this.isEliminatingTermIte = config.isEliminatingTermIte;
288
+ this.isLiftingNonGroundIte = config.isLiftingNonGroundIte;
289
+ this.isEliminatingBounds = config.isEliminatingBounds;
235
290
  this.isFindingMacros ||= config.isFindingMacros;
236
291
  }
237
292
 
293
+ updateParams(config: SmtConfig) {
294
+ this.isNnfCnf = config.isNnfCnf;
295
+ this.isEq2Ineq = config.isEq2Ineq;
296
+ this.isEliminatingTermIte = config.isEliminatingTermIte;
297
+ this.isLiftingNonGroundIte = config.isLiftingNonGroundIte;
298
+ this.isEliminatingBounds = config.isEliminatingBounds;
299
+ this.isFindingMacros = config.isFindingMacros;
300
+ this.isReducePending = true;
301
+ }
302
+
238
303
  getNumFormulas() {
239
304
  return this.formulas.size;
240
305
  }
@@ -243,55 +308,51 @@ export class AssertedFormulas {
243
308
  return this.formulas.items;
244
309
  }
245
310
 
246
- // Like internalize_assertions, nothing is committed once the formulas are inconsistent.
311
+ getQhead() {
312
+ return this.qhead;
313
+ }
314
+
315
+ commit(qhead = this.formulas.size) {
316
+ const committed = this.formulas.items.slice(this.qhead, qhead);
317
+ this.macros.markForbidden(committed);
318
+ for (const formula of committed) this.substitution.update(formula);
319
+ this.qhead = qhead;
320
+ }
321
+
247
322
  reduce() {
248
- if (this.qhead === this.formulas.size) return [];
249
- if (!this.isInconsistent && (this.hasQuantifiers || this.isPreprocessing)) this.reduceCore();
250
- if (this.isInconsistent) return [];
251
- const result = this.formulas.items.slice(this.qhead);
252
- if (this.isFindingMacros) this.macros.markForbidden(result);
253
- for (const formula of result) this.substitution.update(formula);
254
- this.qhead = this.formulas.size;
255
- return result;
256
- }
257
-
258
- private reduceCore() {
259
- if (this.macros.hasMacros()) this.findMacros();
323
+ if (this.isInconsistent || this.isCanceled() || this.qhead === this.formulas.size) return;
324
+ if (!this.hasQuantifiers && !this.isPreprocessing) return;
325
+ const isFindingMacros = this.isFindingMacros && this.hasQuantifiers;
326
+ if (this.macros.hasMacros()) this.invoke(isFindingMacros, () => this.findMacros());
260
327
  this.setEliminateAnd(false);
261
- this.propagateValues();
262
- if (this.isInconsistent) return;
263
- this.findMacros();
264
- if (this.isInconsistent) return;
265
- if (this.isNnfCnf || this.hasQuantifiers) {
266
- this.isReducePending = true;
267
- this.nnfCnf();
268
- if (this.isInconsistent) return;
269
- }
328
+ if (!this.invoke(true, () => this.propagateValues())) return;
329
+ if (!this.invoke(isFindingMacros, () => this.findMacros())) return;
330
+ if (!this.invoke(this.isNnfCnf || this.hasQuantifiers, () => this.nnfCnf())) return;
270
331
  this.setEliminateAnd(true);
271
- this.reduceAsserted();
272
- if (this.isInconsistent) return;
273
- if (this.hasQuantifiers && this.simplifyFormulas((formula) => this.refineInjAxiom(formula)))
274
- this.isReducePending = true;
275
- if (this.isInconsistent) return;
276
- this.findMacros();
277
- if (this.isInconsistent) return;
278
- if (
279
- this.hasQuantifiers &&
280
- this.simplifyFormulas((formula) => this.patternInference.rewrite(formula))
281
- )
282
- this.isReducePending = true;
283
- if (this.isInconsistent) return;
284
- if (this.simplifyFormulas((formula) => this.bvSharing.rewrite(formula)))
285
- this.isReducePending = true;
286
- if (this.isInconsistent) return;
287
- this.reduceAsserted();
288
- if (this.isInconsistent) return;
289
- this.isReducePending = true;
290
- this.flattenClauses();
291
- if (this.isInconsistent) return;
332
+ if (!this.invoke(true, () => this.reduceAsserted())) return;
333
+ if (!this.invoke(this.isLiftingNonGroundIte, () => this.liftNonGroundIte())) return;
334
+ if (!this.invoke(this.isEliminatingTermIte, () => this.elimTermIte())) return;
335
+ if (!this.invoke(this.hasQuantifiers, () => this.refineInjAxioms())) return;
336
+ if (!this.invoke(isFindingMacros, () => this.findMacros())) return;
337
+ if (!this.invoke(this.isEliminatingBounds && this.hasQuantifiers, () => this.elimBounds()))
338
+ return;
339
+ if (!this.invoke(this.hasQuantifiers, () => this.inferPatterns())) return;
340
+ if (!this.invoke(true, () => this.maximizeBvSharing())) return;
341
+ if (!this.invoke(true, () => this.reduceAsserted())) return;
342
+ if (!this.invoke(true, () => this.flattenClauses())) return;
292
343
  this.flushCache();
293
344
  }
294
345
 
346
+ private isCanceled() {
347
+ return !this.manager.limit.inc();
348
+ }
349
+
350
+ private invoke(isApplying: boolean, step: () => void) {
351
+ if (!isApplying) return true;
352
+ step();
353
+ return !this.isInconsistent && !this.isCanceled();
354
+ }
355
+
295
356
  private pushAssertion(expr: number, result: RefVector) {
296
357
  const manager = this.manager;
297
358
  if (this.isInconsistent || manager.isTrue(expr)) return;
@@ -330,8 +391,43 @@ export class AssertedFormulas {
330
391
  return formula;
331
392
  }
332
393
 
394
+ private elimTermIte() {
395
+ const elim = this.termIteElim;
396
+ if (!this.simplifyFormulas((formula) => elim.rewrite(formula))) return;
397
+ if (elim.definitions.size > 0) this.isReducePending = true;
398
+ for (const definition of elim.definitions.items) this.formulas.push(definition);
399
+ this.flushCache();
400
+ this.reduceAsserted();
401
+ elim.reset();
402
+ }
403
+
404
+ private simplifyAndReduce(simplify: (formula: number) => number) {
405
+ if (!this.simplifyFormulas(simplify)) return;
406
+ this.flushCache();
407
+ this.reduceAsserted();
408
+ }
409
+
410
+ private liftNonGroundIte() {
411
+ this.simplifyAndReduce((formula) => this.ngLiftIte.rewrite(formula));
412
+ }
413
+
414
+ private refineInjAxioms() {
415
+ this.simplifyFormulas((formula) => this.refineInjAxiom(formula));
416
+ }
417
+
418
+ private elimBounds() {
419
+ this.simplifyAndReduce((formula) => this.boundsElim.rewrite(formula));
420
+ }
421
+
422
+ private inferPatterns() {
423
+ this.simplifyFormulas((formula) => this.patternInference.rewrite(formula));
424
+ }
425
+
426
+ private maximizeBvSharing() {
427
+ if (this.simplifyFormulas((formula) => this.bvSharing.rewrite(formula))) this.reduceAsserted();
428
+ }
429
+
333
430
  private findMacros() {
334
- if (!this.isFindingMacros || !this.hasQuantifiers) return;
335
431
  this.isReducePending = true;
336
432
  this.swapFormulas(this.macros.find(this.formulas.items.slice(this.qhead)));
337
433
  this.flushCache();
@@ -360,19 +456,22 @@ export class AssertedFormulas {
360
456
  private simplifyFormulas(simplify: (formula: number) => number) {
361
457
  const manager = this.manager;
362
458
  const formulas = new RefVector(manager);
363
- let isChanged = false;
364
459
  for (let index = this.qhead; index < this.formulas.size; index++) {
365
460
  const formula = this.formulas.items[index];
366
461
  const result = simplify(formula);
367
462
  if (result === formula) formulas.push(formula);
368
463
  else {
369
464
  this.pushAssertion(result, formulas);
370
- isChanged = true;
465
+ this.isReducePending = true;
371
466
  }
372
467
  manager.decRef(result);
468
+ if (this.isCanceled()) {
469
+ formulas.reset();
470
+ return false;
471
+ }
373
472
  }
374
473
  this.swapFormulas(formulas);
375
- return isChanged;
474
+ return true;
376
475
  }
377
476
 
378
477
  private reduceAsserted() {
@@ -410,28 +509,42 @@ export class AssertedFormulas {
410
509
  }
411
510
 
412
511
  private nnfCnf() {
512
+ this.isReducePending = true;
413
513
  const manager = this.manager;
414
514
  const nnf = new Nnf(manager, this.names);
415
515
  const formulas = new RefVector(manager);
416
516
  const todo = new RefVector(manager);
417
- for (let index = this.qhead; index < this.formulas.size; index++) {
418
- todo.reset();
419
- let result = nnf.apply(this.formulas.items[index], todo);
420
- todo.push(result);
421
- for (let position = 0; position < todo.size; position++) {
422
- const rewritten = this.rewriter.rewrite(todo.items[position]);
517
+ const isFinished = (() => {
518
+ for (let index = this.qhead; index < this.formulas.size; index++) {
519
+ todo.reset();
520
+ let result = nnf.apply(this.formulas.items[index], todo);
521
+ todo.push(result);
522
+ if (this.isCanceled()) {
523
+ manager.decRef(result);
524
+ return false;
525
+ }
526
+ for (let position = 0; position < todo.size; position++) {
527
+ const rewritten = this.rewriter.rewrite(todo.items[position]);
528
+ manager.decRef(result);
529
+ result = rewritten;
530
+ if (this.isCanceled()) {
531
+ manager.decRef(result);
532
+ return false;
533
+ }
534
+ this.pushAssertion(result, formulas);
535
+ }
423
536
  manager.decRef(result);
424
- result = rewritten;
425
- this.pushAssertion(result, formulas);
426
537
  }
427
- manager.decRef(result);
428
- }
429
- this.swapFormulas(formulas);
538
+ return true;
539
+ })();
540
+ if (isFinished) this.swapFormulas(formulas);
430
541
  todo.reset();
542
+ formulas.reset();
431
543
  nnf.release();
432
544
  }
433
545
 
434
546
  private flattenClauses() {
547
+ this.isReducePending = true;
435
548
  const manager = this.manager;
436
549
  const mkNegation = (expr: number) =>
437
550
  manager.isNot(expr) ? manager.getArg(expr, 0) : manager.mkApp(OP_NOT, [expr], SORT_BOOL);
@@ -250,7 +250,7 @@ const compareDecls = (manager: AstManager, first: number, second: number) => {
250
250
  return compareSorts(manager, firstKey.range, secondKey.range);
251
251
  };
252
252
 
253
- export const compareAsts = (manager: AstManager, first: number, second: number): number => {
253
+ const compareAsts = (manager: AstManager, first: number, second: number): number => {
254
254
  if (first === second) return 0;
255
255
  const byKind = compareValues(manager.kinds[first], manager.kinds[second]);
256
256
  if (byKind !== 0) return byKind;