tla-ts 0.0.3-dev.a57ca4f → 0.0.3-dev.a91da46
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.
- package/dist/cli.cjs +1 -1
- package/dist/cli.js +1 -1
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +148 -8
- package/dist/index.d.ts +148 -8
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +2 -2
- package/dist/parallel.cjs +1 -1
- package/dist/parallel.js +2 -2
- package/dist/run-cli.cjs +1351 -20
- package/dist/run-cli.js +1351 -20
- package/dist/transfer.cjs +86 -28
- package/dist/transfer.js +86 -28
- package/package.json +5 -1
- package/src/ast.ts +52 -6
- package/src/bags.ts +4 -7
- package/src/builtins.ts +29 -11
- package/src/bundled-modules.ts +3 -3
- package/src/canonical.ts +4 -3
- package/src/check.ts +1358 -219
- package/src/cli.ts +8 -1
- package/src/codegen.ts +68 -18
- package/src/config.ts +252 -179
- package/src/environment.ts +451 -129
- package/src/errors.ts +217 -3
- package/src/evaluate.ts +723 -116
- package/src/exit-codes.ts +5 -4
- package/src/index.ts +1 -0
- package/src/instances.ts +4 -2
- package/src/java-overrides.ts +104 -25
- package/src/levels.ts +183 -37
- package/src/lexer.ts +32 -4
- package/src/live-check.ts +220 -103
- package/src/liveness.ts +192 -65
- package/src/obligation-expression.ts +2 -2
- package/src/obligation-source.ts +2 -0
- package/src/parallel-worker.ts +8 -3
- package/src/parallel.ts +56 -5
- package/src/parser.ts +436 -128
- package/src/pcal-ast.ts +770 -0
- package/src/pcal-parse.ts +1523 -0
- package/src/pcal-tokenize.ts +516 -0
- package/src/pcal-translate.ts +1230 -0
- package/src/pcal-validate.ts +454 -0
- package/src/randomization.ts +24 -7
- package/src/resolve.ts +1364 -405
- package/src/run-cli.ts +1167 -155
- package/src/runtime.ts +16 -0
- package/src/sany-builtins.ts +147 -0
- package/src/sany-generator.ts +3112 -0
- package/src/sany-levels.ts +1208 -0
- package/src/sany-lexer.ts +545 -0
- package/src/sany-linter.ts +122 -0
- package/src/sany-modules.ts +1398 -0
- package/src/sany-nodes.ts +463 -0
- package/src/sany-parse-error.ts +2161 -0
- package/src/sany-report.ts +354 -0
- package/src/sany-selectors.ts +738 -0
- package/src/sany-source.ts +248 -0
- package/src/sany-xml.ts +1017 -0
- package/src/spec-description.ts +26 -7
- package/src/standard-modules.ts +203 -146
- package/src/standard-ranges.ts +116 -0
- package/src/state-graph.ts +29 -6
- package/src/subexpressions.ts +221 -161
- package/src/substitution-levels.ts +38 -17
- package/src/successors.ts +160 -105
- package/src/symmetry.ts +180 -52
- package/src/tableau.ts +54 -25
- package/src/tlc-ext.ts +13 -17
- package/src/tlc-messages.ts +329 -0
- package/src/tlc-module.ts +46 -18
- package/src/tlc-order.ts +56 -6
- package/src/tlc-random.ts +37 -9
- package/src/tlc-replay.ts +655 -0
- package/src/tlc-summary.ts +20 -5
- package/src/tlc-version.ts +18 -0
- package/src/transfer.ts +15 -3
- package/src/value-sources.ts +29 -0
- package/src/values.ts +680 -178
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
|
-
|
|
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,19 +3,22 @@ import {
|
|
|
3
3
|
bindValue,
|
|
4
4
|
expectBoolean,
|
|
5
5
|
findGlobalName,
|
|
6
|
-
getEnumeratedElements,
|
|
7
6
|
getConditionError,
|
|
8
|
-
|
|
7
|
+
getJunctionError,
|
|
9
8
|
getDomainOperator,
|
|
10
9
|
getSubsetOperator,
|
|
11
10
|
getEvaluator,
|
|
12
|
-
|
|
11
|
+
getFieldSelector,
|
|
12
|
+
getMissingArgumentDescriber,
|
|
13
|
+
getQuantifierElements,
|
|
13
14
|
isClosedConstant,
|
|
14
15
|
isTlcInteger,
|
|
15
16
|
isValueArgument,
|
|
16
17
|
isWorthCaching,
|
|
17
18
|
keepLazy,
|
|
18
19
|
resolveGlobalOperator,
|
|
20
|
+
expectFunction,
|
|
21
|
+
toKeepLazyContext,
|
|
19
22
|
createPrimeOutsideActionError,
|
|
20
23
|
createUnassignedError,
|
|
21
24
|
getSortedFields,
|
|
@@ -27,7 +30,7 @@ import {
|
|
|
27
30
|
import {
|
|
28
31
|
applyFunction,
|
|
29
32
|
createEnumeratedSet,
|
|
30
|
-
|
|
33
|
+
createSortedRecord,
|
|
31
34
|
createTuple,
|
|
32
35
|
createWrittenRecord,
|
|
33
36
|
valuesEqual,
|
|
@@ -71,17 +74,18 @@ const createRuntime = () => ({
|
|
|
71
74
|
if (typeof value !== "boolean") throw getConditionError(expression, value);
|
|
72
75
|
return value;
|
|
73
76
|
},
|
|
74
|
-
|
|
75
|
-
if (typeof value !== "boolean") throw
|
|
77
|
+
junct: (value: Value, expression: Expression & { kind: "And" | "Or" }, index: number) => {
|
|
78
|
+
if (typeof value !== "boolean") throw getJunctionError(expression, index, value);
|
|
76
79
|
return value;
|
|
77
80
|
},
|
|
78
81
|
apply: applyFunction,
|
|
82
|
+
expectFunction,
|
|
79
83
|
tuple: createTuple,
|
|
80
84
|
set: createEnumeratedSet,
|
|
81
|
-
record:
|
|
85
|
+
record: createSortedRecord,
|
|
82
86
|
writtenRecord: createWrittenRecord,
|
|
83
87
|
equal: valuesEqual,
|
|
84
|
-
enumerate:
|
|
88
|
+
enumerate: getQuantifierElements,
|
|
85
89
|
unassigned: (name: string, expression: Expression): never => {
|
|
86
90
|
throw createUnassignedError(name, expression);
|
|
87
91
|
},
|
|
@@ -93,7 +97,9 @@ const createRuntime = () => ({
|
|
|
93
97
|
scope: context.scope,
|
|
94
98
|
state: context.next,
|
|
95
99
|
next: undefined,
|
|
100
|
+
isKeepLazy: context.isKeepLazy,
|
|
96
101
|
}),
|
|
102
|
+
keepLazyContext: toKeepLazyContext,
|
|
97
103
|
extend: (context: Context, names: string[], values: Value[]): Context => ({
|
|
98
104
|
environment: context.environment,
|
|
99
105
|
scope: names.reduce(
|
|
@@ -102,6 +108,7 @@ const createRuntime = () => ({
|
|
|
102
108
|
),
|
|
103
109
|
state: context.state,
|
|
104
110
|
next: context.next,
|
|
111
|
+
isKeepLazy: context.isKeepLazy,
|
|
105
112
|
}),
|
|
106
113
|
});
|
|
107
114
|
|
|
@@ -152,7 +159,7 @@ const generateQuantifier = (
|
|
|
152
159
|
const lists = expression.bounds.map(() => createLocal(generator));
|
|
153
160
|
const declarations = expression.bounds.map(
|
|
154
161
|
(bound, index) =>
|
|
155
|
-
`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)});`,
|
|
156
163
|
);
|
|
157
164
|
const elements = expression.bounds.map((bound) => {
|
|
158
165
|
const local = createLocal(generator);
|
|
@@ -160,9 +167,13 @@ const generateQuantifier = (
|
|
|
160
167
|
return local;
|
|
161
168
|
});
|
|
162
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.
|
|
163
171
|
const loops = elements.reduce((code, element, index) => {
|
|
164
172
|
const position = createLocal(generator);
|
|
165
|
-
|
|
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} }`;
|
|
166
177
|
}, test);
|
|
167
178
|
const parameters = outer.map((local) => `, ${local}`).join("");
|
|
168
179
|
generator.helpers.push(
|
|
@@ -210,6 +221,32 @@ const generateApply = (
|
|
|
210
221
|
return generateDelegate(generator, expression, frame);
|
|
211
222
|
};
|
|
212
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
|
+
|
|
213
250
|
const generateExpression = (generator: Generator, expression: Expression, frame: Frame): string => {
|
|
214
251
|
const generate = (node: Expression, nodeFrame = frame) =>
|
|
215
252
|
generateExpression(generator, node, nodeFrame);
|
|
@@ -239,23 +276,36 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
|
|
|
239
276
|
}
|
|
240
277
|
case "Apply":
|
|
241
278
|
return generateApply(generator, expression, frame);
|
|
242
|
-
case "And":
|
|
279
|
+
case "And":
|
|
280
|
+
case "Or": {
|
|
243
281
|
const node = addReference(generator, expression);
|
|
244
|
-
|
|
282
|
+
const operator = expression.kind === "And" ? " && " : " || ";
|
|
283
|
+
return `(${expression.operands.map((operand, index) => `junct(${generate(operand)}, ${node}, ${index})`).join(operator)})`;
|
|
245
284
|
}
|
|
246
|
-
case "Or":
|
|
247
|
-
return `(${expression.operands.map((operand) => `bool(${generate(operand)}, "a disjunct")`).join(" || ")})`;
|
|
248
285
|
case "If":
|
|
249
286
|
return `(condition(${generate(expression.condition)}, ${addReference(generator, expression)}) ? ${generate(expression.consequent)} : ${generate(expression.alternative)})`;
|
|
250
287
|
case "FunctionApplication": {
|
|
251
288
|
keepLazy(expression.function);
|
|
252
|
-
|
|
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)}` : "";
|
|
253
303
|
if (expression.args.length === 1)
|
|
254
|
-
return `apply(${functionCode}, ${generate(expression.args[0])})`;
|
|
255
|
-
return `apply(${functionCode}, tuple([${expression.args.map((arg) => generate(arg)).join(", ")}]))`;
|
|
304
|
+
return `apply(${functionCode}, ${generate(expression.args[0])}${error})`;
|
|
305
|
+
return `apply(${functionCode}, tuple([${expression.args.map((arg) => generate(arg)).join(", ")}])${error})`;
|
|
256
306
|
}
|
|
257
307
|
case "FieldAccess":
|
|
258
|
-
return
|
|
308
|
+
return `${addReference(generator, getFieldSelector(expression))}(${generate(expression.record)})`;
|
|
259
309
|
case "Record": {
|
|
260
310
|
const fields = getSortedFields(expression.fields);
|
|
261
311
|
if (hasDuplicateFields(fields)) return generateDelegate(generator, expression, frame);
|