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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (196) hide show
  1. package/dist/deciders.cjs +37 -36
  2. package/dist/deciders.js +55 -54
  3. package/dist/index.cjs +1 -1
  4. package/dist/index.d.cts +3 -0
  5. package/dist/index.d.ts +3 -0
  6. package/dist/index.js +1 -1
  7. package/dist/parallel-worker.cjs +1 -1
  8. package/dist/parallel-worker.js +1 -1
  9. package/dist/prove.cjs +146 -58
  10. package/dist/prove.js +142 -54
  11. package/dist/run.cjs +45 -43
  12. package/dist/run.js +47 -45
  13. package/dist/transfer.cjs +39 -36
  14. package/dist/transfer.js +23 -20
  15. package/dist/worker.cjs +1 -1
  16. package/dist/worker.js +1 -1
  17. package/package.json +1 -1
  18. package/src/ast.ts +3 -3
  19. package/src/check.ts +203 -33
  20. package/src/cli/tlapm.ts +261 -68
  21. package/src/dependencies.ts +23 -2
  22. package/src/errors.ts +1 -1
  23. package/src/exit-codes.ts +1 -0
  24. package/src/liveness-checker.ts +530 -201
  25. package/src/liveness.ts +47 -32
  26. package/src/obligations/anonymize.ts +2 -4
  27. package/src/obligations/index.ts +5 -3
  28. package/src/obligations/pragma.ts +2 -2
  29. package/src/parallel.ts +2 -2
  30. package/src/parser.ts +151 -42
  31. package/src/prover/deciders.ts +1 -8
  32. package/src/prover/isabelle/isar/attrib.ts +86 -45
  33. package/src/prover/isabelle/isar/context.ts +25 -22
  34. package/src/prover/isabelle/isar/induct.ts +2 -5
  35. package/src/prover/isabelle/isar/method.ts +5 -7
  36. package/src/prover/isabelle/isar/proof.ts +33 -16
  37. package/src/prover/isabelle/isar/rule-cases.ts +6 -14
  38. package/src/prover/isabelle/isar/theory.ts +16 -17
  39. package/src/prover/isabelle/isar/toplevel.ts +46 -52
  40. package/src/prover/isabelle/provers/classical.ts +1 -1
  41. package/src/prover/ocaml.ts +4 -1
  42. package/src/prover/prep/action.ts +1 -0
  43. package/src/prover/prep/methods.ts +50 -3
  44. package/src/prover/prep/normalize.ts +4 -1
  45. package/src/prover/prove.ts +58 -32
  46. package/src/prover/ptl/decide.ts +43 -63
  47. package/src/prover/smt/data.ts +51 -45
  48. package/src/prover/smt/encode.ts +1 -2
  49. package/src/prover/smt/rewrite.ts +1 -0
  50. package/src/prover/smt/solver/aig-tactic.ts +25 -15
  51. package/src/prover/smt/solver/arith-rewriter.ts +3 -5
  52. package/src/prover/smt/solver/asserted-formulas.ts +1 -1
  53. package/src/prover/smt/solver/ast-util.ts +3 -1
  54. package/src/prover/smt/solver/ast.ts +110 -152
  55. package/src/prover/smt/solver/bound-manager.ts +39 -28
  56. package/src/prover/smt/solver/bv-bound-chk.ts +2 -8
  57. package/src/prover/smt/solver/bv-rewriter.ts +14 -16
  58. package/src/prover/smt/solver/bv1-blast.ts +1 -9
  59. package/src/prover/smt/solver/cg-table.ts +19 -14
  60. package/src/prover/smt/solver/check-logic.ts +6 -1
  61. package/src/prover/smt/solver/context.ts +20 -10
  62. package/src/prover/smt/solver/demodulator.ts +2 -2
  63. package/src/prover/smt/solver/dependent-expr-state.ts +16 -0
  64. package/src/prover/smt/solver/distribute-forall.ts +1 -10
  65. package/src/prover/smt/solver/dom-simplify.ts +1 -1
  66. package/src/prover/smt/solver/dt2bv-tactic.ts +2 -7
  67. package/src/prover/smt/solver/e-matching.ts +6 -6
  68. package/src/prover/smt/solver/elim-uncnstr.ts +3 -14
  69. package/src/prover/smt/solver/enode.ts +15 -1
  70. package/src/prover/smt/solver/euf/array-internalize.ts +19 -8
  71. package/src/prover/smt/solver/euf/dt-solver.ts +19 -19
  72. package/src/prover/smt/solver/euf/egraph.ts +65 -32
  73. package/src/prover/smt/solver/euf/euf-solver.ts +35 -18
  74. package/src/prover/smt/solver/euf/fpa-solver.ts +37 -51
  75. package/src/prover/smt/solver/euf/mam.ts +6 -48
  76. package/src/prover/smt/solver/euf/q-ematch.ts +21 -94
  77. package/src/prover/smt/solver/euf/q-mbi.ts +4 -2
  78. package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -1
  79. package/src/prover/smt/solver/euf/q-solver.ts +2 -0
  80. package/src/prover/smt/solver/euf/th-solver.ts +1 -1
  81. package/src/prover/smt/solver/factor.ts +1 -11
  82. package/src/prover/smt/solver/fd-solver.ts +1 -2
  83. package/src/prover/smt/solver/fm-tactic.ts +19 -13
  84. package/src/prover/smt/solver/fpa-rewriter.ts +3 -1
  85. package/src/prover/smt/solver/fpa2bv-converter.ts +10 -6
  86. package/src/prover/smt/solver/internalizer.ts +41 -2
  87. package/src/prover/smt/solver/lia2pb.ts +18 -4
  88. package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
  89. package/src/prover/smt/solver/lp/nla-powers.ts +144 -107
  90. package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -17
  91. package/src/prover/smt/solver/macro-finder.ts +1 -1
  92. package/src/prover/smt/solver/mam-compiler.ts +13 -13
  93. package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -11
  94. package/src/prover/smt/solver/maxcore.ts +4 -12
  95. package/src/prover/smt/solver/maxlex.ts +0 -7
  96. package/src/prover/smt/solver/maxsmt-base.ts +7 -0
  97. package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -11
  98. package/src/prover/smt/solver/mbp/mbp-plugin.ts +9 -0
  99. package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -9
  100. package/src/prover/smt/solver/model-evaluator.ts +9 -5
  101. package/src/prover/smt/solver/model-macro-solver.ts +3 -3
  102. package/src/prover/smt/solver/muz/dl-context.ts +57 -3
  103. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -20
  104. package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -1
  105. package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -10
  106. package/src/prover/smt/solver/muz/dl-mk-slice.ts +76 -13
  107. package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -2
  108. package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -2
  109. package/src/prover/smt/solver/muz/dl-rule.ts +93 -29
  110. package/src/prover/smt/solver/muz/hnf.ts +6 -5
  111. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +178 -0
  112. package/src/prover/smt/solver/muz/horn-tactic.ts +14 -3
  113. package/src/prover/smt/solver/muz/rule-properties.ts +194 -36
  114. package/src/prover/smt/solver/muz/spacer-context.ts +102 -84
  115. package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -2
  116. package/src/prover/smt/solver/muz/spacer-pdr.ts +3 -3
  117. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +2 -7
  118. package/src/prover/smt/solver/muz/spacer-util.ts +2 -2
  119. package/src/prover/smt/solver/muz/substitution.ts +88 -37
  120. package/src/prover/smt/solver/nlqsat.ts +2 -2
  121. package/src/prover/smt/solver/nlsat/algebraic.ts +1 -2
  122. package/src/prover/smt/solver/nlsat/explain.ts +5 -0
  123. package/src/prover/smt/solver/nlsat/solver.ts +36 -25
  124. package/src/prover/smt/solver/opt-context.ts +9 -8
  125. package/src/prover/smt/solver/opt-nlsat.ts +68 -58
  126. package/src/prover/smt/solver/opt-solver.ts +16 -7
  127. package/src/prover/smt/solver/optsmt.ts +12 -9
  128. package/src/prover/smt/solver/pattern-inference.ts +2 -2
  129. package/src/prover/smt/solver/pb-rewriter.ts +13 -13
  130. package/src/prover/smt/solver/poly-rewriter.ts +2 -2
  131. package/src/prover/smt/solver/probes.ts +1 -1
  132. package/src/prover/smt/solver/propagate-values.ts +4 -0
  133. package/src/prover/smt/solver/proto-model.ts +5 -5
  134. package/src/prover/smt/solver/purify-arith.ts +50 -15
  135. package/src/prover/smt/solver/qe-arith-plugin.ts +2 -1
  136. package/src/prover/smt/solver/qe-mbp.ts +13 -23
  137. package/src/prover/smt/solver/qe.ts +45 -53
  138. package/src/prover/smt/solver/qsat.ts +70 -90
  139. package/src/prover/smt/solver/quantifier-analyzer.ts +9 -9
  140. package/src/prover/smt/solver/quasi-macros.ts +9 -18
  141. package/src/prover/smt/solver/rational.ts +17 -0
  142. package/src/prover/smt/solver/recfun-decl-plugin.ts +33 -19
  143. package/src/prover/smt/solver/recfun-rewriter.ts +1 -1
  144. package/src/prover/smt/solver/rewriter-tpl.ts +6 -2
  145. package/src/prover/smt/solver/rewriter.ts +1 -1
  146. package/src/prover/smt/solver/sat/asymm-branch.ts +59 -46
  147. package/src/prover/smt/solver/sat/clause-use-list.ts +0 -6
  148. package/src/prover/smt/solver/sat/clause.ts +1 -3
  149. package/src/prover/smt/solver/sat/config.ts +3 -3
  150. package/src/prover/smt/solver/sat/consequences.ts +1 -1
  151. package/src/prover/smt/solver/sat/goal2sat.ts +1 -1
  152. package/src/prover/smt/solver/sat/inc-sat-solver.ts +4 -12
  153. package/src/prover/smt/solver/sat/model-converter.ts +1 -15
  154. package/src/prover/smt/solver/sat/pb-solver.ts +49 -23
  155. package/src/prover/smt/solver/sat/probing.ts +22 -19
  156. package/src/prover/smt/solver/sat/sat2goal.ts +9 -10
  157. package/src/prover/smt/solver/sat/simplifier.ts +15 -56
  158. package/src/prover/smt/solver/sat/solver.ts +20 -19
  159. package/src/prover/smt/solver/sat/watch-list.ts +7 -0
  160. package/src/prover/smt/solver/seq-decl-plugin.ts +7 -7
  161. package/src/prover/smt/solver/seq-derive.ts +6 -7
  162. package/src/prover/smt/solver/seq-eq-solver.ts +7 -7
  163. package/src/prover/smt/solver/seq-range-predicate.ts +14 -1
  164. package/src/prover/smt/solver/seq-re-rewriter.ts +1 -10
  165. package/src/prover/smt/solver/seq-re-util.ts +1 -2
  166. package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
  167. package/src/prover/smt/solver/seq-regex-live.ts +4 -4
  168. package/src/prover/smt/solver/seq-rewriter.ts +1 -4
  169. package/src/prover/smt/solver/smt-setup.ts +15 -9
  170. package/src/prover/smt/solver/smtlib-parser.ts +1174 -579
  171. package/src/prover/smt/solver/smtlib-script.ts +866 -728
  172. package/src/prover/smt/solver/tactic.ts +66 -14
  173. package/src/prover/smt/solver/theory-array.ts +25 -58
  174. package/src/prover/smt/solver/theory-bv.ts +13 -50
  175. package/src/prover/smt/solver/theory-fpa.ts +46 -78
  176. package/src/prover/smt/solver/theory-pb.ts +10 -6
  177. package/src/prover/smt/solver/theory-recfun.ts +2 -2
  178. package/src/prover/smt/solver/theory-seq-regex.ts +3 -6
  179. package/src/prover/smt/solver/theory-seq-solve.ts +5 -5
  180. package/src/prover/smt/solver/theory-seq-state.ts +6 -3
  181. package/src/prover/smt/solver/theory-seq.ts +32 -54
  182. package/src/prover/smt/solver/theory.ts +16 -1
  183. package/src/prover/smt/solver/tseitin-cnf.ts +3 -3
  184. package/src/prover/smt/solver/var-subst.ts +2 -2
  185. package/src/prover/smt/table.ts +3 -2
  186. package/src/prover/zenon/decide.ts +9 -11
  187. package/src/prover/zenon/node.ts +12 -11
  188. package/src/prover/zenon/tla/sets.ts +1 -1
  189. package/src/search.ts +131 -16
  190. package/src/successors.ts +1 -1
  191. package/src/symmetry.ts +2 -2
  192. package/src/tableau.ts +2 -2
  193. package/src/tlc/fingerprint.ts +81 -9
  194. package/src/tlc/summary.ts +29 -14
  195. package/src/typed-tier.ts +6535 -0
  196. package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
