tla-ts 0.0.10-dev.28c823e4b → 0.0.10-dev.63a6693bd

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 (172) hide show
  1. package/dist/compile.cjs +6 -6
  2. package/dist/compile.js +10 -10
  3. package/dist/deciders.cjs +29 -29
  4. package/dist/deciders.js +40 -40
  5. package/dist/index.cjs +1 -1
  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-worker.cjs +1 -1
  10. package/dist/prove-worker.js +1 -1
  11. package/dist/prove.cjs +54 -54
  12. package/dist/prove.js +52 -52
  13. package/dist/run.cjs +42 -42
  14. package/dist/run.js +44 -44
  15. package/dist/tlapm.cjs +2 -2
  16. package/dist/tlapm.js +2 -2
  17. package/dist/transfer.cjs +39 -39
  18. package/dist/transfer.js +41 -41
  19. package/dist/worker.cjs +4 -4
  20. package/dist/worker.js +4 -4
  21. package/package.json +1 -1
  22. package/src/ast.ts +44 -39
  23. package/src/builtins.ts +4 -13
  24. package/src/check-failure.ts +116 -0
  25. package/src/check-trace.ts +282 -0
  26. package/src/check.ts +152 -518
  27. package/src/cli/options.ts +6 -31
  28. package/src/cli/shared.ts +1 -1
  29. package/src/cli/tlapm.ts +14 -13
  30. package/src/cli/tlc-arguments.ts +222 -210
  31. package/src/cli/tlc-output.ts +687 -0
  32. package/src/cli/tlc-usage.ts +1 -1
  33. package/src/cli/tlc.ts +34 -701
  34. package/src/cli/xml-exporter.ts +23 -33
  35. package/src/codegen.ts +5 -10
  36. package/src/coverage.ts +3 -10
  37. package/src/dependencies.ts +8 -13
  38. package/src/dfid.ts +16 -16
  39. package/src/environment-config.ts +315 -0
  40. package/src/environment.ts +45 -333
  41. package/src/errors.ts +3 -2
  42. package/src/evaluate.ts +5 -4
  43. package/src/fingerprints.ts +65 -1
  44. package/src/instances.ts +47 -10
  45. package/src/java-hash.ts +7 -0
  46. package/src/json.ts +4 -7
  47. package/src/levels.ts +39 -42
  48. package/src/liveness-checker.ts +24 -37
  49. package/src/liveness.ts +47 -54
  50. package/src/obligations/action.ts +4 -11
  51. package/src/obligations/anonymize.ts +4 -2
  52. package/src/obligations/expression.ts +18 -2
  53. package/src/obligations/generate.ts +45 -38
  54. package/src/obligations/index.ts +2 -2
  55. package/src/obligations/module.ts +27 -38
  56. package/src/obligations/normalize.ts +2 -1
  57. package/src/obligations/simplify.ts +39 -44
  58. package/src/obligations/source.ts +47 -57
  59. package/src/obligations/temporal.ts +5 -5
  60. package/src/parallel-worker.ts +10 -30
  61. package/src/parallel.ts +22 -45
  62. package/src/parser.ts +19 -34
  63. package/src/prover/decide-pool.ts +3 -3
  64. package/src/prover/deciders.ts +3 -3
  65. package/src/prover/isabelle/encode.ts +1 -1
  66. package/src/prover/isabelle/isar/inner-syntax.ts +9 -4
  67. package/src/prover/isabelle/isar/method.ts +14 -25
  68. package/src/prover/isabelle/isar/theory.ts +11 -10
  69. package/src/prover/isabelle/isar/type-check.ts +6 -6
  70. package/src/prover/isabelle/provers/blast/blast.ts +7 -63
  71. package/src/prover/isabelle/provers/hypsubst.ts +17 -26
  72. package/src/prover/isabelle/pure/bicompose.ts +9 -25
  73. package/src/prover/isabelle/pure/conv.ts +2 -8
  74. package/src/prover/isabelle/pure/drule.ts +9 -2
  75. package/src/prover/isabelle/pure/logic.ts +1 -1
  76. package/src/prover/isabelle/pure/raw-simplifier.ts +4 -13
  77. package/src/prover/isabelle/pure/rewriter.ts +5 -9
  78. package/src/prover/isabelle/pure/table.ts +2 -1
  79. package/src/prover/isabelle/pure/tactical.ts +42 -35
  80. package/src/prover/isabelle/pure/thm.ts +14 -11
  81. package/src/prover/isabelle/tla/classical-setup.ts +17 -14
  82. package/src/prover/isabelle/tla/context.ts +7 -2
  83. package/src/prover/isabelle/tla/logic.ts +10 -21
  84. package/src/prover/isabelle/tla/simpdata.ts +1 -10
  85. package/src/prover/prep/action.ts +11 -19
  86. package/src/prover/prep/fingerprint.ts +2 -5
  87. package/src/prover/prep/methods.ts +24 -3
  88. package/src/prover/prove.ts +87 -64
  89. package/src/prover/smt/context.ts +1 -2
  90. package/src/prover/smt/data.ts +418 -406
  91. package/src/prover/smt/encode.ts +30 -18
  92. package/src/prover/smt/rewrite.ts +657 -626
  93. package/src/prover/smt/solver/ast.ts +0 -22
  94. package/src/prover/smt/solver/auf-solver.ts +2 -5
  95. package/src/prover/smt/solver/context.ts +3 -3
  96. package/src/prover/smt/solver/e-matching.ts +1 -1
  97. package/src/prover/smt/solver/expr-safe-replace.ts +1 -1
  98. package/src/prover/smt/solver/internalizer.ts +1 -2
  99. package/src/prover/smt/solver/lp/dioph-eq.ts +1 -8
  100. package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -1
  101. package/src/prover/smt/solver/lp/nla-core.ts +2 -6
  102. package/src/prover/smt/solver/mam-compiler.ts +4 -2
  103. package/src/prover/smt/solver/model-checker.ts +1 -1
  104. package/src/prover/smt/solver/model-finder.ts +12 -17
  105. package/src/prover/smt/solver/model-macro-solver.ts +11 -19
  106. package/src/prover/smt/solver/nlsat/algebraic.ts +9 -9
  107. package/src/prover/smt/solver/nlsat/atoms.ts +20 -4
  108. package/src/prover/smt/solver/nlsat/explain.ts +7 -22
  109. package/src/prover/smt/solver/nlsat/levelwise.ts +1 -6
  110. package/src/prover/smt/solver/nlsat/polynomial.ts +12 -3
  111. package/src/prover/smt/solver/nlsat/solver.ts +12 -24
  112. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -1
  113. package/src/prover/smt/solver/proto-model.ts +0 -4
  114. package/src/prover/smt/solver/quantifier-analyzer.ts +10 -10
  115. package/src/prover/smt/solver/quantifier-manager.ts +1 -5
  116. package/src/prover/smt/solver/smtlib-parser.ts +78 -94
  117. package/src/prover/smt/solver/theory-lra-bounds.ts +1 -2
  118. package/src/prover/smt/solver/theory-lra-internalize.ts +5 -16
  119. package/src/prover/tlapm/cache.ts +28 -18
  120. package/src/prover/tlapm/tlapm.ts +15 -9
  121. package/src/prover/verdict.ts +7 -0
  122. package/src/prover/zenon/check/check.ts +1 -2
  123. package/src/prover/zenon/check/records.ts +1 -1
  124. package/src/prover/zenon/check/relations.ts +2 -1
  125. package/src/prover/zenon/check/rewrites.ts +2 -15
  126. package/src/prover/zenon/check/sets.ts +40 -58
  127. package/src/prover/zenon/check/terms.ts +1 -2
  128. package/src/prover/zenon/eqrel.ts +2 -0
  129. package/src/prover/zenon/expr.ts +7 -0
  130. package/src/prover/zenon/index-table.ts +9 -19
  131. package/src/prover/zenon/isar.ts +35 -35
  132. package/src/prover/zenon/llproof.ts +2 -11
  133. package/src/prover/zenon/mltoll.ts +12 -28
  134. package/src/prover/zenon/parse.ts +3 -6
  135. package/src/prover/zenon/search.ts +4 -14
  136. package/src/prover/zenon/tla/functions.ts +2 -2
  137. package/src/prover/zenon/tla/llproof.ts +9 -11
  138. package/src/prover/zenon/tla/records.ts +1 -6
  139. package/src/prover/zenon/tla/sets.ts +15 -14
  140. package/src/prover/zenon/tla/tla.ts +7 -6
  141. package/src/resolve.ts +55 -72
  142. package/src/sany/generation.ts +394 -0
  143. package/src/sany/generator-def-entries.ts +210 -0
  144. package/src/sany/generator-definitions.ts +686 -0
  145. package/src/sany/generator-expressions.ts +1100 -0
  146. package/src/sany/generator-proofs.ts +662 -0
  147. package/src/sany/generator.ts +155 -2625
  148. package/src/sany/lexer.ts +17 -16
  149. package/src/sany/nodes.ts +6 -13
  150. package/src/sany/report.ts +3 -6
  151. package/src/sany/selectors.ts +35 -38
  152. package/src/sany/xml.ts +23 -55
  153. package/src/search.ts +65 -27
  154. package/src/simulate.ts +157 -133
  155. package/src/spec-description.ts +33 -48
  156. package/src/standard-modules.ts +16 -32
  157. package/src/state-graph.ts +2 -7
  158. package/src/substitution-levels.ts +5 -4
  159. package/src/successors.ts +5 -7
  160. package/src/tlc/messages.ts +20 -15
  161. package/src/tlc/order.ts +2 -9
  162. package/src/tlc/random.ts +4 -4
  163. package/src/tlc/replay.ts +8 -15
  164. package/src/tlc/tlc-operators.ts +2 -3
  165. package/src/tlc/trace-spec.ts +25 -45
  166. package/src/typescript/actions.ts +2 -4
  167. package/src/typescript/collections.ts +34 -20
  168. package/src/typescript/compile.ts +1 -3
  169. package/src/typescript/formula.ts +5 -3
  170. package/src/typescript/model.ts +4 -5
  171. package/src/typescript/steps.ts +20 -18
  172. package/src/values.ts +63 -158
