tla-ts 0.0.4-dev.b254db0 → 0.0.4-dev.ca40dfe

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 (207) hide show
  1. package/README.md +31 -10
  2. package/dist/cli.cjs +1 -1
  3. package/dist/cli.js +1 -1
  4. package/dist/deciders.cjs +27 -27
  5. package/dist/deciders.js +34 -34
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +12 -14
  8. package/dist/index.d.ts +12 -14
  9. package/dist/index.js +1 -1
  10. package/dist/parallel-worker.cjs +1 -1
  11. package/dist/parallel-worker.js +1 -1
  12. package/dist/prove-worker.cjs +1 -1
  13. package/dist/prove-worker.js +1 -1
  14. package/dist/prove.cjs +37 -27
  15. package/dist/prove.js +39 -29
  16. package/dist/run.cjs +45 -0
  17. package/dist/run.js +45 -0
  18. package/dist/tlapm.cjs +2 -2
  19. package/dist/tlapm.js +2 -2
  20. package/dist/transfer.cjs +76 -86
  21. package/dist/transfer.js +73 -83
  22. package/dist/worker.cjs +6 -6
  23. package/dist/worker.js +6 -6
  24. package/package.json +1 -1
  25. package/src/ast.ts +2 -2
  26. package/src/bags.ts +22 -23
  27. package/src/builtins.ts +16 -8
  28. package/src/check.ts +131 -1154
  29. package/src/{cli-options.ts → cli/options.ts} +54 -9
  30. package/src/cli/run.ts +63 -0
  31. package/src/cli/shared.ts +106 -0
  32. package/src/cli/tlapm.ts +374 -0
  33. package/src/cli/tlc.ts +941 -0
  34. package/src/cli/xml-exporter.ts +221 -0
  35. package/src/cli.ts +1 -1
  36. package/src/codegen.ts +17 -15
  37. package/src/config.ts +5 -5
  38. package/src/dependencies.ts +4 -6
  39. package/src/environment.ts +55 -60
  40. package/src/errors.ts +12 -36
  41. package/src/evaluate.ts +81 -101
  42. package/src/exit-codes.ts +1 -1
  43. package/src/fingerprints.ts +3 -3
  44. package/src/instances.ts +56 -46
  45. package/src/java-overrides.ts +79 -41
  46. package/src/json.ts +31 -36
  47. package/src/levels.ts +10 -13
  48. package/src/{live-check.ts → liveness-checker.ts} +169 -142
  49. package/src/liveness.ts +38 -34
  50. package/src/obligations/action.ts +9 -45
  51. package/src/obligations/{anon.ts → anonymize.ts} +13 -25
  52. package/src/obligations/equality.ts +260 -0
  53. package/src/obligations/expression.ts +42 -517
  54. package/src/obligations/generate.ts +88 -778
  55. package/src/obligations/index.ts +20 -22
  56. package/src/obligations/levels.ts +36 -41
  57. package/src/obligations/module.ts +88 -708
  58. package/src/obligations/normalize.ts +554 -0
  59. package/src/obligations/operators.ts +176 -0
  60. package/src/obligations/pragma.ts +21 -15
  61. package/src/obligations/printer.ts +81 -188
  62. package/src/obligations/proof.ts +0 -1
  63. package/src/obligations/regroup.ts +100 -0
  64. package/src/obligations/simplify.ts +668 -0
  65. package/src/obligations/source.ts +25 -131
  66. package/src/obligations/{deref.ts → subexpression.ts} +48 -56
  67. package/src/obligations/substitution.ts +261 -0
  68. package/src/obligations/temporal.ts +28 -26
  69. package/src/obligations/tuples.ts +37 -53
  70. package/src/parallel-worker.ts +37 -33
  71. package/src/parallel.ts +30 -24
  72. package/src/parser.ts +67 -74
  73. package/src/{pcal-ast.ts → pcal/ast.ts} +2 -17
  74. package/src/{pcal-parse.ts → pcal/parse.ts} +28 -64
  75. package/src/{pcal-tokenize.ts → pcal/tokenize.ts} +10 -39
  76. package/src/{pcal-translate.ts → pcal/translate.ts} +30 -109
  77. package/src/{pcal-validate.ts → pcal/validate.ts} +10 -20
  78. package/src/prove/decide-pool.ts +7 -12
  79. package/src/{obligations/pickle.ts → prove/first-order.ts} +79 -2
  80. package/src/prove/isabelle/decide.ts +3 -6
  81. package/src/prove/isabelle/encode.ts +35 -93
  82. package/src/prove/isabelle/isar/inner-syntax.ts +1 -1
  83. package/src/prove/isabelle/isar/method.ts +3 -3
  84. package/src/prove/isabelle/isar/type-check.ts +1 -1
  85. package/src/prove/isabelle/provers/blast/blast.ts +1 -1
  86. package/src/prove/isabelle/provers/blast/branch.ts +1 -1
  87. package/src/prove/isabelle/provers/blast/term.ts +3 -4
  88. package/src/prove/isabelle/provers/clasimp.ts +1 -1
  89. package/src/prove/isabelle/provers/classical.ts +3 -3
  90. package/src/prove/isabelle/provers/hypsubst.ts +1 -9
  91. package/src/prove/isabelle/pure/conv.ts +1 -1
  92. package/src/prove/isabelle/pure/drule.ts +2 -2
  93. package/src/prove/isabelle/pure/envir.ts +3 -35
  94. package/src/prove/isabelle/pure/logic.ts +4 -76
  95. package/src/prove/isabelle/pure/name.ts +1 -13
  96. package/src/prove/isabelle/pure/net.ts +2 -49
  97. package/src/prove/isabelle/pure/pattern.ts +3 -22
  98. package/src/prove/isabelle/pure/raw-simplifier.ts +3 -18
  99. package/src/prove/isabelle/pure/seq.ts +0 -23
  100. package/src/prove/isabelle/pure/simplifier.ts +2 -8
  101. package/src/prove/isabelle/pure/table.ts +1 -8
  102. package/src/prove/isabelle/pure/tactic.ts +5 -113
  103. package/src/prove/isabelle/pure/tactical.ts +1 -84
  104. package/src/prove/isabelle/pure/term-ord.ts +1 -55
  105. package/src/prove/isabelle/pure/term.ts +8 -128
  106. package/src/prove/isabelle/pure/thm.ts +4 -27
  107. package/src/prove/isabelle/pure/type.ts +0 -12
  108. package/src/prove/isabelle/pure/unify.ts +1 -1
  109. package/src/prove/isabelle/tla/classical-setup.ts +1 -1
  110. package/src/prove/ocaml.ts +1 -1
  111. package/src/prove/prep/action.ts +23 -36
  112. package/src/prove/prep/enabled-axioms.ts +2 -2
  113. package/src/prove/prep/fingerprint.ts +3 -3
  114. package/src/prove/prep/level-comparison.ts +9 -37
  115. package/src/prove/prep/md5.ts +2 -9
  116. package/src/prove/prep/normalize.ts +309 -0
  117. package/src/prove/prove-worker.ts +2 -5
  118. package/src/prove/prove.ts +98 -111
  119. package/src/prove/ptl/encode.ts +19 -31
  120. package/src/prove/smt/axioms.ts +45 -58
  121. package/src/prove/smt/encode.ts +124 -15
  122. package/src/prove/smt/instances.ts +2 -3
  123. package/src/prove/smt/rewrite.ts +24 -31
  124. package/src/prove/smt/solver/ast-util.ts +0 -56
  125. package/src/prove/smt/solver/case-split-queue.ts +1 -1
  126. package/src/prove/smt/solver/enode.ts +1 -1
  127. package/src/prove/smt/solver/lp/dep-intervals.ts +0 -14
  128. package/src/prove/smt/solver/model-macro-solver.ts +1 -1
  129. package/src/prove/smt/solver/nlsat/algebraic.ts +3 -3
  130. package/src/prove/smt/solver/nlsat/atoms.ts +1 -1
  131. package/src/prove/smt/solver/nlsat/explain.ts +1 -1
  132. package/src/prove/smt/solver/nlsat/interval-set.ts +1 -1
  133. package/src/prove/smt/solver/nlsat/levelwise.ts +4 -7
  134. package/src/prove/smt/solver/nlsat/polynomial.ts +4 -4
  135. package/src/prove/smt/solver/nlsat/upolynomial.ts +2 -2
  136. package/src/prove/smt/solver/pattern-inference.ts +1 -1
  137. package/src/prove/smt/solver/relevancy.ts +2 -2
  138. package/src/prove/smt/solver/rewriter.ts +1 -1
  139. package/src/prove/smt/solver/solver.ts +2 -2
  140. package/src/{tlapm-cache.ts → prove/tlapm/cache.ts} +11 -11
  141. package/src/{ocaml-marshal.ts → prove/tlapm/ocaml-marshal.ts} +1 -1
  142. package/src/prove/verdict.ts +0 -5
  143. package/src/prove/zenon/decide.ts +5 -11
  144. package/src/prove/zenon/encode.ts +21 -80
  145. package/src/prove/zenon/eqrel.ts +1 -1
  146. package/src/prove/zenon/equality-rules.ts +1 -1
  147. package/src/prove/zenon/expr.ts +2 -2
  148. package/src/prove/zenon/index-table.ts +1 -1
  149. package/src/prove/zenon/isar.ts +1 -1
  150. package/src/prove/zenon/llproof.ts +1 -1
  151. package/src/prove/zenon/mltoll.ts +1 -1
  152. package/src/prove/zenon/node.ts +1 -1
  153. package/src/prove/zenon/search.ts +1 -1
  154. package/src/prove/zenon/tla/terms.ts +1 -20
  155. package/src/prove/zenon/tla/tla.ts +1 -1
  156. package/src/randomization.ts +19 -24
  157. package/src/resolve.ts +15 -22
  158. package/src/runtime.ts +8 -8
  159. package/src/{sany-builtins.ts → sany/builtins.ts} +1 -1
  160. package/src/{sany-generator.ts → sany/generator.ts} +38 -55
  161. package/src/{sany-levels.ts → sany/levels.ts} +45 -48
  162. package/src/{sany-lexer.ts → sany/lexer.ts} +2 -3
  163. package/src/{sany-linter.ts → sany/linter.ts} +1 -1
  164. package/src/{sany-modules.ts → sany/modules.ts} +2 -2
  165. package/src/{sany-nodes.ts → sany/nodes.ts} +2 -2
  166. package/src/{sany-parse-error.ts → sany/parse-error.ts} +2 -2
  167. package/src/{sany-report.ts → sany/report.ts} +16 -17
  168. package/src/{sany-selectors.ts → sany/selectors.ts} +3 -5
  169. package/src/{sany-source.ts → sany/source.ts} +6 -7
  170. package/src/{sany-xml.ts → sany/xml.ts} +5 -6
  171. package/src/search.ts +969 -0
  172. package/src/spec-description.ts +26 -20
  173. package/src/{standard-levels.ts → standard-definitions.ts} +118 -2
  174. package/src/standard-modules.ts +16 -20
  175. package/src/state-graph.ts +9 -8
  176. package/src/substitution-levels.ts +2 -2
  177. package/src/successors.ts +16 -19
  178. package/src/symmetry.ts +1 -1
  179. package/src/tableau.ts +6 -7
  180. package/src/tlc/fingerprint.ts +214 -0
  181. package/src/{tlc-messages.ts → tlc/messages.ts} +119 -7
  182. package/src/{tlc-order.ts → tlc/order.ts} +7 -7
  183. package/src/{tlc-random.ts → tlc/random.ts} +3 -213
  184. package/src/{tlc-replay.ts → tlc/replay.ts} +40 -36
  185. package/src/{tlc-module.ts → tlc/tlc-operators.ts} +9 -9
  186. package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +30 -25
  187. package/src/transfer.ts +32 -32
  188. package/src/values.ts +72 -67
  189. package/src/worker.ts +1 -4
  190. package/dist/run-cli.cjs +0 -45
  191. package/dist/run-cli.js +0 -45
  192. package/src/canonical.ts +0 -40
  193. package/src/obligations/ctx.ts +0 -64
  194. package/src/prove/prep/defs.ts +0 -33
  195. package/src/prove/prep/elab.ts +0 -156
  196. package/src/prove/prep/enabled.ts +0 -43
  197. package/src/prove/prep/flatten.ts +0 -70
  198. package/src/prove/prep/trivial.ts +0 -22
  199. package/src/prove/smt/axiomatize.ts +0 -69
  200. package/src/prove/smt/simplify.ts +0 -57
  201. package/src/run-cli.ts +0 -1806
  202. package/src/standard-ranges.ts +0 -116
  203. package/src/value-sources.ts +0 -29
  204. /package/src/prove/prep/{pragma.ts → methods.ts} +0 -0
  205. /package/src/{tlc-modules.ts → tlc/jar-data.ts} +0 -0
  206. /package/src/{tlc-summary.ts → tlc/summary.ts} +0 -0
  207. /package/src/{tlc-version.ts → tlc/version.ts} +0 -0