@@ -46,6 +46,7 @@ import {
46
46
  UNION,
47
47
  } from "./format";
48
48
  import { getUntypedSpec } from "./arithmetic";
49
+ import type { SmtEncoding } from "./rewrite";
49
50
  import { axiom, type Axiom } from "./table";
50
51
  import { getTypeKey, getTypeName, IDV, type Type } from "./types";
51
52
 
@@ -58,12 +59,11 @@ export interface SymbolSpec {
58
59
  }
59
60
 
60
61
  export interface CollectState {
61
- isArithmetic: boolean;
62
- isSetExtensional: boolean;
62
+ encoding: SmtEncoding;
63
63
  recordFields: Map<string, string[]>;
64
64
  setTypes: Map<string, Type>;
65
65
  strings: string[];
66
- integers: number[];
66
+ integers: string[];
67
67
  isFunConstr: boolean;
68
68
  isFunSet: boolean;
69
69
  isExcept: boolean;
@@ -434,7 +434,8 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
434
434
  axiom("SetOfIntro", [count], undefined),
435
435
  axiom("SetOfElim", [count], undefined),
436
436
  ];
437
- if (!state.isSetExtensional) return createSpec(getOmittedDeclaration(name), ["Mem"], axioms);
437
+ if (!state.encoding.isSetExtensional)
438
+ return createSpec(getOmittedDeclaration(name), ["Mem"], axioms);
438
439
  return createSpec(
439
440
  getOmittedDeclaration(name),
440
441
  ["Mem", "IsSetOf"],
@@ -466,23 +467,27 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
466
467
  }
