tla-ts 0.0.3-dev.e5b05b9 → 0.0.3-dev.e8bef80

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 (79) hide show
  1. package/dist/cli.cjs +1 -1
  2. package/dist/cli.js +1 -1
  3. package/dist/index.cjs +1 -1
  4. package/dist/index.d.cts +150 -48
  5. package/dist/index.d.ts +150 -48
  6. package/dist/index.js +1 -1
  7. package/dist/parallel-worker.cjs +1 -1
  8. package/dist/parallel-worker.js +2 -2
  9. package/dist/parallel.cjs +1 -1
  10. package/dist/parallel.js +2 -2
  11. package/dist/run-cli.cjs +1351 -22
  12. package/dist/run-cli.js +1352 -23
  13. package/dist/transfer.cjs +83 -43
  14. package/dist/transfer.js +83 -43
  15. package/package.json +5 -1
  16. package/src/ast.ts +28 -4
  17. package/src/bags.ts +4 -7
  18. package/src/builtins.ts +29 -17
  19. package/src/bundled-modules.ts +3 -3
  20. package/src/canonical.ts +4 -3
  21. package/src/check.ts +1317 -428
  22. package/src/cli.ts +8 -1
  23. package/src/codegen.ts +68 -21
  24. package/src/config.ts +226 -207
  25. package/src/environment.ts +221 -75
  26. package/src/errors.ts +130 -15
  27. package/src/evaluate.ts +713 -259
  28. package/src/exit-codes.ts +6 -24
  29. package/src/fingerprints.ts +1 -2
  30. package/src/index.ts +1 -0
  31. package/src/instances.ts +3 -1
  32. package/src/java-overrides.ts +104 -25
  33. package/src/levels.ts +6 -1
  34. package/src/lexer.ts +122 -29
  35. package/src/live-check.ts +204 -148
  36. package/src/liveness.ts +191 -122
  37. package/src/obligation-expression.ts +2 -2
  38. package/src/obligation-source.ts +2 -0
  39. package/src/parallel-worker.ts +6 -1
  40. package/src/parallel.ts +57 -6
  41. package/src/parser.ts +327 -147
  42. package/src/pcal-ast.ts +770 -0
  43. package/src/pcal-parse.ts +1523 -0
  44. package/src/pcal-tokenize.ts +516 -0
  45. package/src/pcal-translate.ts +1230 -0
  46. package/src/pcal-validate.ts +454 -0
  47. package/src/randomization.ts +24 -7
  48. package/src/resolve.ts +252 -87
  49. package/src/run-cli.ts +1162 -200
  50. package/src/runtime.ts +16 -0
  51. package/src/sany-builtins.ts +147 -0
  52. package/src/sany-generator.ts +3128 -0
  53. package/src/sany-levels.ts +1208 -0
  54. package/src/sany-lexer.ts +410 -480
  55. package/src/sany-linter.ts +122 -0
  56. package/src/sany-modules.ts +1398 -0
  57. package/src/sany-nodes.ts +463 -0
  58. package/src/sany-parse-error.ts +2033 -3015
  59. package/src/sany-report.ts +356 -0
  60. package/src/sany-selectors.ts +738 -0
  61. package/src/sany-source.ts +248 -0
  62. package/src/sany-xml.ts +1017 -0
  63. package/src/spec-description.ts +25 -5
  64. package/src/standard-modules.ts +172 -129
  65. package/src/state-graph.ts +29 -6
  66. package/src/subexpressions.ts +121 -26
  67. package/src/successors.ts +141 -173
  68. package/src/symmetry.ts +168 -50
  69. package/src/tableau.ts +3 -1
  70. package/src/tlc-ext.ts +13 -17
  71. package/src/tlc-messages.ts +329 -0
  72. package/src/tlc-module.ts +49 -21
  73. package/src/tlc-modules.ts +0 -4
  74. package/src/tlc-order.ts +55 -9
  75. package/src/tlc-random.ts +28 -3
  76. package/src/tlc-replay.ts +655 -0
  77. package/src/tlc-version.ts +18 -0
  78. package/src/transfer.ts +15 -3
  79. package/src/values.ts +664 -317
package/src/cli.ts CHANGED
@@ -1,6 +1,13 @@
1
1
  #!/usr/bin/env node
2
2
  import { enableCompileCache } from "node:module";
3
+ import { join } from "node:path";
3
4
 
4
- enableCompileCache?.();
5
+ // When tla-ts runs in place of java, it keeps its temporary files where Java would.
6
+ const JAVA_TMPDIR_PROPERTY = "-Djava.io.tmpdir=";
7
+ const javaTmpdir = process.argv
8
+ .find((arg) => arg.startsWith(JAVA_TMPDIR_PROPERTY))
9
+ ?.slice(JAVA_TMPDIR_PROPERTY.length);
10
+
11
+ enableCompileCache?.(javaTmpdir && join(javaTmpdir, "node-compile-cache"));
5
12
 