package/src/evaluate.ts CHANGED
@@ -16,7 +16,7 @@ import { getKindString } from "./builtins";
16
16
  import { isStackOverflow, TlaEvaluationError, TlaUnassignedError } from "./errors";
17
17
  import { EXIT_STATUS, setExitCode } from "./exit-codes";
18
18
  import { generateEvaluator } from "./codegen";
19
- import { MESSAGE_CODE } from "./tlc-messages";
19
+ import { MESSAGE_CODE } from "./tlc/messages";
20
20
  import type { CheckerRuntime } from "./runtime";
21
21
  import { getReadVariables } from "./dependencies";
22
22
  import { contextualApplications, mapChildren, substitutedExpressions } from "./instances";
@@ -55,8 +55,7 @@ import {
55
55
  isReducibleSet,
56
56
  isSetValue,
57
57
  isSettledValue,
58
- MAXIMUM_INTEGER,
59
- MINIMUM_INTEGER,
58
+ isTlcInteger,
60
59
  toFiniteFunction,
61
60
  toFiniteSet,
62
61
  updateFunction,
@@ -69,7 +68,7 @@ import {
69
68
  markNormalized,
70
69
  setTrace,
71
70
  } from "./values";
72
- import type { TlcVersion } from "./tlc-version";
71
+ import type { TlcVersion } from "./tlc/version";
73
72
 
74
73
  export type State = (Value | undefined)[];
75
74
 
@@ -252,14 +251,14 @@ export const describeNode = (expression: Expression) =>
252
251
  ? (expression.text ?? String(expression.value))
253
252
  : describeRange(expression);
254
253
 
255
- export const getConditionError = (expression: Expression, value: Value) =>
254
+ export const createConditionError = (expression: Expression, value: Value) =>
256
255
  new TlaEvaluationError(
257
256
  `A non-boolean expression (${getKindString(value)}) was used as the condition of an IF.\n${describeRange(expression)}`,
258
257
  );
259
258
 
260
259
  // TLC parses an infix chain of /\ or \/ as nested binary junctions and a bulleted list as one
261
260
  // junction list, and it words the error differently for each.
262
- export const getJunctionError = (
261
+ export const createJunctionError = (
263
262
  expression: Expression & { kind: "And" | "Or" },
264
263
  index: number,
265
264
  value: Value,
@@ -348,6 +347,27 @@ export const createBigNumberError = (expression: NumberExpression) =>
348
347
  EXIT_STATUS.error,
349
348
  );
350
349
 
350
+ // TLC's Tool#evalAppl fails to look up a variable the state doesn't assign.
351
+ export const createUnassignedError = (name: string, expression: Expression) =>
352
+ new TlaUnassignedError(
353
+ `In evaluation, the identifier ${name} is either undefined or not an operator.\n${describeRange(expression)}`,
354
+ name,
355
+ );
356
+
357
+ // TLC's Tool#enabled reads the subscript of <<A>>_v in the successor as a state of its own, and
358
+ // names the fairness condition when A leaves a variable of v unassigned, unlike TLC 1.7.4's.
359
+ export const toUnspecifiedSubscriptError = (error: unknown, version: TlcVersion | undefined) =>
360
+ error instanceof TlaUnassignedError && version !== "1.7.4"
361
+ ? new TlaEvaluationError(
362
+ `The action formula A appearing in a WF_v(A) or SF_v(A) operator does not specify the primed value of the variable ${error.variable} occurring in the state formula v.\n`,
363
+ )
364
+ : error;
365
+
366
+ export const createPrimeOutsideActionError = (expression: Expression) =>
367
+ new TlaEvaluationError(
368
+ `A primed expression appears outside an action at ${describeLocation(expression)}`,
369
+ );
370
+
351
371
  export const lookupScope = (scope: Scope | undefined, name: string): Binding | undefined => {
352
372
  for (let current = scope; current; current = current.parent) {
353
373
  if (current.name === name) return current.binding;
@@ -567,12 +587,12 @@ export const forEachBinding = (
567
587
  visit: (scope: Scope | undefined) => boolean,
568
588
  ) => forEachBoundElement(bounds, getBoundElements(bounds, context), context.scope, visit);
569
589
 
570
- export const getBoundsDomain = (bounds: Bound[], context: Context): Value => {
590
+ const getBoundsDomain = (bounds: Bound[], context: Context): Value => {
571
591
  const sets = bounds.map((bound) => evaluate(bound.set, context));
572
592
  return sets.length === 1 ? sets[0] : { kind: "ProductSet", factors: sets };
573
593
  };
574
594
 
575
- export const bindArgument = (bounds: Bound[], scope: Scope | undefined, argument: Value) => {
595
+ const bindArgument = (bounds: Bound[], scope: Scope | undefined, argument: Value) => {
576
596
  if (bounds.length === 1) return bindPattern(scope, bounds[0].pattern, argument);
577
597
  const components = getSequenceElements(argument) ?? [];
578
598
  return bounds.reduce<Scope | undefined>(
@@ -965,6 +985,18 @@ const isOperatorArgument = (expression: Expression, context: Context) => {
965
985
  return operator !== undefined && getArity(operator) > 0;
966
986
  };
967
987
 
988
+ const evaluateBuiltinArguments = (args: Expression[], context: Context) =>
989
+ args.map((arg) =>
990
+ isOperatorArgument(arg, context)
991
+ ? toOperatorValue(evaluateOperatorArgument(arg, context), context)
992
+ : evaluate(arg, context),
993
+ );
994
+
995
+ const createArityError = (closure: Closure, count: number) =>
996
+ new TlaEvaluationError(
997
+ `Operator ${closure.name} expects ${closure.params.length} arguments but received ${count}`,
998
+ );
999
+
968
1000
  const createThunk = (expression: Expression, context: Context): Thunk => ({
969
1001
  kind: "Thunk",
970
1002
  expression,
@@ -1034,11 +1066,7 @@ export const bindOperatorArguments = (
1034
1066
  context: Context,
1035
1067
  binders?: ArgumentBinder[],
1036
1068
  ): Scope | undefined => {
1037
- if (args.length !== closure.params.length) {
1038
- throw new TlaEvaluationError(
1039
- `Operator ${closure.name} expects ${closure.params.length} arguments but received ${args.length}`,
1040
- );
1041
- }
1069
+ if (args.length !== closure.params.length) throw createArityError(closure, args.length);
1042
1070
  let scope = closure.scope;
1043
1071
  for (let index = 0; index < args.length; index++) {
1044
1072
  const param = closure.params[index];
@@ -1078,14 +1106,7 @@ const callOperator = (
1078
1106
  }
1079
1107
  if (operator.kind === "Operator") return operator.call(args.map((arg) => evaluate(arg, context)));
1080
1108
  if (operator.isLazy) return operator.evaluate(getLazyArguments(args, context), context);
1081
- return operator.evaluate(
1082
- args.map((arg) =>
1083
- isOperatorArgument(arg, context)
1084
- ? toOperatorValue(evaluateOperatorArgument(arg, context), context)
1085
- : evaluate(arg, context),
1086
- ),
1087
- context,
1088
- );
1109
+ return operator.evaluate(evaluateBuiltinArguments(args, context), context);
1089
1110
  };
1090
1111
 
1091
1112
  // The LET definitions that a reference evaluates again, and those that cache only a settled value.
@@ -1171,9 +1192,6 @@ const evaluateLocalIdentifier = (name: string, expression: Expression, context:
1171
1192
  throw new TlaEvaluationError(`Unknown identifier ${name} at ${describeLocation(expression)}`);
1172
1193
  };
1173
1194
 
1174
- export const isTlcInteger = (value: number) =>
1175
- Number.isInteger(value) && value <= MAXIMUM_INTEGER && value >= MINIMUM_INTEGER;
1176
-
1177
1195
  const IMPURE_BUILTINS = new Set([
1178
1196
  "Print",
1179
1197
  "PrintT",
@@ -1639,20 +1657,13 @@ const cacheStateValue = (evaluator: Evaluator): Evaluator => {
1639
1657
  };
1640
1658
  };
1641
1659
 
1642
- const isOperatorName = (name: string, environment: Environment) => {
1643
- const operator = resolveGlobalOperator(name, environment);
1644
- return operator !== undefined && getArity(operator) > 0;
1660
+ export const isValueArgument = (argument: Expression, environment: Environment) => {
1661
+ if (argument.kind === "Lambda" || argument.kind === "OperatorReference") return false;
1662
+ if (argument.kind !== "Identifier" || isLocallyResolved(argument)) return true;
1663
+ const operator = resolveGlobalOperator(argument.name, environment);
1664
+ return operator === undefined || getArity(operator) === 0;
1645
1665
  };
1646
1666
 
1647
- export const isValueArgument = (argument: Expression, environment: Environment) =>
1648
- argument.kind !== "Lambda" &&
1649
- argument.kind !== "OperatorReference" &&
1650
- !(
1651
- argument.kind === "Identifier" &&
1652
- !isLocallyResolved(argument) &&
1653
- isOperatorName(argument.name, environment)
1654
- );
1655
-
1656
1667
  const getLazyArguments = (args: Expression[], context: Context): OperatorValue[] =>
1657
1668
  args.map((arg) => ({
1658
1669
  kind: "Operator",
@@ -1685,15 +1696,7 @@ const compileBuiltinCall = (
1685
1696
  const right = getEvaluator(args[1], environment);
1686
1697
  return (context) => binary(left(context), right(context));
1687
1698
  }
1688
- return (context) =>
1689
- builtin.evaluate(
1690
- args.map((arg) =>
1691
- isOperatorArgument(arg, context)
1692
- ? toOperatorValue(evaluateOperatorArgument(arg, context), context)
1693
- : evaluate(arg, context),
1694
- ),
1695
- context,
1696
- );
1699
+ return (context) => builtin.evaluate(evaluateBuiltinArguments(args, context), context);
1697
1700
  };
1698
1701
 
1699
1702
  export const compileArgumentScope = (
@@ -1703,9 +1706,7 @@ export const compileArgumentScope = (
1703
1706
  ): ((context: Context) => Scope | undefined) => {
1704
1707
  if (args.length !== closure.params.length) {
1705
1708
  return () => {
1706
- throw new TlaEvaluationError(
1707
- `Operator ${closure.name} expects ${closure.params.length} arguments but received ${args.length}`,
1708
- );
1709
+ throw createArityError(closure, args.length);
1709
1710
  };
1710
1711
  }
1711
1712
  const params = closure.params;
@@ -2086,7 +2087,7 @@ const compileQuantifier = (
2086
2087
  };
2087
2088
  };
2088
2089
 
2089
- const lookupKey = (pattern: BoundPattern, scope: Scope | undefined) => {
2090
+ const getBoundValue = (pattern: BoundPattern, scope: Scope | undefined) => {
2090
2091
  if (pattern.kind === "Tuple") {
2091
2092
  return createTuple(
2092
2093
  pattern.names.map((name) => {
@@ -2141,8 +2142,8 @@ const compileFunctionConstruction = (
2141
2142
  forEachBoundElement(bounds, sets, context.scope, (scope) => {
2142
2143
  const key =
2143
2144
  bounds.length === 1
2144
- ? (lookupKey(bound.pattern, scope) ?? false)
2145
- : createTuple(bounds.map((item) => lookupKey(item.pattern, scope) ?? false));
2145
+ ? (getBoundValue(bound.pattern, scope) ?? false)
2146
+ : createTuple(bounds.map((item) => getBoundValue(item.pattern, scope) ?? false));
2146
2147
  pairs.push([key, body(withScope(context, scope))]);
2147
2148
  return false;
2148
2149
  });
@@ -2325,7 +2326,7 @@ const compileSetComprehension = (
2325
2326
  someElement(elements, (element) => {
2326
2327
  const scope = bindPattern(context.scope, expression.pattern, element);
2327
2328
  if (!expectBoolean(body(withScope(context, scope)), "the body of CHOOSE")) return false;
2328
- chosen.value = lookupKey(expression.pattern, scope);
2329
+ chosen.value = getBoundValue(expression.pattern, scope);
2329
2330
  return true;
2330
2331
  });
2331
2332
  if (chosen.value === undefined) {
@@ -2344,27 +2345,6 @@ export const getSortedFields = (fields: RecordField[]) =>
2344
2345
  export const hasDuplicateFields = (sortedFields: RecordField[]) =>
2345
2346
  sortedFields.some((field, index) => index > 0 && sortedFields[index - 1].name === field.name);
2346
2347
 
2347
- // TLC's Tool#evalAppl fails to look up a variable the state doesn't assign.
2348
- export const createUnassignedError = (name: string, expression: Expression) =>
2349
- new TlaUnassignedError(
2350
- `In evaluation, the identifier ${name} is either undefined or not an operator.\n${describeRange(expression)}`,
2351
- name,
2352
- );
2353
-
2354
- // TLC's Tool#enabled reads the subscript of <<A>>_v in the successor as a state of its own, and
2355
- // names the fairness condition when A leaves a variable of v unassigned, unlike TLC 1.7.4's.
2356
- export const toUnspecifiedSubscriptError = (error: unknown, version: TlcVersion | undefined) =>
2357
- error instanceof TlaUnassignedError && version !== "1.7.4"
2358
- ? new TlaEvaluationError(
2359
- `The action formula A appearing in a WF_v(A) or SF_v(A) operator does not specify the primed value of the variable ${error.variable} occurring in the state formula v.\n`,
2360
- )
2361
- : error;
2362
-
2363
- export const createPrimeOutsideActionError = (expression: Expression) =>
2364
- new TlaEvaluationError(
2365
- `A primed expression appears outside an action at ${describeLocation(expression)}`,
2366
- );
2367
-
2368
2348
  const compileRecord = (recordFields: RecordField[], environment: Environment): Evaluator => {
2369
2349
  const fields = getSortedFields(recordFields);
2370
2350
  const hasDuplicates = hasDuplicateFields(fields);
@@ -2393,7 +2373,7 @@ const compileRecord = (recordFields: RecordField[], environment: Environment): E
2393
2373
  };
2394
2374
 
2395
2375
  const compile = (expression: Expression, environment: Environment): Evaluator => {
2396
- const child = (node: Expression) => getEvaluator(node, environment);
2376
+ const getChildEvaluator = (node: Expression) => getEvaluator(node, environment);
2397
2377
  switch (expression.kind) {
2398
2378
  case "Number": {
2399
2379
  const value = expression.value;
@@ -2429,29 +2409,29 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
2429
2409
  );
2430
2410
  };
2431
2411
  case "And": {
2432
- const operands = expression.operands.map(child);
2412
+ const operands = expression.operands.map(getChildEvaluator);
2433
2413
  return (context) => {
2434
2414
  for (let index = 0; index < operands.length; index++) {
2435
2415
  const value = operands[index](context);
2436
- if (typeof value !== "boolean") throw getJunctionError(expression, index, value);
2416
+ if (typeof value !== "boolean") throw createJunctionError(expression, index, value);
2437
2417
  if (!value) return false;
2438
2418
  }
2439
2419
  return true;
2440
2420
  };
2441
2421
  }
2442
2422
  case "Or": {
2443
- const operands = expression.operands.map(child);
2423
+ const operands = expression.operands.map(getChildEvaluator);
2444
2424
  return (context) => {
2445
2425
  for (let index = 0; index < operands.length; index++) {
2446
2426
  const value = operands[index](context);
2447
- if (typeof value !== "boolean") throw getJunctionError(expression, index, value);
2427
+ if (typeof value !== "boolean") throw createJunctionError(expression, index, value);
2448
2428
  if (value) return true;
2449
2429
  }
2450
2430
  return false;
2451
2431
  };
2452
2432
  }
2453
2433
  case "Prime": {
2454
- const inner = child(expression.expression);
2434
+ const inner = getChildEvaluator(expression.expression);
2455
2435
  return (context) => {
2456
2436
  if (!context.next) throw createPrimeOutsideActionError(expression);
2457
2437
  return inner({
@@ -2464,31 +2444,31 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
2464
2444
  };
2465
2445
  }
2466
2446
  case "Unchanged": {
2467
- const primed = child({
2447
+ const primed = getChildEvaluator({
2468
2448
  kind: "Prime",
2469
2449
  expression: expression.expression,
2470
2450
  location: expression.location,
2471
2451
  });
2472
- const current = child(expression.expression);
2452
+ const current = getChildEvaluator(expression.expression);
2473
2453
  return (context) => valuesEqual(primed(context), current(context));
2474
2454
  }
2475
2455
  case "If": {
2476
- const condition = child(expression.condition);
2477
- const consequent = child(expression.consequent);
2478
- const alternative = child(expression.alternative);
2456
+ const condition = getChildEvaluator(expression.condition);
2457
+ const consequent = getChildEvaluator(expression.consequent);
2458
+ const alternative = getChildEvaluator(expression.alternative);
2479
2459
  return (context) => {
2480
2460
  const value = condition(context);
2481
- if (typeof value !== "boolean") throw getConditionError(expression, value);
2461
+ if (typeof value !== "boolean") throw createConditionError(expression, value);
2482
2462
  return value ? consequent(context) : alternative(context);
2483
2463
  };
2484
2464
  }
2485
2465
  case "Case": {
2486
2466
  const arms = expression.arms.map((arm) => ({
2487
2467
  source: arm.condition,
2488
- condition: child(arm.condition),
2489
- body: child(arm.body),
2468
+ condition: getChildEvaluator(arm.condition),
2469
+ body: getChildEvaluator(arm.body),
2490
2470
  }));
2491
- const other = expression.other ? child(expression.other) : undefined;
2471
+ const other = expression.other ? getChildEvaluator(expression.other) : undefined;
2492
2472
  return (context) => {
2493
2473
  for (const arm of arms) {
2494
2474
  const value = arm.condition(context);
@@ -2506,7 +2486,7 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
2506
2486
  };
2507
2487
  }
2508
2488
  case "Let": {
2509
- const body = child(expression.body);
2489
+ const body = getChildEvaluator(expression.body);
2510
2490
  return (context) =>
2511
2491
  body(withScope(context, bindDefinitions(expression.definitions, context)));
2512
2492
  }
@@ -2524,18 +2504,18 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
2524
2504
  case "SetMap":
2525
2505
  return compileSetComprehension(expression, environment);
2526
2506
  case "SetEnumeration": {
2527
- const elements = expression.elements.map(child);
2507
+ const elements = expression.elements.map(getChildEvaluator);
2528
2508
  return (context) => createEnumeratedSet(elements.map((element) => element(context)));
2529
2509
  }
2530
2510
  case "Tuple": {
2531
- const elements = expression.elements.map(child);
2511
+ const elements = expression.elements.map(getChildEvaluator);
2532
2512
  return (context) => createTuple(elements.map((element) => element(context)));
2533
2513
  }
2534
2514
  case "FunctionConstruction":
2535
2515
  return compileFunctionConstruction(expression, environment);
2536
2516
  case "FunctionSet": {
2537
- const domain = child(expression.domain);
2538
- const range = child(expression.range);
2517
+ const domain = getChildEvaluator(expression.domain);
2518
+ const range = getChildEvaluator(expression.range);
2539
2519
  return (context) => ({ kind: "FunctionSet", domain: domain(context), range: range(context) });
2540
2520
  }
2541
2521
  case "Record":
@@ -2543,7 +2523,7 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
2543
2523
  case "RecordSet": {
2544
2524
  const fields = getSortedFields(expression.fields);
2545
2525
  const names = fields.map((field) => field.name);
2546
- const sets = fields.map((field) => child(field.value));
2526
+ const sets = fields.map((field) => getChildEvaluator(field.value));
2547
2527
  return (context) => ({ kind: "RecordSet", names, sets: sets.map((set) => set(context)) });
2548
2528
  }
2549
2529
  case "Except":
@@ -2560,10 +2540,10 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
2560
2540
  };
2561
2541
  case "FunctionApplication": {
2562
2542
  keepLazy(expression.function);
2563
- const evaluated = child(expression.function);
2543
+ const evaluated = getChildEvaluator(expression.function);
2564
2544
  const evaluateFunction = (context: Context) =>
2565
2545
  expectFunction(evaluated(toKeepLazyContext(context)), expression);
2566
- const args = expression.args.map(child);
2546
+ const args = expression.args.map(getChildEvaluator);
2567
2547
  const describeMissing = getMissingArgumentDescriber(environment.runtime.version);
2568
2548
  if (args.length === 1) {
2569
2549
  const argument = args[0];
@@ -2578,12 +2558,12 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
2578
2558
  );
2579
2559
  }
2580
2560
  case "FieldAccess": {
2581
- const record = child(expression.record);
2561
+ const record = getChildEvaluator(expression.record);
2582
2562
  const select = getFieldSelector(expression);
2583
2563
  return (context) => select(record(context));
2584
2564
  }
2585
2565
  case "Product": {
2586
- const factors = expression.factors.map(child);
2566
+ const factors = expression.factors.map(getChildEvaluator);
2587
2567
  return (context) => ({
2588
2568
  kind: "ProductSet",
2589
2569
  factors: factors.map((factor) => factor(context)),
@@ -2591,8 +2571,8 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
2591
2571
  }
2592
2572
  case "BoxAction":
2593
2573
  case "AngleAction": {
2594
- const action = child(expression.action);
2595
- const unchanged = child({
2574
+ const action = getChildEvaluator(expression.action);
2575
+ const unchanged = getChildEvaluator({
2596
2576
  kind: "Unchanged",
2597
2577
  expression: expression.subscript,
2598
2578
  location: expression.location,
@@ -2608,7 +2588,7 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
2608
2588
  return (context) => isEnabled(action, context);
2609
2589
  }
2610
2590
  case "Label":
2611
- return child(expression.body);
2591
+ return getChildEvaluator(expression.body);
2612
2592
  case "Subexpression":
2613
2593
  return () => {
2614
2594
  throw new TlaEvaluationError(
package/src/exit-codes.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { LivenessChecker } from "./live-check";
1
+ import type { LivenessChecker } from "./liveness-checker";
2
2
 
3
3
  // TLC's exit statuses, from EC.ExitStatus.
4
4
  export const EXIT_STATUS = {
@@ -7,7 +7,7 @@ interface FingerprintTable {
7
7
  insert: (first: number, second: number) => boolean;
8
8
  }
9
9
 
10
- const mix = (hash: number) => {
10
+ const mixHash = (hash: number) => {
11
11
  const first = Math.imul(hash ^ (hash >>> 16), 0x7feb352d);
12
12
  const second = Math.imul(first ^ (first >>> 15), 0x846ca68b);
13
13
  return second ^ (second >>> 16);
@@ -20,8 +20,8 @@ export const writeStateFingerprint = (state: Value[], fingerprint: Int32Array) =
20
20
  first = Math.imul(first ^ getValueHash(state[index]), 0x01000193);
21
21
  second = Math.imul(second ^ getValueFingerprint(state[index]), 0x5bd1e995);
22
22
  }
23
- fingerprint[0] = mix(first) || 1;
24
- fingerprint[1] = mix(second);
23
+ fingerprint[0] = mixHash(first) || 1;
24
+ fingerprint[1] = mixHash(second);
25
25
  };
26
26
 
27
27
  export const createFingerprintTable = (): FingerprintTable => {