467
468
  const integer = /^IntLit_(\d+)$/.exec(name);
468
469
  if (integer) {
469
- const value = Number(integer[1]);
470
+ const value = integer[1];
470
471
  const distinct = state.integers.map((other) =>
471
- axiom("IntLitDistinct", [other, value], `(distinct ${tla(`IntLit_${other}`)} ${symbol})`),
472
+ axiom(
473
+ "IntLitDistinct",
474
+ [BigInt(other), BigInt(value)],
475
+ `(distinct ${tla(`IntLit_${other}`)} ${symbol})`,
476
+ ),
472
477
  );
473
478
  state.integers.push(value);
474
479
  const zero = tla("IntLit_0");
475
- const isPositivityNeeded = value === 0 && !state.isArithmetic;
480
+ const isPositivityNeeded = value === "0" && !state.encoding.isArithmetic;
476
481
  return declareSpec(
477
482
  name,
478
483
  0,
479
484
  ["Mem", "IntSet", "IntLit_0", "IntLteq", ...(isPositivityNeeded ? ["IntLit_1"] : [])],
480
485
  [
481
- axiom("IntLitIsint", [value], `(${MEM} ${symbol} ${INT_SET})`),
486
+ axiom("IntLitIsint", [BigInt(value)], `(${MEM} ${symbol} ${INT_SET})`),
482
487
  axiom(
483
488
  "IntLitZeroCmp",
484
- [value],
485
- value === 0 ? `(${INT_LTEQ} ${symbol} ${zero})` : `(${INT_LTEQ} ${zero} ${symbol})`,
489
+ [BigInt(value)],
490
+ value === "0" ? `(${INT_LTEQ} ${symbol} ${zero})` : `(${INT_LTEQ} ${zero} ${symbol})`,
486
491
  ),
487
492
  ...distinct,
488
493
  ...(isPositivityNeeded
@@ -501,7 +506,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
501
506
  if (tuple) {
502
507
  const count = Number(tuple[1]);
503
508
  state.tuples.push(count);
504
- const indexes = state.isArithmetic
509
+ const indexes = state.encoding.isArithmetic
505
510
  ? ["Cast_Int"]
506
511
  : count === 0
507
512
  ? ["IntLit_0"]
@@ -514,7 +519,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
514
519
  name,
515
520
  count,
516
521
  deps,
517
- getTupleAxioms(count, state.isExcept, state.isArithmetic),
522
+ getTupleAxioms(count, state.isExcept, state.encoding.isArithmetic),
518
523
  );
519
524
  }
520
525
  const product = /^Product_(\d+)$/.exec(name);
@@ -527,14 +532,14 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
527
532
  "Mem",
528
533
  `Tuple_${count}`,
529
534
  "FunApp",
530
- ...(state.isArithmetic ? ["Cast_Int", "Proj_Int"] : getLiteralNames(count)),
535
+ ...(state.encoding.isArithmetic ? ["Cast_Int", "Proj_Int"] : getLiteralNames(count)),
531
536
  ],
532
537
  getComponentSet(
533
538
  "Product",
534
539
  [count],
535
540
  symbol,
536
541
  tla(`Tuple_${count}`),
537
- getIntegers(count, state.isArithmetic),
542
+ getIntegers(count, state.encoding.isArithmetic),
538
543
  "t",
539
544
  ),
540
545
  );
@@ -590,7 +595,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
590
595
  }
