tla-ts 0.0.3-dev.5e999f2 → 0.0.3-dev.5fd6731
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/index.cjs +1 -1
- package/dist/index.d.cts +38 -1
- package/dist/index.d.ts +38 -1
- 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 +14 -12
- package/dist/run-cli.js +22 -20
- package/dist/transfer.cjs +36 -21
- package/dist/transfer.js +36 -21
- package/package.json +1 -1
- package/src/ast.ts +27 -4
- package/src/builtins.ts +9 -3
- package/src/check.ts +234 -53
- package/src/config.ts +224 -170
- package/src/environment.ts +225 -74
- package/src/errors.ts +74 -1
- package/src/evaluate.ts +136 -15
- package/src/exit-codes.ts +22 -3
- package/src/fingerprints.ts +2 -1
- package/src/instances.ts +1 -1
- package/src/levels.ts +177 -36
- package/src/live-check.ts +3 -1
- package/src/liveness.ts +66 -6
- package/src/parser.ts +155 -49
- package/src/resolve.ts +911 -342
- package/src/run-cli.ts +61 -11
- package/src/sany-lexer.ts +615 -0
- package/src/sany-parse-error.ts +3143 -0
- package/src/spec-description.ts +1 -2
- package/src/standard-modules.ts +52 -38
- package/src/standard-ranges.ts +116 -0
- package/src/subexpressions.ts +26 -14
- package/src/substitution-levels.ts +38 -17
- package/src/successors.ts +105 -27
- package/src/value-sources.ts +29 -0
- package/src/values.ts +122 -42
package/src/evaluate.ts
CHANGED
|
@@ -10,16 +10,16 @@ import {
|
|
|
10
10
|
type NumberExpression,
|
|
11
11
|
type OperatorParam,
|
|
12
12
|
type RecordField,
|
|
13
|
-
type SourceRange,
|
|
14
13
|
} from "./ast";
|
|
15
14
|
import { getKindString } from "./builtins";
|
|
16
|
-
import { TlaEvaluationError } from "./errors";
|
|
17
|
-
import { EXIT_STATUS, setExitCode } from "./exit-codes";
|
|
15
|
+
import { formatRange, TlaEvaluationError, TlaUnassignedError } from "./errors";
|
|
16
|
+
import { EXIT_STATUS, setExitCode, setOwnExitCode } from "./exit-codes";
|
|
18
17
|
import { generateEvaluator } from "./codegen";
|
|
19
18
|
import type { CheckerRuntime } from "./runtime";
|
|
20
19
|
import { getReadVariables } from "./dependencies";
|
|
21
20
|
import { contextualApplications, mapChildren, substitutedExpressions } from "./instances";
|
|
22
21
|
import { isEnabled } from "./successors";
|
|
22
|
+
import { getFingerprintTrace, valueSources, withSource } from "./value-sources";
|
|
23
23
|
import {
|
|
24
24
|
applyFunction,
|
|
25
25
|
combineHash,
|
|
@@ -35,6 +35,7 @@ import {
|
|
|
35
35
|
getDomain,
|
|
36
36
|
getFunctionDomain,
|
|
37
37
|
getIntervalElements,
|
|
38
|
+
getLazySubsets,
|
|
38
39
|
getSequenceElements,
|
|
39
40
|
getValueHash,
|
|
40
41
|
isFunctionValue,
|
|
@@ -49,6 +50,7 @@ import {
|
|
|
49
50
|
toFiniteSet,
|
|
50
51
|
updateFunction,
|
|
51
52
|
valuesEqual,
|
|
53
|
+
type FilteredSetValue,
|
|
52
54
|
type FunctionValue,
|
|
53
55
|
type LazyFunctionSource,
|
|
54
56
|
type LazyFunctionValue,
|
|
@@ -117,6 +119,7 @@ export interface Environment {
|
|
|
117
119
|
definitionValues: Map<Definition, Value>;
|
|
118
120
|
constantLevels: Map<Definition, boolean>;
|
|
119
121
|
evaluators: WeakMap<Expression, Evaluator>;
|
|
122
|
+
trace?: Expression[];
|
|
120
123
|
}
|
|
121
124
|
|
|
122
125
|
export interface Context {
|
|
@@ -146,9 +149,6 @@ const EXCEPT_AT = "@";
|
|
|
146
149
|
export const describeLocation = (expression: Expression) =>
|
|
147
150
|
`line ${expression.location.line}, column ${expression.location.column}`;
|
|
148
151
|
|
|
149
|
-
export const formatRange = (range: SourceRange) =>
|
|
150
|
-
`line ${range.start.line}, col ${range.start.column} to line ${range.end.line}, col ${range.end.column} of module ${range.module}`;
|
|
151
|
-
|
|
152
152
|
export const describeRange = (expression: Expression) => {
|
|
153
153
|
const range = expression.location.range;
|
|
154
154
|
return range ? formatRange(range) : describeLocation(expression);
|
|
@@ -343,9 +343,8 @@ export const getEnumeratedElements = (set: Value, expression: Expression) => {
|
|
|
343
343
|
: `TLC encountered the non-enumerable quantifier bound\n${text}\n${describeRange(expression)}\n${explanation}`,
|
|
344
344
|
);
|
|
345
345
|
}
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
: toFiniteSet(set).elements;
|
|
346
|
+
if (typeof set === "object" && set.kind === "Interval") return getIntervalElements(set);
|
|
347
|
+
return getLazySubsets(set) ?? toFiniteSet(set).elements;
|
|
349
348
|
};
|
|
350
349
|
|
|
351
350
|
export const forEachBinding = (
|
|
@@ -1023,16 +1022,80 @@ const isStateCached = (expression: Expression, environment: Environment) =>
|
|
|
1023
1022
|
getReadVariables(expression, environment) !== undefined &&
|
|
1024
1023
|
!hasFreeLocals(expression, NO_BOUND_NAMES);
|
|
1025
1024
|
|
|
1025
|
+
// CallStackTool also evaluates the predicate of a lazy set filter it returns, even one that TLC
|
|
1026
|
+
// made before the replay.
|
|
1027
|
+
const filteredSetRetracers = new WeakMap<
|
|
1028
|
+
FilteredSetValue,
|
|
1029
|
+
(environment: Environment) => FilteredSetValue
|
|
1030
|
+
>();
|
|
1031
|
+
|
|
1032
|
+
const SOURCED_KINDS = new Set<Expression["kind"]>([
|
|
1033
|
+
"SetEnumeration",
|
|
1034
|
+
"SetMap",
|
|
1035
|
+
"SetFilter",
|
|
1036
|
+
"Tuple",
|
|
1037
|
+
"Record",
|
|
1038
|
+
"RecordSet",
|
|
1039
|
+
"FunctionSet",
|
|
1040
|
+
"Product",
|
|
1041
|
+
]);
|
|
1042
|
+
|
|
1043
|
+
const SOURCED_OPERATORS = new Set(["SUBSET", "UNION", "DOMAIN", "\\cup", "\\cap", "\\"]);
|
|
1044
|
+
|
|
1045
|
+
// CallStackTool gives a set, tuple or record it builds the expression as its source, but not a lazy
|
|
1046
|
+
// set filter, which it returns as a copy.
|
|
1047
|
+
const isSourced = (expression: Expression, environment: Environment) =>
|
|
1048
|
+
SOURCED_KINDS.has(expression.kind) ||
|
|
1049
|
+
(expression.kind === "Apply" &&
|
|
1050
|
+
SOURCED_OPERATORS.has(expression.operator) &&
|
|
1051
|
+
!isLocallyResolved(expression) &&
|
|
1052
|
+
resolveGlobalOperator(expression.operator, environment)?.kind === "Builtin");
|
|
1053
|
+
|
|
1054
|
+
// When an evaluation fails, CallStackTool freezes the stack at the innermost expression and pushes
|
|
1055
|
+
// the source of each value whose method failed.
|
|
1056
|
+
const evaluateTraced = (
|
|
1057
|
+
evaluator: Evaluator,
|
|
1058
|
+
context: Context,
|
|
1059
|
+
trace: Expression[],
|
|
1060
|
+
depth: number,
|
|
1061
|
+
) => {
|
|
1062
|
+
try {
|
|
1063
|
+
return evaluator(context);
|
|
1064
|
+
} catch (error) {
|
|
1065
|
+
if (trace.length === depth + 1) trace.push(...(getFingerprintTrace(error) ?? []));
|
|
1066
|
+
throw error;
|
|
1067
|
+
}
|
|
1068
|
+
};
|
|
1069
|
+
|
|
1026
1070
|
export const getEvaluator = (expression: Expression, environment: Environment): Evaluator => {
|
|
1027
1071
|
const cached = environment.evaluators.get(expression);
|
|
1028
1072
|
if (cached) return cached;
|
|
1029
1073
|
const compiled = compile(expression, environment);
|
|
1030
|
-
const
|
|
1074
|
+
const cachedEvaluator =
|
|
1031
1075
|
isWorthCaching(expression) && isClosedConstant(expression, environment)
|
|
1032
1076
|
? cacheFirstValue(compiled)
|
|
1033
1077
|
: isStateCached(expression, environment)
|
|
1034
1078
|
? cacheStateValue(compiled)
|
|
1035
1079
|
: compiled;
|
|
1080
|
+
const trace = environment.trace;
|
|
1081
|
+
const isSourcedExpression = trace !== undefined && isSourced(expression, environment);
|
|
1082
|
+
// TLC's CallStackTool pushes each expression it evaluates and keeps the stack when one fails.
|
|
1083
|
+
const evaluator: Evaluator = trace
|
|
1084
|
+
? (context) => {
|
|
1085
|
+
const depth = trace.length;
|
|
1086
|
+
trace.push(expression);
|
|
1087
|
+
const value = evaluateTraced(cachedEvaluator, context, trace, depth);
|
|
1088
|
+
trace.length = depth;
|
|
1089
|
+
if (isSourcedExpression && typeof value === "object" && value.kind !== "FilteredSet") {
|
|
1090
|
+
valueSources.current?.set(value, expression);
|
|
1091
|
+
}
|
|
1092
|
+
const retrace =
|
|
1093
|
+
typeof value === "object" && value.kind === "FilteredSet"
|
|
1094
|
+
? filteredSetRetracers.get(value)
|
|
1095
|
+
: undefined;
|
|
1096
|
+
return retrace ? retrace(environment) : value;
|
|
1097
|
+
}
|
|
1098
|
+
: cachedEvaluator;
|
|
1036
1099
|
environment.evaluators.set(expression, evaluator);
|
|
1037
1100
|
return evaluator;
|
|
1038
1101
|
};
|
|
@@ -1040,6 +1103,7 @@ export const getEvaluator = (expression: Expression, environment: Environment):
|
|
|
1040
1103
|
const entryEvaluators = new WeakMap<Expression, Evaluator>();
|
|
1041
1104
|
|
|
1042
1105
|
export const getEntryEvaluator = (expression: Expression, environment: Environment) => {
|
|
1106
|
+
if (environment.trace) return getEvaluator(expression, environment);
|
|
1043
1107
|
const cached = entryEvaluators.get(expression);
|
|
1044
1108
|
if (cached) return cached;
|
|
1045
1109
|
const evaluator =
|
|
@@ -1148,11 +1212,32 @@ const getLazyArguments = (args: Expression[], context: Context): OperatorValue[]
|
|
|
1148
1212
|
expression: arg,
|
|
1149
1213
|
}));
|
|
1150
1214
|
|
|
1215
|
+
const RECEIVING_OPERATORS = new Set(["=", "#", "\\in", "\\notin", "\\cup", "\\cap", "\\"]);
|
|
1216
|
+
|
|
1217
|
+
// The argument whose method TLC calls to apply a built-in operator.
|
|
1218
|
+
const getReceiver = (name: string, left: Value, right: Value) =>
|
|
1219
|
+
name === "\\in" ||
|
|
1220
|
+
name === "\\notin" ||
|
|
1221
|
+
((name === "\\cup" || name === "\\cap") && !isReducible(left))
|
|
1222
|
+
? right
|
|
1223
|
+
: left;
|
|
1224
|
+
|
|
1151
1225
|
const compileBuiltinCall = (
|
|
1152
1226
|
builtin: Builtin,
|
|
1153
1227
|
args: Expression[],
|
|
1154
1228
|
environment: Environment,
|
|
1155
1229
|
): Evaluator => {
|
|
1230
|
+
if (environment.trace && RECEIVING_OPERATORS.has(builtin.name) && args.length === 2) {
|
|
1231
|
+
const evaluateLeft = getEvaluator(args[0], environment);
|
|
1232
|
+
const evaluateRight = getEvaluator(args[1], environment);
|
|
1233
|
+
return (context) => {
|
|
1234
|
+
const left = evaluateLeft(context);
|
|
1235
|
+
const right = evaluateRight(context);
|
|
1236
|
+
return withSource(getReceiver(builtin.name, left, right), () =>
|
|
1237
|
+
builtin.evaluate([left, right], context),
|
|
1238
|
+
);
|
|
1239
|
+
};
|
|
1240
|
+
}
|
|
1156
1241
|
if (builtin.isLazy) {
|
|
1157
1242
|
return (context) => builtin.evaluate(getLazyArguments(args, context), context);
|
|
1158
1243
|
}
|
|
@@ -1312,6 +1397,13 @@ const compileApply = (
|
|
|
1312
1397
|
if (global?.kind === "Builtin" && global.name === "DOMAIN") {
|
|
1313
1398
|
const operand = getEvaluator(args[0], environment);
|
|
1314
1399
|
const domain = getDomainOperator(expression);
|
|
1400
|
+
// TLC builds a new interval for the domain of a tuple, so the source it gives one stays its own.
|
|
1401
|
+
if (environment.trace) {
|
|
1402
|
+
return (context) => {
|
|
1403
|
+
const value = domain(operand(context));
|
|
1404
|
+
return typeof value === "object" && value.kind === "Interval" ? { ...value } : value;
|
|
1405
|
+
};
|
|
1406
|
+
}
|
|
1315
1407
|
return (context) => domain(operand(context));
|
|
1316
1408
|
}
|
|
1317
1409
|
// TLC sorts the value of a constant TLCEval argument only where no context binds a name.
|
|
@@ -1327,6 +1419,13 @@ const compileApply = (
|
|
|
1327
1419
|
const left = getEvaluator(args[0], environment);
|
|
1328
1420
|
const right = getEvaluator(args[1], environment);
|
|
1329
1421
|
const subset = getSubsetOperator(expression, global);
|
|
1422
|
+
if (environment.trace) {
|
|
1423
|
+
return (context) => {
|
|
1424
|
+
const subsetValue = left(context);
|
|
1425
|
+
const superset = right(context);
|
|
1426
|
+
return withSource(subsetValue, () => subset(subsetValue, superset));
|
|
1427
|
+
};
|
|
1428
|
+
}
|
|
1330
1429
|
return (context) => subset(left(context), right(context));
|
|
1331
1430
|
}
|
|
1332
1431
|
if (global?.kind === "Builtin") return compileBuiltinCall(global, args, environment);
|
|
@@ -1532,13 +1631,21 @@ const compileSetComprehension = (
|
|
|
1532
1631
|
const pattern = expression.bound.pattern;
|
|
1533
1632
|
return (context) => {
|
|
1534
1633
|
const base = set(context);
|
|
1535
|
-
const
|
|
1634
|
+
const getTest = (evaluatePredicate: Evaluator) => (element: Value) =>
|
|
1536
1635
|
expectBoolean(
|
|
1537
|
-
|
|
1636
|
+
evaluatePredicate(withScope(context, bindPattern(context.scope, pattern, element))),
|
|
1538
1637
|
"a set filter predicate",
|
|
1539
1638
|
);
|
|
1639
|
+
const test = getTest(predicate);
|
|
1540
1640
|
if (!isReducible(base)) {
|
|
1541
|
-
if (isSetValue(base))
|
|
1641
|
+
if (isSetValue(base)) {
|
|
1642
|
+
const filtered: FilteredSetValue = { kind: "FilteredSet", base, test };
|
|
1643
|
+
filteredSetRetracers.set(filtered, (traced) => ({
|
|
1644
|
+
...filtered,
|
|
1645
|
+
test: getTest(getEvaluator(expression.predicate, traced)),
|
|
1646
|
+
}));
|
|
1647
|
+
return filtered;
|
|
1648
|
+
}
|
|
1542
1649
|
throw new TlaEvaluationError(
|
|
1543
1650
|
`TLC encountered a non-enumerable quantifier bound ${formatValue(base)} at ${describeLocation(expression.bound.set)}`,
|
|
1544
1651
|
);
|
|
@@ -1591,8 +1698,12 @@ export const hasDuplicateFields = (sortedFields: RecordField[]) =>
|
|
|
1591
1698
|
sortedFields.some((field, index) => index > 0 && sortedFields[index - 1].name === field.name);
|
|
1592
1699
|
|
|
1593
1700
|
export const createUnassignedError = (name: string, expression: Expression) =>
|
|
1594
|
-
|
|
1595
|
-
|
|
1701
|
+
setOwnExitCode(
|
|
1702
|
+
new TlaUnassignedError(
|
|
1703
|
+
`In evaluation, the identifier ${name} is either undefined or not an operator.\n${describeRange(expression)}`,
|
|
1704
|
+
name,
|
|
1705
|
+
),
|
|
1706
|
+
EXIT_STATUS.configParseError,
|
|
1596
1707
|
);
|
|
1597
1708
|
|
|
1598
1709
|
export const createPrimeOutsideActionError = (expression: Expression) =>
|
|
@@ -1782,6 +1893,16 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
1782
1893
|
const evaluateFunction = child(expression.function);
|
|
1783
1894
|
const args = expression.args.map(child);
|
|
1784
1895
|
const describeNonFunction = getNonFunctionError(expression);
|
|
1896
|
+
if (args.length === 1 && environment.trace) {
|
|
1897
|
+
const argument = args[0];
|
|
1898
|
+
return (context) => {
|
|
1899
|
+
const functionValue = evaluateFunction(context);
|
|
1900
|
+
const argumentValue = argument(context);
|
|
1901
|
+
const apply = () =>
|
|
1902
|
+
applyFunction(functionValue, argumentValue, undefined, describeNonFunction);
|
|
1903
|
+
return isFunctionValue(functionValue) ? withSource(functionValue, apply) : apply();
|
|
1904
|
+
};
|
|
1905
|
+
}
|
|
1785
1906
|
if (args.length === 1) {
|
|
1786
1907
|
const argument = args[0];
|
|
1787
1908
|
return (context) =>
|
package/src/exit-codes.ts
CHANGED
|
@@ -26,7 +26,19 @@ export const setExitCode = <Thrown>(error: Thrown, code: number) => {
|
|
|
26
26
|
|
|
27
27
|
export const getExitCode = (error: Error) => exitCodes.get(error);
|
|
28
28
|
|
|
29
|
-
|
|
29
|
+
const ownExitCodes = new WeakMap<Error, number>();
|
|
30
|
+
|
|
31
|
+
// The exit status of the error code TLC gives an EvalException, which TLC uses only where it
|
|
32
|
+
// doesn't report the error again as a nested expression.
|
|
33
|
+
export const setOwnExitCode = <Thrown extends Error>(error: Thrown, code: number) => {
|
|
34
|
+
ownExitCodes.set(error, code);
|
|
35
|
+
return error;
|
|
36
|
+
};
|
|
37
|
+
|
|
38
|
+
export const getOwnExitCode = (error: unknown) =>
|
|
39
|
+
error instanceof Error ? ownExitCodes.get(error) : undefined;
|
|
40
|
+
|
|
41
|
+
// TLC exits with 255 when it fails to process or evaluate a liveness property.
|
|
30
42
|
const withErrorExitCode = <Result>(run: () => Result) => {
|
|
31
43
|
try {
|
|
32
44
|
return run();
|
|
@@ -41,8 +53,15 @@ export const withLivenessExitCode = (
|
|
|
41
53
|
const checker = withErrorExitCode(create);
|
|
42
54
|
return (
|
|
43
55
|
checker && {
|
|
44
|
-
|
|
45
|
-
|
|
56
|
+
// TLC replays the initial states to report an error, but skips the liveness check of a
|
|
57
|
+
// state it has already seen, so it exits with the status of the error's own code.
|
|
58
|
+
addInitialState: (index, state) => {
|
|
59
|
+
try {
|
|
60
|
+
checker.addInitialState(index, state);
|
|
61
|
+
} catch (error) {
|
|
62
|
+
throw setExitCode(error, getOwnExitCode(error) ?? EXIT_STATUS.error);
|
|
63
|
+
}
|
|
64
|
+
},
|
|
46
65
|
addState: (index, state, successors) =>
|
|
47
66
|
withErrorExitCode(() => checker.addState(index, state, successors)),
|
|
48
67
|
findViolation: () => withErrorExitCode(() => checker.findViolation()),
|
package/src/fingerprints.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { getValueFingerprint, getValueHash, type Value } from "./values";
|
|
1
|
+
import { assertFingerprintable, getValueFingerprint, getValueHash, type Value } from "./values";
|
|
2
2
|
|
|
3
3
|
const EMPTY = 0;
|
|
4
4
|
const INITIAL_CAPACITY = 1 << 12;
|
|
@@ -20,6 +20,7 @@ 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
|
+
assertFingerprintable(state);
|
|
23
24
|
fingerprint[0] = mix(first) || 1;
|
|
24
25
|
fingerprint[1] = mix(second);
|
|
25
26
|
};
|
package/src/instances.ts
CHANGED
|
@@ -164,7 +164,7 @@ export const mapChildren = (
|
|
|
164
164
|
case "RecordSet":
|
|
165
165
|
return {
|
|
166
166
|
...expression,
|
|
167
|
-
fields: expression.fields.map((field) => ({
|
|
167
|
+
fields: expression.fields.map((field) => ({ ...field, value: plain(field.value) })),
|
|
168
168
|
};
|
|
169
169
|
case "Except":
|
|
170
170
|
return {
|
package/src/levels.ts
CHANGED
|
@@ -5,11 +5,19 @@ import {
|
|
|
5
5
|
type Expression,
|
|
6
6
|
type Module,
|
|
7
7
|
type OperatorParam,
|
|
8
|
+
type Proof,
|
|
9
|
+
type ProofStep,
|
|
8
10
|
type SourceLocation,
|
|
9
11
|
} from "./ast";
|
|
10
|
-
import {
|
|
12
|
+
import {
|
|
13
|
+
createSanyError,
|
|
14
|
+
createSemanticError,
|
|
15
|
+
formatRange,
|
|
16
|
+
TlaSyntaxError,
|
|
17
|
+
type SanyError,
|
|
18
|
+
} from "./errors";
|
|
11
19
|
import { mapChildren } from "./instances";
|
|
12
|
-
import { getBoundNames, getPatternNames } from "./resolve";
|
|
20
|
+
import { collectSemanticErrors, getBoundNames, getPatternNames } from "./resolve";
|
|
13
21
|
import { STANDARD_LEVELS } from "./standard-levels";
|
|
14
22
|
|
|
15
23
|
interface LevelData {
|
|
@@ -34,6 +42,7 @@ interface LevelContext {
|
|
|
34
42
|
constants: Set<string>;
|
|
35
43
|
variables: Set<string>;
|
|
36
44
|
getDefinition: (name: string) => Definition | undefined;
|
|
45
|
+
getQualifiedName?: (name: string) => string | undefined;
|
|
37
46
|
}
|
|
38
47
|
|
|
39
48
|
type ScopeEntry =
|
|
@@ -176,8 +185,13 @@ export const ACTION_LEVEL = 2;
|
|
|
176
185
|
|
|
177
186
|
export const TEMPORAL_LEVEL = 3;
|
|
178
187
|
|
|
179
|
-
|
|
180
|
-
|
|
188
|
+
// SANY reports a level error at the range of the expression it rejects.
|
|
189
|
+
const createLevelError = (message: string, expression: Expression) =>
|
|
190
|
+
expression.location.range
|
|
191
|
+
? createSemanticError(`${message}.`, expression.location.range)
|
|
192
|
+
: new TlaSyntaxError(
|
|
193
|
+
`${message} at line ${expression.location.line}, column ${expression.location.column}`,
|
|
194
|
+
);
|
|
181
195
|
|
|
182
196
|
const LOGICAL_OPERATORS = new Set(["/\\", "\\/", "=>", "<=>"]);
|
|
183
197
|
|
|
@@ -201,7 +215,13 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
201
215
|
if (context.variables.has(name)) return { kind: "Declared", name, level: 1, arity: 0 };
|
|
202
216
|
const definition = context.getDefinition(name);
|
|
203
217
|
if (definition) {
|
|
204
|
-
|
|
218
|
+
const levels = analyzeDefinition(definition, new Map());
|
|
219
|
+
// SANY names a definition of an instance by its qualified name, as in I!Foo.
|
|
220
|
+
const qualifiedName = context.getQualifiedName?.(name);
|
|
221
|
+
return {
|
|
222
|
+
kind: "Defined",
|
|
223
|
+
levels: qualifiedName ? { ...levels, name: qualifiedName } : levels,
|
|
224
|
+
};
|
|
205
225
|
}
|
|
206
226
|
const signature = CORE_SIGNATURES.get(name) ?? STANDARD_LEVELS.get(name);
|
|
207
227
|
if (signature) return { kind: "Defined", levels: signature };
|
|
@@ -237,13 +257,13 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
237
257
|
if (operand.operator || operand.declared) return;
|
|
238
258
|
if (operand.data.level > getMaxLevel(operator, index)) {
|
|
239
259
|
throw new TlaSyntaxError(
|
|
240
|
-
`Level error in applying operator ${operator.name}
|
|
260
|
+
`Level error in applying operator ${operator.name}:\nThe level of argument ${index + 1} exceeds the maximum level allowed by the operator`,
|
|
241
261
|
);
|
|
242
262
|
}
|
|
243
263
|
});
|
|
244
264
|
if (ranges.some((range) => range.level > ACTION_LEVEL)) {
|
|
245
265
|
throw new TlaSyntaxError(
|
|
246
|
-
`Level error in applying operator ${operator.name}
|
|
266
|
+
`Level error in applying operator ${operator.name}:\nThe level of the range for a bounded variable exceeds the maximum level allowed by the operator`,
|
|
247
267
|
);
|
|
248
268
|
}
|
|
249
269
|
const getOperand = (formal: string) => {
|
|
@@ -444,10 +464,13 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
444
464
|
? applyDeclared(resolved.name, resolved.level, operands)
|
|
445
465
|
: applyDefined(resolved.levels, operands);
|
|
446
466
|
|
|
447
|
-
const checkJunction = (operands: Operand[],
|
|
467
|
+
const checkJunction = (operands: Operand[], expression: Expression) => {
|
|
448
468
|
const levels = operands.map((operand) => operand.data.level);
|
|
449
469
|
if (levels.includes(ACTION_LEVEL) && levels.includes(TEMPORAL_LEVEL)) {
|
|
450
|
-
throw createLevelError(
|
|
470
|
+
throw createLevelError(
|
|
471
|
+
"Formula has both temporal formula and action as arguments",
|
|
472
|
+
expression,
|
|
473
|
+
);
|
|
451
474
|
}
|
|
452
475
|
};
|
|
453
476
|
|
|
@@ -456,10 +479,10 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
456
479
|
if (isLeadsTo && operands.some((operand) => operand.data.level === ACTION_LEVEL)) {
|
|
457
480
|
throw createLevelError(
|
|
458
481
|
"Action used where only temporal formula or state predicate allowed",
|
|
459
|
-
expression
|
|
482
|
+
expression,
|
|
460
483
|
);
|
|
461
484
|
}
|
|
462
|
-
if (LOGICAL_OPERATORS.has(expression.operator)) checkJunction(operands, expression
|
|
485
|
+
if (LOGICAL_OPERATORS.has(expression.operator)) checkJunction(operands, expression);
|
|
463
486
|
};
|
|
464
487
|
|
|
465
488
|
const checkTemporal = (
|
|
@@ -473,7 +496,7 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
473
496
|
expression.kind === "Always"
|
|
474
497
|
? "[] followed by action not of form [A]_v"
|
|
475
498
|
: "<> followed by action not of form <<A>>_v",
|
|
476
|
-
expression
|
|
499
|
+
expression,
|
|
477
500
|
);
|
|
478
501
|
};
|
|
479
502
|
|
|
@@ -501,7 +524,17 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
501
524
|
return data;
|
|
502
525
|
};
|
|
503
526
|
|
|
527
|
+
// SANY reports a level error of an operator's arguments at the application.
|
|
504
528
|
const analyze = (expression: Expression, scope: Scope): LevelData => {
|
|
529
|
+
try {
|
|
530
|
+
return analyzeNode(expression, scope);
|
|
531
|
+
} catch (error) {
|
|
532
|
+
if (!(error instanceof TlaSyntaxError) || error.sany) throw error;
|
|
533
|
+
throw createLevelError(error.message, expression);
|
|
534
|
+
}
|
|
535
|
+
};
|
|
536
|
+
|
|
537
|
+
const analyzeNode = (expression: Expression, scope: Scope): LevelData => {
|
|
505
538
|
switch (expression.kind) {
|
|
506
539
|
case "Number":
|
|
507
540
|
case "Decimal":
|
|
@@ -521,7 +554,7 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
521
554
|
case "And":
|
|
522
555
|
case "Or": {
|
|
523
556
|
const operands = toOperands(expression.operands, scope);
|
|
524
|
-
checkJunction(operands, expression
|
|
557
|
+
checkJunction(operands, expression);
|
|
525
558
|
return applyDefined(JUNCTION_LEVELS, operands);
|
|
526
559
|
}
|
|
527
560
|
case "Prime":
|
|
@@ -561,13 +594,14 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
561
594
|
expression.bounds.map((bound) => bound.set),
|
|
562
595
|
getBoundNames(expression.bounds),
|
|
563
596
|
);
|
|
564
|
-
|
|
565
|
-
data.level === TEMPORAL_LEVEL
|
|
566
|
-
|
|
567
|
-
|
|
597
|
+
const actionBound =
|
|
598
|
+
data.level === TEMPORAL_LEVEL
|
|
599
|
+
? expression.bounds.find((bound) => analyze(bound.set, scope).level === ACTION_LEVEL)
|
|
600
|
+
: undefined;
|
|
601
|
+
if (actionBound) {
|
|
568
602
|
throw createLevelError(
|
|
569
603
|
"Action-level bound of quantified temporal formula",
|
|
570
|
-
|
|
604
|
+
actionBound.set,
|
|
571
605
|
);
|
|
572
606
|
}
|
|
573
607
|
return data;
|
|
@@ -817,34 +851,141 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
817
851
|
return { analyze, analyzeDefinition, toOperand };
|
|
818
852
|
};
|
|
819
853
|
|
|
820
|
-
const analyzeAssumeProve = (
|
|
854
|
+
export const analyzeAssumeProve = (
|
|
821
855
|
assumeProve: AssumeProve,
|
|
822
856
|
scope: Scope,
|
|
823
857
|
analyzer: ReturnType<typeof createLevelAnalyzer>,
|
|
824
|
-
) => {
|
|
858
|
+
): LevelData => {
|
|
825
859
|
const inner = new Map(scope);
|
|
826
|
-
assumeProve.assumptions.
|
|
860
|
+
const parts = assumeProve.assumptions.flatMap((assumption) => {
|
|
827
861
|
if (assumption.kind === "NewSymbol") {
|
|
828
|
-
|
|
862
|
+
const set = assumption.set && analyzer.analyze(assumption.set, inner);
|
|
829
863
|
inner.set(assumption.name, { kind: "Formal", arity: assumption.arity });
|
|
830
|
-
return;
|
|
864
|
+
return set ? [set] : [];
|
|
831
865
|
}
|
|
832
|
-
|
|
833
|
-
|
|
866
|
+
return [
|
|
867
|
+
assumption.kind === "AssumeProve"
|
|
868
|
+
? analyzeAssumeProve(assumption, inner, analyzer)
|
|
869
|
+
: analyzer.analyze(assumption, inner),
|
|
870
|
+
];
|
|
834
871
|
});
|
|
835
|
-
analyzer.analyze(assumeProve.conclusion, inner);
|
|
872
|
+
parts.push(analyzer.analyze(assumeProve.conclusion, inner));
|
|
873
|
+
const data = createData(Math.max(...parts.map((part) => part.level)));
|
|
874
|
+
parts.forEach((part) => {
|
|
875
|
+
part.params.forEach((param) => data.params.add(param));
|
|
876
|
+
part.constraints.forEach((value, key) => putConstraint(data.constraints, key, value));
|
|
877
|
+
part.argConstraints.forEach((value, key) => putArgConstraint(data.argConstraints, key, value));
|
|
878
|
+
part.argParams.forEach((key) => data.argParams.add(key));
|
|
879
|
+
});
|
|
880
|
+
return data;
|
|
836
881
|
};
|
|
837
882
|
|
|
838
|
-
// SANY checks the level of every definition, assumption, and
|
|
839
|
-
export const checkModuleLevels = (
|
|
883
|
+
// SANY checks the level of every definition, assumption, theorem, and instance of a module.
|
|
884
|
+
export const checkModuleLevels = (
|
|
885
|
+
module: Module,
|
|
886
|
+
context: LevelContext,
|
|
887
|
+
instances: { location: SourceLocation; check: () => void }[],
|
|
888
|
+
warnings: SanyError[],
|
|
889
|
+
) => {
|
|
840
890
|
const analyzer = createLevelAnalyzer(context);
|
|
841
|
-
|
|
842
|
-
.
|
|
843
|
-
|
|
844
|
-
|
|
845
|
-
|
|
846
|
-
|
|
847
|
-
|
|
848
|
-
|
|
891
|
+
const getLevel = (expressions: Expression[]) =>
|
|
892
|
+
Math.max(0, ...expressions.map((expression) => analyzer.analyze(expression, new Map()).level));
|
|
893
|
+
const getStepLevel = (step: ProofStep) => {
|
|
894
|
+
const body = step.body;
|
|
895
|
+
if (body.kind === "Have" || body.kind === "Case") return getLevel([body.expression]);
|
|
896
|
+
if (body.kind === "Witness") return getLevel(body.expressions);
|
|
897
|
+
if (body.kind === "Take") return getLevel(body.bounds.map((bound) => bound.set));
|
|
898
|
+
if (body.kind === "Pick") {
|
|
899
|
+
return getLevel([body.body, ...body.bounds.map((bound) => bound.set)]);
|
|
900
|
+
}
|
|
901
|
+
if (body.kind !== "Assert") return 0;
|
|
902
|
+
return body.statement.kind === "AssumeProve"
|
|
903
|
+
? analyzeAssumeProve(body.statement, new Map(), analyzer).level
|
|
904
|
+
: getLevel([body.statement]);
|
|
905
|
+
};
|
|
906
|
+
// SANY's TheoremNode.LevelCheckTemporal: the proof of a temporal goal may only assume constants.
|
|
907
|
+
const checkTemporalGoal = (proof: Proof | undefined): SanyError[] =>
|
|
908
|
+
proof?.kind !== "Steps"
|
|
909
|
+
? []
|
|
910
|
+
: proof.steps.flatMap((step) => {
|
|
911
|
+
const location = formatRange(step.statement);
|
|
912
|
+
const isConstant = () => getStepLevel(step) === 0;
|
|
913
|
+
if (
|
|
914
|
+
step.body.kind === "Have" ||
|
|
915
|
+
step.body.kind === "Take" ||
|
|
916
|
+
step.body.kind === "Witness"
|
|
917
|
+
) {
|
|
918
|
+
return isConstant()
|
|
919
|
+
? []
|
|
920
|
+
: [{ location, message: "Non-constant TAKE, WITNESS, or HAVE for temporal goal." }];
|
|
921
|
+
}
|
|
922
|
+
if (step.body.kind === "Case") {
|
|
923
|
+
return [
|
|
924
|
+
...(isConstant()
|
|
925
|
+
? []
|
|
926
|
+
: [{ location, message: "Non-constant CASE for temporal goal." }]),
|
|
927
|
+
...checkTemporalGoal(step.proof),
|
|
928
|
+
];
|
|
929
|
+
}
|
|
930
|
+
return step.body.kind === "Qed" ? checkTemporalGoal(step.proof) : [];
|
|
931
|
+
});
|
|
932
|
+
// SANY checks each step as a theorem of its own after the steps of its proof.
|
|
933
|
+
const checkProof = (proof: Proof | undefined): SanyError[] =>
|
|
934
|
+
proof?.kind !== "Steps"
|
|
935
|
+
? []
|
|
936
|
+
: proof.steps.flatMap((step) => {
|
|
937
|
+
const body = step.body;
|
|
938
|
+
const isTemporal = () => getStepLevel(step) === TEMPORAL_LEVEL;
|
|
939
|
+
const pickErrors =
|
|
940
|
+
body.kind === "Pick" && body.bounds.length > 0 && isTemporal()
|
|
941
|
+
? body.bounds
|
|
942
|
+
.filter((bound) => getLevel([bound.set]) !== 0)
|
|
943
|
+
.flatMap((bound) =>
|
|
944
|
+
bound.set.location.range
|
|
945
|
+
? [
|
|
946
|
+
{
|
|
947
|
+
location: formatRange(bound.set.location.range),
|
|
948
|
+
message: "Non-constant bound of temporal PICK.",
|
|
949
|
+
},
|
|
950
|
+
]
|
|
951
|
+
: [],
|
|
952
|
+
)
|
|
953
|
+
: [];
|
|
954
|
+
return [
|
|
955
|
+
...checkProof(step.proof),
|
|
956
|
+
...pickErrors,
|
|
957
|
+
...(step.proof?.kind === "Steps" && isTemporal() ? checkTemporalGoal(step.proof) : []),
|
|
958
|
+
];
|
|
959
|
+
});
|
|
960
|
+
const errors = collectSemanticErrors(
|
|
961
|
+
[
|
|
962
|
+
...module.definitions
|
|
963
|
+
.filter((definition) => !definition.name.includes("!"))
|
|
964
|
+
.map((definition) => ({
|
|
965
|
+
location: definition.location,
|
|
966
|
+
check: () => analyzer.analyzeDefinition(definition, new Map()),
|
|
967
|
+
})),
|
|
968
|
+
...module.assumptions.map((assumption) => ({
|
|
969
|
+
location: assumption.location,
|
|
970
|
+
check: () => analyzer.analyze(assumption.expression, new Map()),
|
|
971
|
+
})),
|
|
972
|
+
...module.theorems.map((theorem) => ({
|
|
973
|
+
location: theorem.location,
|
|
974
|
+
check: () => {
|
|
975
|
+
const data =
|
|
976
|
+
theorem.statement.kind === "AssumeProve"
|
|
977
|
+
? analyzeAssumeProve(theorem.statement, new Map(), analyzer)
|
|
978
|
+
: analyzer.analyze(theorem.statement, new Map());
|
|
979
|
+
const errors = [
|
|
980
|
+
...checkProof(theorem.proof),
|
|
981
|
+
...(data.level === TEMPORAL_LEVEL ? checkTemporalGoal(theorem.proof) : []),
|
|
982
|
+
];
|
|
983
|
+
if (errors.length > 0) throw createSanyError(errors);
|
|
984
|
+
},
|
|
985
|
+
})),
|
|
986
|
+
...instances,
|
|
987
|
+
],
|
|
988
|
+
warnings,
|
|
849
989
|
);
|
|
990
|
+
if (errors.length > 0) throw createSanyError(errors, false, undefined, warnings);
|
|
850
991
|
};
|
package/src/live-check.ts
CHANGED
|
@@ -100,7 +100,9 @@ const getNodeSlot = (table: NodeTable, state: number, tableauNode: number) => {
|
|
|
100
100
|
}
|
|
101
101
|
};
|
|
102
102
|
|
|
103
|
-
|
|
103
|
+
// Without a tableau a node is a state, so a successor the search hasn't expanded yet may lie past
|
|
104
|
+
// the per-node arrays.
|
|
105
|
+
const isWritten = (check: Check, node: number) => (check.offsets[node] ?? -1) !== -1;
|
|
104
106
|
|
|
105
107
|
const getPending = (check: Check, node: number) => (check.pending[node] ??= []);
|
|
106
108
|
|