6
13
  void import("./run-cli").then((module) => module.runCli());
package/src/codegen.ts CHANGED
@@ -3,21 +3,22 @@ import {
3
3
  bindValue,
4
4
  expectBoolean,
5
5
  findGlobalName,
6
- getEnumeratedElements,
7
6
  getConditionError,
8
- getConjunctError,
7
+ getJunctionError,
9
8
  getDomainOperator,
10
9
  getSubsetOperator,
11
10
  getEvaluator,
12
- getFieldError,
13
- getNonFunctionError,
14
- getNonRecordError,
11
+ getFieldSelector,
12
+ getMissingArgumentDescriber,
13
+ getQuantifierElements,
15
14
  isClosedConstant,
16
15
  isTlcInteger,
17
16
  isValueArgument,
18
17
  isWorthCaching,
19
18
  keepLazy,
20
19
  resolveGlobalOperator,
20
+ expectFunction,
21
+ toKeepLazyContext,
21
22
  createPrimeOutsideActionError,
22
23
  createUnassignedError,
23
24
  getSortedFields,
@@ -29,7 +30,7 @@ import {
29
30
  import {
30
31
  applyFunction,
31
32
  createEnumeratedSet,
32
- createSortedFunction,
33
+ createSortedRecord,
33
34
  createTuple,
34
35
  createWrittenRecord,
35
36
  valuesEqual,
@@ -73,17 +74,18 @@ const createRuntime = () => ({
73
74
  if (typeof value !== "boolean") throw getConditionError(expression, value);
74
75
  return value;
75
76
  },
76
- conjunct: (value: Value, expression: Expression & { kind: "And" | "Or" }, index: number) => {
77
- if (typeof value !== "boolean") throw getConjunctError(expression, index, value);
77
+ junct: (value: Value, expression: Expression & { kind: "And" | "Or" }, index: number) => {
78
+ if (typeof value !== "boolean") throw getJunctionError(expression, index, value);
78
79
  return value;
79
80
  },
80
81
  apply: applyFunction,
82
+ expectFunction,
81
83
  tuple: createTuple,
82
84
  set: createEnumeratedSet,
83
- record: createSortedFunction,
85
+ record: createSortedRecord,
84
86
  writtenRecord: createWrittenRecord,
85
87
  equal: valuesEqual,
86
- enumerate: getEnumeratedElements,
88
+ enumerate: getQuantifierElements,
87
89
  unassigned: (name: string, expression: Expression): never => {
88
90
  throw createUnassignedError(name, expression);
89
91
  },
@@ -95,7 +97,9 @@ const createRuntime = () => ({
95
97
  scope: context.scope,
96
98
  state: context.next,
97
99
  next: undefined,
100
+ isKeepLazy: context.isKeepLazy,
98
101
  }),
102
+ keepLazyContext: toKeepLazyContext,
99
103
  extend: (context: Context, names: string[], values: Value[]): Context => ({
100
104
  environment: context.environment,
101
105
  scope: names.reduce(
@@ -104,6 +108,7 @@ const createRuntime = () => ({
104
108
  ),
105
109
  state: context.state,
106
110
  next: context.next,
111
+ isKeepLazy: context.isKeepLazy,
107
112
  }),
108
113
  });
109
114
 
@@ -154,7 +159,7 @@ const generateQuantifier = (
154
159
  const lists = expression.bounds.map(() => createLocal(generator));
155
160
  const declarations = expression.bounds.map(
156
161
  (bound, index) =>
157
- `const ${lists[index]} = enumerate(${generateExpression(generator, bound.set, inner)}, ${addReference(generator, bound.set)});`,
162
+ `const ${lists[index]} = enumerate(${generateExpression(generator, bound.set, inner)}, ${addReference(generator, bound.set)}, ${JSON.stringify(generator.environment.runtime.version)});`,
158
163
  );
159
164
  const elements = expression.bounds.map((bound) => {
160
165
  const local = createLocal(generator);
@@ -162,9 +167,13 @@ const generateQuantifier = (
162
167
  return local;
163
168
  });
164
169
  const test = `if (bool(${generateExpression(generator, expression.body, inner)}, ${description}) !== ${isForall}) return ${!isForall};`;
170
+ // enumerate returns an array, or an interval, which has a low end, to step through.
165
171
  const loops = elements.reduce((code, element, index) => {
166
172
  const position = createLocal(generator);
167
- return `for (let ${position} = 0; ${position} < ${lists[index]}.length; ${position}++) { const ${element} = ${lists[index]}[${position}]; ${code} }`;
173
+ const low = createLocal(generator);
174
+ const size = createLocal(generator);
175
+ const list = lists[index];
176
+ return `for (let ${position} = 0, ${low} = ${list}.low, ${size} = ${low} === undefined ? ${list}.length : ${list}.high - ${low} + 1; ${position} < ${size}; ${position}++) { const ${element} = ${low} === undefined ? ${list}[${position}] : ${low} + ${position}; ${code} }`;
168
177
  }, test);
169
178
  const parameters = outer.map((local) => `, ${local}`).join("");
170
179
  generator.helpers.push(
@@ -212,6 +221,32 @@ const generateApply = (
212
221
  return generateDelegate(generator, expression, frame);
213
222
  };
214
223
 
224
+ // Whether an expression only reads values, so that it constructs no function whatever the control.
225
+ const isConstructionFree = (
226
+ expression: Expression,
227
+ frame: Frame,
228
+ environment: Environment,
229
+ ): boolean => {
230
+ switch (expression.kind) {
231
+ case "Identifier": {
232
+ if (frame.locals.has(expression.name)) return true;
233
+ if (isLocallyResolved(expression)) return false;
234
+ const global = findGlobalName(expression.name, environment);
235
+ return global?.kind === "Variable" || global?.kind === "Value";
236
+ }
237
+ case "Prime":
238
+ return isConstructionFree(expression.expression, frame, environment);
239
+ case "FieldAccess":
240
+ return isConstructionFree(expression.record, frame, environment);
241
+ case "FunctionApplication":
242
+ return [expression.function, ...expression.args].every((child) =>
243
+ isConstructionFree(child, frame, environment),
244
+ );
245
+ default:
246
+ return false;
247
+ }
248
+ };
249
+
215
250
  const generateExpression = (generator: Generator, expression: Expression, frame: Frame): string => {
216
251
  const generate = (node: Expression, nodeFrame = frame) =>
217
252
  generateExpression(generator, node, nodeFrame);
@@ -241,24 +276,36 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
241
276
  }
242
277
  case "Apply":
243
278
  return generateApply(generator, expression, frame);
244
- case "And": {
279
+ case "And":
280
+ case "Or": {
245
281
  const node = addReference(generator, expression);
246
- return `(${expression.operands.map((operand, index) => `conjunct(${generate(operand)}, ${node}, ${index})`).join(" && ")})`;
282
+ const operator = expression.kind === "And" ? " && " : " || ";
283
+ return `(${expression.operands.map((operand, index) => `junct(${generate(operand)}, ${node}, ${index})`).join(operator)})`;
247
284
  }
248
- case "Or":
249
- return `(${expression.operands.map((operand) => `bool(${generate(operand)}, "a disjunct")`).join(" || ")})`;
250
285
  case "If":
251
286
  return `(condition(${generate(expression.condition)}, ${addReference(generator, expression)}) ? ${generate(expression.consequent)} : ${generate(expression.alternative)})`;
252
287
  case "FunctionApplication": {
253
288
  keepLazy(expression.function);
254
- const functionCode = generate(expression.function);
255
- const describeNonFunction = addReference(generator, getNonFunctionError(expression));
289
+ // The interpreter evaluates a function that may construct one with EvalControl.KeepLazy.
290
+ const evaluatedFunction = isConstructionFree(
291
+ expression.function,
292
+ frame,
293
+ generator.environment,
294
+ )
295
+ ? generate(expression.function)
296
+ : generateDelegate(generator, expression.function, {
297
+ ...frame,
298
+ context: `keepLazyContext(${frame.context})`,
299
+ });
300
+ const functionCode = `expectFunction(${evaluatedFunction}, ${addReference(generator, expression)})`;
301
+ const describeMissing = getMissingArgumentDescriber(generator.environment.runtime.version);
302
+ const error = describeMissing ? `, ${addReference(generator, describeMissing)}` : "";
256
303
  if (expression.args.length === 1)
257
- return `apply(${functionCode}, ${generate(expression.args[0])}, undefined, ${describeNonFunction})`;
258
- return `apply(${functionCode}, tuple([${expression.args.map((arg) => generate(arg)).join(", ")}]), undefined, ${describeNonFunction})`;
304
+ return `apply(${functionCode}, ${generate(expression.args[0])}${error})`;
305
+ return `apply(${functionCode}, tuple([${expression.args.map((arg) => generate(arg)).join(", ")}])${error})`;
259
306
  }
260
307
  case "FieldAccess":
261
- return `apply(${generate(expression.record)}, ${JSON.stringify(expression.field)}, ${addReference(generator, getFieldError(expression))}, ${addReference(generator, getNonRecordError(expression))})`;
308
+ return `${addReference(generator, getFieldSelector(expression))}(${generate(expression.record)})`;
262
309
  case "Record": {
263
310
  const fields = getSortedFields(expression.fields);
264
311
  if (hasDuplicateFields(fields)) return generateDelegate(generator, expression, frame);