591
596
  const anonymous = state.anonymous.get(name);
592
597
  if (anonymous !== undefined) return declareSpec(name, anonymous, [], []);
593
- const untyped = state.isArithmetic ? undefined : getUntypedSpec(name);
598
+ const untyped = state.encoding.isArithmetic ? undefined : getUntypedSpec(name);
594
599
  if (untyped) return untyped;
595
600
  const known = STATIC_SPECS.get(name);
596
601
  if (known) return known;
@@ -617,7 +622,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
617
622
  "IntSet",
618
623
  "NatSet",
619
624
  "Tuple_0",
620
- state.isArithmetic ? "Proj_Int" : "IntLteq",
625
+ state.encoding.isArithmetic ? "Proj_Int" : "IntLteq",
621
626
  ],
622
627
  [
623
628
  axiom("SeqSelectseqTyping", [], undefined),
@@ -628,48 +633,49 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
628
633
  ],
629
634
  );
630
635
  case "Mem":
631
- if (!state.isSetExtensional) return declareSpec(name, 2, [], [], "Bool");
632
636
  return declareSpec(
633
- "Mem",
637
+ name,
634
638
  2,
635
- ["SetExtTrigger"],
636
- [
637
- axiom(
638
- "SetExt",
639
- [],
640
- `(forall ((x Idv) (y Idv)) (! (=> (forall ((z Idv)) (= (${MEM} z x) (${MEM} z y))) (= x y)) :pattern ((${SET_EXT_TRIGGER} x y))))`,
641
- ),
642
- ],
639
+ state.encoding.isSetExtensional ? ["SetExtTrigger"] : [],
640
+ state.encoding.isSetExtensional
641
+ ? [
642
+ axiom(
643
+ "SetExt",
644
+ [],
645
+ `(forall ((x Idv) (y Idv)) (! (=> (forall ((z Idv)) (= (${MEM} z x) (${MEM} z y))) (= x y)) :pattern ((${SET_EXT_TRIGGER} x y))))`,
646
+ ),
647
+ ]
648
+ : [],
643
649
  "Bool",
644
650
  );