@@ -1,6 +1,6 @@
1
1
  // Ported from Isabelle2025's Pure/thm.ML. Copyright (c) 1986-2025 University of Cambridge, Technische Universitaet Muenchen, and contributors, see LICENSE.
2
2
 
3
- import { TlaIsabelleError } from "../../../errors";
3
+ import { isIsabelleError, TlaIsabelleError } from "../../../errors";
4
4
  import {
5
5
  betaNorm,
6
6
  emptyEnvir,
@@ -20,6 +20,7 @@ import {
20
20
  liftAll,
21
21
  listAll,
22
22
  listImplies,
23
+ isImplies,
23
24
  mkEquals,
24
25
  mkImplies,
25
26
  occs,
@@ -142,13 +143,7 @@ export const impliesIntr = (premise: Term, thm: Thm): Thm => {
142
143
 
143
144
  export const impliesElim = (major: Thm, minor: Thm): Thm => {
144
145
  const prop = major.prop;
145
- if (
146
- prop.kind !== "App" ||
147
- prop.fun.kind !== "App" ||
148
- prop.fun.fun.kind !== "Const" ||
149
- prop.fun.fun.name !== "Pure.imp" ||
150
- !aconv(prop.fun.arg, minor.prop)
151
- )
146
+ if (!isImplies(prop) || !aconv(prop.fun.arg, minor.prop))
152
147
  throw new TlaIsabelleError("THM", "implies_elim: major premise");
153
148
  return makeThm(
154
149
  Math.max(major.maxidx, minor.maxidx),
@@ -631,8 +626,7 @@ const bicomposeAux = (
631
626
  try {
632
627
  return stripPrems(compose.subgoals, [], orule.prop);
633
628
  } catch (error) {
634
- if (error instanceof TlaIsabelleError && error.exception === "TERM")
635
- throw new TlaIsabelleError("THM", "bicompose: rule");
629
+ if (isIsabelleError(error, "TERM")) throw new TlaIsabelleError("THM", "bicompose: rule");
636
630
  throw error;
637
631
  }
638
632
  })();
@@ -652,7 +646,7 @@ const bicomposeAux = (
652
646
  try {
653
647
  return flags.flatten ? renamed.map((premise) => flattenParams(index, premise)) : renamed;
654
648
  } catch (error) {
655
- if (error instanceof TlaIsabelleError && error.exception === "TERM")
649
+ if (isIsabelleError(error, "TERM"))
656
650
  throw new TlaIsabelleError("THM", "bicompose: 1st premise");
657
651
  throw error;
658
652
  }
@@ -758,3 +752,12 @@ export const rsn = (rule: Thm, index: number, state: Thm): Thm => {
758
752
  };
759
753
 
760
754
  export const rs = (rule: Thm, state: Thm) => rsn(rule, 1, state);
755
+
756
+ export const catchThm = <Result>(derive: () => Result): Result | undefined => {
757
+ try {
758
+ return derive();
759
+ } catch (error) {
760
+ if (isIsabelleError(error, "THM")) return undefined;
761
+ throw error;
762
+ }
763
+ };
@@ -4,12 +4,18 @@ import { TlaIsabelleError } from "../../../errors";
4
4
  import { emptyNet } from "../pure/net";
5
5
  import { thenGoal } from "../pure/tactical";
6
6
  import type { Limits } from "../pure/interrupt";
7
- import { assumeTac, dresolveTac, insertTaggedBrl, type NetPair } from "../pure/tactic";
7
+ import {
8
+ assumeTac,
9
+ dresolveTac,
10
+ insertTaggedBrl,
11
+ type NetPair,
12
+ type TaggedRule,
13
+ } from "../pure/tactic";
8
14
  import type { Term } from "../pure/term";
9
15
  import type { Thm } from "../pure/thm";
10
16
  import { addbefore, type Claset, type ClassicalData } from "../provers/classical";
11
17
  import { hypSubstTac, type HypsubstData } from "../provers/hypsubst";
12
- import type { LogicNetItem, LogicNetPair, TlaLogic } from "./logic";
18
+ import type { LogicNetPair, TlaLogic } from "./logic";
13
19
 
14
20
  export const getFact = (logic: TlaLogic, name: string): Thm => {
15
21
  const thms = logic.facts.get(name);
@@ -52,19 +58,16 @@ export const getHypsubstData = (logic: TlaLogic): HypsubstData => ({
52
58
  thinRefl: getFact(logic, "PredicateLogic.thin_refl"),
53
59
  });
54
60
 
55
- export const getClassicalData = (logic: TlaLogic): ClassicalData => {
56
- const hypsubst = getHypsubstData(logic);
57
- return {
58
- impElim: getFact(logic, "PredicateLogic.impCE'"),
59
- notElim: getFact(logic, "PredicateLogic.notE"),
60
- swap: getFact(logic, "PredicateLogic.swap"),
61
- classical: getFact(logic, "PredicateLogic.classical"),
62
- judgment: "PredicateLogic.Trueprop",
63
- hypSubstTacs: [(limits: Limits) => hypSubstTac({ limits, data: hypsubst })],
64
- };
65
- };
61
+ export const getClassicalData = (logic: TlaLogic, hypsubst: HypsubstData): ClassicalData => ({
62
+ impElim: getFact(logic, "PredicateLogic.impCE'"),
63
+ notElim: getFact(logic, "PredicateLogic.notE"),
64
+ swap: getFact(logic, "PredicateLogic.swap"),
65
+ classical: getFact(logic, "PredicateLogic.classical"),
66
+ judgment: "PredicateLogic.Trueprop",
67
+ hypSubstTacs: [(limits: Limits) => hypSubstTac({ limits, data: hypsubst })],
68
+ });
66
69
 
67
- export const toNetPair = <Item extends LogicNetItem>(pair: LogicNetPair<Item>): NetPair<Item> => {
70
+ export const toNetPair = <Item extends TaggedRule>(pair: LogicNetPair<Item>): NetPair<Item> => {
68
71
  const insertAll = (items: readonly Item[], netpair: NetPair<Item>) =>
69
72
  items.reduceRight((result, item) => insertTaggedBrl(item, result), netpair);
70
73
  return insertAll(pair.elim, insertAll(pair.intro, { intro: emptyNet, elim: emptyNet }));
@@ -1,7 +1,8 @@
1
1
  import { TlaIsabelleError } from "../../../errors";
2
2
  import type { ProofContext } from "../isar/method";
3
3
  import type { Limits } from "../pure/interrupt";
4
- import { blastDepthTac, blastTac, type BlastContext } from "../provers/blast/blast";
4
+ import { blastDepthTac, blastTac } from "../provers/blast/blast";
5
+ import type { BlastContext } from "../provers/blast/state";
5
6
  import type { ClassicalContext } from "../provers/classical";
6
7
  import { blastHypSubstTac } from "../provers/hypsubst";
7
8
  import {
@@ -26,8 +27,12 @@ const ATOMIZE_RULES = [
26
27
 
27
28
  export const getProofContext = (logic: TlaLogic, limits: Limits): ProofContext => {
28
29
  const atomizeRules = ATOMIZE_RULES.map((name) => getFact(logic, name));
29
- const classical = { limits, claset: getClaset(logic, limits), data: getClassicalData(logic) };
30
30
  const hypsubst = getHypsubstData(logic);
31
+ const classical = {
32
+ limits,
33
+ claset: getClaset(logic, limits),
34
+ data: getClassicalData(logic, hypsubst),
35
+ };
31
36
  const toBlastContext = (context: ClassicalContext): BlastContext => ({
32
37
  limits: context.limits,
33
38
  claset: context.claset,
@@ -1,5 +1,7 @@
1
1
  import { axiomThm, type Thm } from "../pure/thm";
2
2
  import type { ClassicalRule } from "../provers/classical";
3
+ import type { TaggedRule } from "../pure/tactic";
4
+ import type { ContextRule } from "../tools/intuitionistic";
3
5
  import {
4
6
  mkAbs,
5
7
  mkApp,
@@ -50,7 +52,6 @@ interface LogicJson {
50
52
  safep: [NetItem[], NetItem[]];
51
53
  unsafe: [NetItem[], NetItem[]];
52
54
  dup: [NetItem[], NetItem[]];
53
- extra: [ExtraNetItem[], ExtraNetItem[]];
54
55
  };
55
56
  contextRules: { bang: [ExtraNetItem[], ExtraNetItem[]]; plain: [ExtraNetItem[], ExtraNetItem[]] };
56
57
  }
@@ -61,16 +62,6 @@ export interface ConstInfo {
61
62
  readonly abbreviation: Term | undefined;
62
63
  }
63
64
 
64
- export interface LogicNetItem {
65
- readonly tag: number;
66
- readonly isElim: boolean;
67
- readonly rule: Thm;
68
- }
69
-
70
- export interface LogicExtraNetItem extends LogicNetItem {
71
- readonly weight: number;
72
- }
73
-
74
65
  export interface LogicNetPair<Item> {
75
66
  readonly intro: readonly Item[];
76
67
  readonly elim: readonly Item[];
@@ -94,14 +85,14 @@ export interface TlaLogic {
94
85
  readonly safeEs: readonly ClassicalRule[];
95
86
  readonly unsafeIs: readonly ClassicalRule[];
96
87
  readonly unsafeEs: readonly ClassicalRule[];
97
- readonly safe0: LogicNetPair<LogicNetItem>;
98
- readonly safep: LogicNetPair<LogicNetItem>;
99
- readonly unsafe: LogicNetPair<LogicNetItem>;
100
- readonly dup: LogicNetPair<LogicNetItem>;
88
+ readonly safe0: LogicNetPair<TaggedRule>;
89
+ readonly safep: LogicNetPair<TaggedRule>;
90
+ readonly unsafe: LogicNetPair<TaggedRule>;
91
+ readonly dup: LogicNetPair<TaggedRule>;
101
92
  };
102
93
  readonly contextRules: {
103
- readonly bang: LogicNetPair<LogicExtraNetItem>;
104
- readonly plain: LogicNetPair<LogicExtraNetItem>;
94
+ readonly bang: LogicNetPair<ContextRule>;
95
+ readonly plain: LogicNetPair<ContextRule>;
105
96
  };
106
97
  }
107
98
 
@@ -149,15 +140,13 @@ const parseLogic = (): TlaLogic => {
149
140
  dup: thms[raw[3]],
150
141
  dupSwapped: raw[4].map((id) => thms[id]),
151
142
  });
152
- const toItems = (pair: [NetItem[], NetItem[]]): LogicNetPair<LogicNetItem> => {
143
+ const toItems = (pair: [NetItem[], NetItem[]]): LogicNetPair<TaggedRule> => {
153
144
  const [intro, elim] = pair.map((side) =>
154
145
  side.map((item) => ({ tag: item[0], isElim: item[1] === 1, rule: thms[item[2]] })),
155
146
  );
156
147
  return { intro, elim };
157
148
  };
158
- const toExtraItems = (
159
- pair: [ExtraNetItem[], ExtraNetItem[]],
160
- ): LogicNetPair<LogicExtraNetItem> => {
149
+ const toExtraItems = (pair: [ExtraNetItem[], ExtraNetItem[]]): LogicNetPair<ContextRule> => {
161
150
  const [intro, elim] = pair.map((side) =>
162
151
  side.map((item) => ({
163
152
  weight: item[0],
@@ -32,7 +32,7 @@ import {
32
32
  type GoalTactic,
33
33
  } from "../pure/tactical";
34
34
  import { aconv, eqTerm, headOf, type Term } from "../pure/term";
35
- import { conclOf, rs, type Thm } from "../pure/thm";
35
+ import { catchThm, conclOf, rs, type Thm } from "../pure/thm";
36
36
  import { trade } from "../pure/variable";
37
37
  import { getFact } from "./classical-setup";
38
38
  import type { TlaLogic } from "./logic";
@@ -45,15 +45,6 @@ const isConstApp = (name: string, arity: number, term: Term): boolean =>
45
45
  const getPredicateFact = (logic: TlaLogic, name: string) =>
46
46
  getFact(logic, `PredicateLogic.${name}`);
47
47
 
48
- const catchThm = <Result>(derive: () => Result): Result | undefined => {
49
- try {
50
- return derive();
51
- } catch (error) {
52
- if (error instanceof TlaIsabelleError && error.exception === "THM") return undefined;
53
- throw error;
54
- }
55
- };
56
-
57
48
  const getRewriting = (logic: TlaLogic) => {
58
49
  const eqReflection = getPredicateFact(logic, "eq_reflection");
59
50
  const eqTrueI = getPredicateFact(logic, "eqTrueI");
@@ -40,7 +40,10 @@ const getHyp = (scope: Scope | undefined, index: number) => {
40
40
  const getLevel = (scope: Scope | undefined, expression: Expr) =>
41
41
  getLevelInfo(scope, expression).level;
42
42
 
43
- const isBuiltin = (expression: Expr, builtins: Builtin[]) =>
43
+ const isBuiltin = (
44
+ expression: Expr,
45
+ builtins: Builtin[],
46
+ ): expression is Extract<Expr, { kind: "Apply" }> =>
44
47
  expression.kind === "Apply" &&
45
48
  expression.operator.kind === "Internal" &&
46
49
  builtins.includes(expression.operator.builtin);
@@ -72,9 +75,7 @@ const expandAction: Rewrite = (scope, expression) => {
72
75
  };
73
76
 
74
77
  const expandUnchanged: Rewrite = (scope, expression) =>
75
- expression.kind === "Apply" &&
76
- isBuiltin(expression, ["UNCHANGED"]) &&
77
- expression.args.length === 1
78
+ isBuiltin(expression, ["UNCHANGED"]) && expression.args.length === 1
78
79
  ? rewriteUnchanged(expression.args[0])
79
80
  : mapScoped(scope, expression, expandUnchanged, adjoin, "all");
80
81
 
@@ -201,20 +202,15 @@ const renameHyp = (scope: Scope | undefined, hyp: Hyp, level?: number): Hyp => {
201
202
  const getOriginalLevel = (scope: Scope | undefined, hyp: Hyp) => {
202
203
  if (hyp.kind !== "Defn" || hyp.definition.kind !== "Operator") return undefined;
203
204
  const getNodeLevel = (expression: Expr) => {
204
- if (!isBuiltin(expression, ["UNCHANGED"]) || expression.kind !== "Apply") {
205
- return getLevel(scope, expression);
206
- }
205
+ if (!isBuiltin(expression, ["UNCHANGED"])) return getLevel(scope, expression);
207
206
  const flatten = (inner: Expr): Expr[] =>
208
207
  inner.kind === "Tuple" ? inner.elements.flatMap(flatten) : [inner];
209
208
  const items = flatten(expression.args[0]);
210
209
  return getLevel(scope, items.length === 1 ? items[0] : expression.args[0]);
211
210
  };
212
211
  const body = hyp.definition.body;
213
- const isCommuted =
214
- isBuiltin(body, ["Prime", "BoxTrue", "Diamond"]) &&
215
- body.kind === "Apply" &&
216
- body.args.length === 1;
217
- return getNodeLevel(isCommuted && body.kind === "Apply" ? body.args[0] : body);
212
+ const isCommuted = isBuiltin(body, ["Prime", "BoxTrue", "Diamond"]) && body.args.length === 1;
213
+ return getNodeLevel(isCommuted ? body.args[0] : body);
218
214
  };
219
215
 
220
216
  const renameContext = createContextMap<RenameState>(
@@ -417,12 +413,9 @@ const MODAL_BUILTINS: Builtin[] = [
417
413
  const coalesceModal: Rewrite = (scope, expression) => {
418
414
  if (expression.kind !== "Apply") return mapScoped(scope, expression, coalesceModal, adjoin);
419
415
  const operator = expression.operator;
420
- const arg = expression.args[0];
421
- if (
422
- isBuiltin(expression, ["Prime", "StrongPrime"]) &&
423
- expression.args.length === 1 &&
424
- arg.kind === "Ix"
425
- ) {
416
+ const args = expression.args;
417
+ const arg = args[0];
418
+ if (isBuiltin(expression, ["Prime", "StrongPrime"]) && args.length === 1 && arg.kind === "Ix") {
426
419
  const hyp = getHyp(scope, arg.index);
427
420
  if (hyp.kind === "Fresh" || hyp.kind === "Flex") {
428
421
  return at({ kind: "Opaque", name: `${hyp.name}#prime` }, expression);
@@ -433,7 +426,6 @@ const coalesceModal: Rewrite = (scope, expression) => {
433
426
  const hypScope = getScopeAt(scope, operator.index - 1);
434
427
  const hyp = hypScope?.hyp;
435
428
  if (!hyp) throw new TlapmBugError();
436
- const args = expression.args;
437
429
  if (hyp.kind === "Defn" && hyp.definition.kind === "Operator") {
438
430
  const substitutive = getSubstitutiveArgs(hypScope.rest, hyp.definition);
439
431
  const isKept = args.every(
@@ -4,11 +4,11 @@ import {
4
4
  type Bound,
5
5
  type Builtin,
6
6
  type Expr,
7
- type Hyp,
8
7
  type Scope,
9
8
  type Sequent,
10
9
  } from "../../obligations/expression";
11
10
  import { isConstant } from "../../obligations/temporal";
11
+ import { LEVEL_PREFIXES } from "./action";
12
12
  import { getMd5 } from "./md5";
13
13
 
14
14
  const BUILTIN_NUMBERS: Builtin[] = [
@@ -136,9 +136,6 @@ const getBuiltin = (builtin: Builtin) => {
136
136
  return `$${BUILTIN_NUMBERS.indexOf(builtin)}`;
137
137
  };
138
138
 
139
- const getFreshLabel = (hyp: Extract<Hyp, { kind: "Fresh" }>) =>
140
- hyp.level === "Unknown" ? "Unknown" : hyp.level.toUpperCase();
141
-
142
139
  const getFingerprintText = (sequent: Sequent) => {
143
140
  const stack: Entry[] = [];
144
141
  const getEntry = (index: number) => {
@@ -333,7 +330,7 @@ const getFingerprintText = (sequent: Sequent) => {
333
330
  switch (hyp.kind) {
334
331
  case "Fresh": {
335
332
  if (!hyp.domain) {
336
- const label = getFreshLabel(hyp);
333
+ const label = LEVEL_PREFIXES[hyp.level];
337
334
  const after = getRest({ kind: "Hyp", label });
338
335
  return after.entry.isUsed ? `${after.rest}${label}${hyp.name}` : after.rest;
339
336
  }
@@ -1,15 +1,36 @@
1
1
  import { TlapmBugError, TlaProverError } from "../../errors";
2
2
  import type { Expr, Locus, Sequent } from "../../obligations/expression";
3
3
  import type { OldMethod, PragmaSetting } from "../../obligations/pragma";
4
+ import type { Backend } from "../verdict";
5
+
6
+ type Prover =
7
+ | Backend
8
+ | "yices"
9
+ | "cvc3"
10
+ | "cooper"
11
+ | "fail"
12
+ | "verit"
13
+ | "zipper"
14
+ | "spass"
15
+ | "tptp"
16
+ | "trivial"
17
+ | "expandenabled"
18
+ | "expandcdot"
19
+ | "autouse"
20
+ | "lambdify"
21
+ | "enabledaxioms"
22
+ | "levelcomparison";
4
23
 
5
24
  export interface Method {
6
- prover: string;
25
+ prover: Prover;
7
26
  timeLimitMs: number;
8
27
  rlimit?: number;
9
28
  tactic?: string;
10
29
  }
11
30
 
12
- const FRONTENDS = new Set([
31
+ export const getBudget = (method: Method) => method.rlimit ?? method.timeLimitMs / 1000;
32
+
33
+ const FRONTENDS = new Set<Prover>([
13
34
  "expandenabled",
14
35
  "expandcdot",
15
36
  "autouse",
@@ -32,7 +53,7 @@ const DEFAULT_METHODS: Method[] = [
32
53
  { prover: "isabelle", timeLimitMs: ISABELLE_SECONDS * 1000, tactic: "auto" },
33
54
  ];
34
55
 
35
- const PROVERS: Record<string, { prover: string; seconds: number; isBudgeted?: boolean }> = {
56
+ const PROVERS: Record<string, { prover: Prover; seconds: number; isBudgeted?: boolean }> = {
36
57
  zenon: { prover: "zenon", seconds: ZENON_SECONDS },
37
58
  isabelle: { prover: "isabelle", seconds: ISABELLE_SECONDS },
38
59
  yices: { prover: "yices", seconds: 30 },