645
651
  case "Cap":
646
- if (!state.isSetExtensional)
647
- return declareSpec(
648
- name,
649
- 2,
650
- ["Mem"],
651
- [getSetOperationDef("Cap", `(and (${MEM} x a) (${MEM} x b))`)],
652
- );
653
652
  return declareSpec(
654
- "Cap",
653
+ name,
655
654
  2,
656
- ["Mem", "SetEnum_0", "SetExtTrigger"],
655
+ ["Mem", ...(state.encoding.isSetExtensional ? ["SetEnum_0", "SetExtTrigger"] : [])],
657
656
  [
658
657
  getSetOperationDef("Cap", `(and (${MEM} x a) (${MEM} x b))`),
659
- axiom(
660
- "DisjointTrigger",
661
- [],
662
- `(forall ((x Idv) (y Idv)) (! (${SET_EXT_TRIGGER} (${CAP} x y) ${tla("SetEnum_0")}) :pattern ((${CAP} x y))))`,
663
- ),
658
+ ...(state.encoding.isSetExtensional
659
+ ? [
660
+ axiom(
661
+ "DisjointTrigger",
662
+ [],
663
+ `(forall ((x Idv) (y Idv)) (! (${SET_EXT_TRIGGER} (${CAP} x y) ${tla("SetEnum_0")}) :pattern ((${CAP} x y))))`,
664
+ ),
665
+ ]
666
+ : []),
664
667
  ],
665
668
  );
666
669
  case "SetSt":
667
- if (!state.isSetExtensional)
668
- return createSpec(getOmittedDeclaration(name), ["Mem"], [axiom("SetStDef", [], undefined)]);
669
670
  return createSpec(
670
671
  getOmittedDeclaration(name),
671
- ["Mem", "SetEnum_0", "SetExtTrigger"],
672
- [axiom("SetStDef", [], undefined), axiom("EmptyComprehensionTrigger", [], undefined)],
672
+ ["Mem", ...(state.encoding.isSetExtensional ? ["SetEnum_0", "SetExtTrigger"] : [])],
673
+ [
674
+ axiom("SetStDef", [], undefined),
675
+ ...(state.encoding.isSetExtensional
676
+ ? [axiom("EmptyComprehensionTrigger", [], undefined)]
677
+ : []),
678
+ ],
673
679
  );
674
680
  case "FunSet":
675
681
  state.isFunSet = true;
@@ -734,7 +740,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
734
740
  [],
735
741
  `(forall ((f Idv) (x Idv) (y Idv) (z Idv)) (! (=> (${MEM} z (${FUN_DOM} f)) (and (=> (= z x) (= (${FUN_APP} ${updated} z) y)) (=> (distinct z x) (= (${FUN_APP} ${updated} z) (${FUN_APP} f z))))) :pattern ((${FUN_APP} ${updated} z)) :pattern (${updated} (${FUN_APP} f z))))`,
736
742
  ),
737
- ...state.tuples.flatMap((count) => getTupleExcepts(count, state.isArithmetic)),
743
+ ...state.tuples.flatMap((count) => getTupleExcepts(count, state.encoding.isArithmetic)),
738
744
  ...state.records.flatMap(getRecordExcepts),
739
745
  ],
740
746
  );
@@ -82,8 +82,7 @@ const sortRecordFields = (expression: Expr): Expr =>
82
82
 
83
83
  const collectSymbols = (entries: Entry[], encoder: Encoder) => {
84
84
  const state: CollectState = {
85
- isArithmetic: encoder.encoding.isArithmetic,
86
- isSetExtensional: encoder.encoding.isSetExtensional,
85
+ encoding: encoder.encoding,
87
86
  recordFields: encoder.recordFields,
88
87
  setTypes: encoder.setTypes,
89
88
  strings: [],
@@ -1093,6 +1093,7 @@ export const encode = (
1093
1093
  return wrapIdv(tla(`StrLit_${expression.value}`), getTypedOnly(encoder, STRING));
1094
1094
  case "Num":
1095
1095
  if (expression.fraction !== "") throw new TlaUnsupportedError("a real number");
1096
+ // Deviation from tlapm: its int_of_string fails the obligation for a literal above 2^62 - 1.
1096
1097
  // Type.Synthesize gives a number no type when arithmetic is off.
1097
1098
  if (!encoder.encoding.isArithmetic)
1098
1099
  return wrapIdv(tla(`IntLit_${BigInt(expression.integer)}`));
@@ -1,5 +1,5 @@
1
1
  // Ported from Z3 (src/tactic/aig/aig_tactic.cpp), MIT license, see z3-license.txt.
2
- import { SmtTacticError, SmtUnsupportedError } from "../../../errors";
2
+ import { SmtTacticError } from "../../../errors";
3
3
  import type { AstManager } from "./ast";
4
4
  import { AigManager } from "./aig";
5
5
  import { getNumExprs } from "./ast-util";
@@ -7,32 +7,42 @@ import type { Goal } from "./goal";
7
7
  import { RefVector } from "./ref-vector";
8
8
  import type { Tactic } from "./tactic";
9
9
 
10
- // Z3 rewrites each formula with a dependency on its own, but the goal does not track dependencies,
11
- // which only named assertions under unsat cores have.
12
10
  export const createAigTactic =
13
11
  (manager: AstManager): Tactic =>
14
12
  (goal: Goal) => {
15
13
  if (goal.isProofsEnabled) throw new SmtTacticError("aig does not support proof production");
16
- if (goal.isCoresEnabled) throw new SmtUnsupportedError("aig with unsat cores");
17
14
  const aigs = new AigManager(manager);
18
- const forms = new RefVector(manager);
19
- for (let index = 0; index < goal.forms.size; index++) {
20
- forms.push(goal.forms.items[index]);
21
- goal.update(index, manager.trueExpr);
22
- }
23
- if (forms.size > 0) {
24
- const conjunction = manager.mkAnd(forms.items);
25
- manager.incRef(conjunction);
26
- const root = aigs.mkAig(conjunction);
15
+ const useSharedFormula = (expr: number, use: (formula: number) => void) => {
16
+ const root = aigs.mkAig(expr);
27
17
  aigs.incRef(root);
28
18
  const shared = aigs.maxSharing(root);
29
19
  aigs.incRef(shared);
30
20
  aigs.decRef(root);
31
21
  const formula = aigs.toFormula(shared);
32
- const isSmall = getNumExprs(manager, formula) <= 1.2 * getNumExprs(manager, conjunction);
33
- goal.assert(isSmall ? formula : conjunction);
22
+ use(formula);
34
23
  manager.decRef(formula);
35
24
  aigs.decRef(shared);
25
+ };
26
+ const forms = new RefVector(manager);
27
+ for (let index = 0; index < goal.forms.size; index++) {
28
+ const form = goal.forms.items[index];
29
+ const dependency = goal.getDependency(index);
30
+ if (dependency === undefined) {
31
+ forms.push(form);
32
+ goal.update(index, manager.trueExpr);
33
+ } else
34
+ useSharedFormula(form, (formula) => {
35
+ if (getNumExprs(manager, formula) <= 1.2 * getNumExprs(manager, form))
36
+ goal.update(index, formula, dependency);
37
+ });
38
+ }
39
+ if (forms.size > 0) {
40
+ const conjunction = manager.mkAnd(forms.items);
41
+ manager.incRef(conjunction);
42
+ useSharedFormula(conjunction, (formula) => {
43
+ const isSmall = getNumExprs(manager, formula) <= 1.2 * getNumExprs(manager, conjunction);
44
+ goal.assert(isSmall ? formula : conjunction);
45
+ });
36
46
  manager.decRef(conjunction);
37
47
  }
38
48
  goal.elimTrue();
@@ -905,12 +905,10 @@ export class ArithRewriter extends PolyRewriter {
905
905
  else if (manager.getOp(child) === OP_TO_REAL) intArgs.push(manager.getArg(child, 0));
906
906
  else realArgs.push(child);
907
907
  }
908
- const mkSum = (args: number[], sort: number) =>
909
- args.length === 1 ? args[0] : manager.mkApp(op, args, sort);
910
- if (realArgs.length === 0) return this.reduce(mkSum(intArgs, SORT_INT), 1);
908
+ if (realArgs.length === 0) return this.reduce(manager.mkApp(op, intArgs, SORT_INT), 1);
911
909
  if (intArgs.length === 0 || op !== OP_ADD) return undefined;
912
- const intSum = mkSum(intArgs, SORT_INT);
913
- const realSum = mkSum(realArgs, SORT_REAL);
910
+ const intSum = manager.mkApp(OP_ADD, intArgs, SORT_INT);
911
+ const realSum = manager.mkApp(OP_ADD, realArgs, SORT_REAL);
914
912
  return this.reduce(
915
913
  manager.mkApp(OP_ADD, [intSum, manager.mkApp(OP_TO_INT, [realSum], SORT_INT)], SORT_INT),
916
914
  3,
@@ -125,7 +125,7 @@ class Substitution {
125
125
 
126
126
  update(expr: number) {
127
127
  const manager = this.manager;
128
- if (manager.isGround(expr) && manager.getOp(expr) === OP_EQ) {
128
+ if (manager.isGroundApp(expr) && manager.getOp(expr) === OP_EQ) {
129
129
  const left = manager.getArg(expr, 0);
130
130
  const right = manager.getArg(expr, 1);
131
131
  if (isGreater(manager, left, right)) {
@@ -118,6 +118,8 @@ export const pushNotOwned = (manager: AstManager, expr: number): number => {
118
118
 
119
119
  const ASSOCIATIVE_OPS = new Set([OP_AND, OP_OR, OP_XOR, OP_ADD, OP_MUL, OP_SEQ_CONCAT]);
120
120
 
121
+ export const isAssociativeOp = (op: number) => ASSOCIATIVE_OPS.has(op) || isAssociativeBvOp(op);
122
+
121
123
  // Like Z3, marks only the expressions with several references, and counts an associative
122
124
  // application of n arguments as n - 1 binary ones.
123
125
  export const getNumExprs = (manager: AstManager, root: number) => {
@@ -145,7 +147,7 @@ export const getNumExprs = (manager: AstManager, root: number) => {
145
147
  }
146
148
  const op = manager.getOp(expr);
147
149
  const numArgs = manager.getNumArgs(expr);
148
- count += ASSOCIATIVE_OPS.has(op) || isAssociativeBvOp(op) ? numArgs - 1 : 1;
150
+ count += isAssociativeOp(op) ? numArgs - 1 : 1;
149
151
  for (let index = 0; index < numArgs; index++) {
150
152
  const arg = manager.getArg(expr, index);
151
153
  if (isUnvisited(arg)) todo.push(arg);