tla-ts 0.0.3-dev.bfd303f → 0.0.3-dev.c8c988d
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.d.cts +25 -1
- package/dist/index.d.ts +25 -1
- package/dist/run-cli.cjs +5 -3
- package/dist/run-cli.js +20 -18
- package/dist/transfer.cjs +22 -17
- package/dist/transfer.js +22 -17
- package/package.json +1 -1
- package/src/ast.ts +6 -1
- package/src/builtins.ts +9 -3
- package/src/check.ts +234 -53
- package/src/config.ts +224 -170
- package/src/environment.ts +32 -6
- package/src/errors.ts +52 -1
- package/src/evaluate.ts +131 -13
- package/src/fingerprints.ts +2 -1
- package/src/instances.ts +1 -1
- package/src/levels.ts +166 -36
- package/src/live-check.ts +3 -1
- package/src/liveness.ts +5 -1
- package/src/parser.ts +60 -17
- package/src/resolve.ts +108 -29
- package/src/run-cli.ts +56 -9
- package/src/spec-description.ts +1 -2
- package/src/standard-modules.ts +52 -38
- package/src/substitution-levels.ts +35 -11
- package/src/successors.ts +87 -17
- 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";
|
|
15
|
+
import { formatRange, TlaEvaluationError, TlaUnassignedError } from "./errors";
|
|
17
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
|
);
|
|
@@ -1592,8 +1699,9 @@ export const hasDuplicateFields = (sortedFields: RecordField[]) =>
|
|
|
1592
1699
|
|
|
1593
1700
|
export const createUnassignedError = (name: string, expression: Expression) =>
|
|
1594
1701
|
setOwnExitCode(
|
|
1595
|
-
new
|
|
1702
|
+
new TlaUnassignedError(
|
|
1596
1703
|
`In evaluation, the identifier ${name} is either undefined or not an operator.\n${describeRange(expression)}`,
|
|
1704
|
+
name,
|
|
1597
1705
|
),
|
|
1598
1706
|
EXIT_STATUS.configParseError,
|
|
1599
1707
|
);
|
|
@@ -1785,6 +1893,16 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
1785
1893
|
const evaluateFunction = child(expression.function);
|
|
1786
1894
|
const args = expression.args.map(child);
|
|
1787
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
|
+
}
|
|
1788
1906
|
if (args.length === 1) {
|
|
1789
1907
|
const argument = args[0];
|
|
1790
1908
|
return (context) =>
|
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,18 @@ import {
|
|
|
5
5
|
type Expression,
|
|
6
6
|
type Module,
|
|
7
7
|
type OperatorParam,
|
|
8
|
-
type
|
|
8
|
+
type Proof,
|
|
9
|
+
type ProofStep,
|
|
9
10
|
} from "./ast";
|
|
10
|
-
import {
|
|
11
|
+
import {
|
|
12
|
+
createSanyError,
|
|
13
|
+
createSemanticError,
|
|
14
|
+
formatRange,
|
|
15
|
+
TlaSyntaxError,
|
|
16
|
+
type SanyError,
|
|
17
|
+
} from "./errors";
|
|
11
18
|
import { mapChildren } from "./instances";
|
|
12
|
-
import { getBoundNames, getPatternNames } from "./resolve";
|
|
19
|
+
import { collectSemanticErrors, getBoundNames, getPatternNames } from "./resolve";
|
|
13
20
|
import { STANDARD_LEVELS } from "./standard-levels";
|
|
14
21
|
|
|
15
22
|
interface LevelData {
|
|
@@ -34,6 +41,7 @@ interface LevelContext {
|
|
|
34
41
|
constants: Set<string>;
|
|
35
42
|
variables: Set<string>;
|
|
36
43
|
getDefinition: (name: string) => Definition | undefined;
|
|
44
|
+
getQualifiedName?: (name: string) => string | undefined;
|
|
37
45
|
}
|
|
38
46
|
|
|
39
47
|
type ScopeEntry =
|
|
@@ -176,8 +184,13 @@ export const ACTION_LEVEL = 2;
|
|
|
176
184
|
|
|
177
185
|
export const TEMPORAL_LEVEL = 3;
|
|
178
186
|
|
|
179
|
-
|
|
180
|
-
|
|
187
|
+
// SANY reports a level error at the range of the expression it rejects.
|
|
188
|
+
const createLevelError = (message: string, expression: Expression) =>
|
|
189
|
+
expression.location.range
|
|
190
|
+
? createSemanticError(`${message}.`, expression.location.range)
|
|
191
|
+
: new TlaSyntaxError(
|
|
192
|
+
`${message} at line ${expression.location.line}, column ${expression.location.column}`,
|
|
193
|
+
);
|
|
181
194
|
|
|
182
195
|
const LOGICAL_OPERATORS = new Set(["/\\", "\\/", "=>", "<=>"]);
|
|
183
196
|
|
|
@@ -201,7 +214,13 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
201
214
|
if (context.variables.has(name)) return { kind: "Declared", name, level: 1, arity: 0 };
|
|
202
215
|
const definition = context.getDefinition(name);
|
|
203
216
|
if (definition) {
|
|
204
|
-
|
|
217
|
+
const levels = analyzeDefinition(definition, new Map());
|
|
218
|
+
// SANY names a definition of an instance by its qualified name, as in I!Foo.
|
|
219
|
+
const qualifiedName = context.getQualifiedName?.(name);
|
|
220
|
+
return {
|
|
221
|
+
kind: "Defined",
|
|
222
|
+
levels: qualifiedName ? { ...levels, name: qualifiedName } : levels,
|
|
223
|
+
};
|
|
205
224
|
}
|
|
206
225
|
const signature = CORE_SIGNATURES.get(name) ?? STANDARD_LEVELS.get(name);
|
|
207
226
|
if (signature) return { kind: "Defined", levels: signature };
|
|
@@ -237,13 +256,13 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
237
256
|
if (operand.operator || operand.declared) return;
|
|
238
257
|
if (operand.data.level > getMaxLevel(operator, index)) {
|
|
239
258
|
throw new TlaSyntaxError(
|
|
240
|
-
`Level error in applying operator ${operator.name}
|
|
259
|
+
`Level error in applying operator ${operator.name}:\nThe level of argument ${index + 1} exceeds the maximum level allowed by the operator`,
|
|
241
260
|
);
|
|
242
261
|
}
|
|
243
262
|
});
|
|
244
263
|
if (ranges.some((range) => range.level > ACTION_LEVEL)) {
|
|
245
264
|
throw new TlaSyntaxError(
|
|
246
|
-
`Level error in applying operator ${operator.name}
|
|
265
|
+
`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
266
|
);
|
|
248
267
|
}
|
|
249
268
|
const getOperand = (formal: string) => {
|
|
@@ -444,10 +463,13 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
444
463
|
? applyDeclared(resolved.name, resolved.level, operands)
|
|
445
464
|
: applyDefined(resolved.levels, operands);
|
|
446
465
|
|
|
447
|
-
const checkJunction = (operands: Operand[],
|
|
466
|
+
const checkJunction = (operands: Operand[], expression: Expression) => {
|
|
448
467
|
const levels = operands.map((operand) => operand.data.level);
|
|
449
468
|
if (levels.includes(ACTION_LEVEL) && levels.includes(TEMPORAL_LEVEL)) {
|
|
450
|
-
throw createLevelError(
|
|
469
|
+
throw createLevelError(
|
|
470
|
+
"Formula has both temporal formula and action as arguments",
|
|
471
|
+
expression,
|
|
472
|
+
);
|
|
451
473
|
}
|
|
452
474
|
};
|
|
453
475
|
|
|
@@ -456,10 +478,10 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
456
478
|
if (isLeadsTo && operands.some((operand) => operand.data.level === ACTION_LEVEL)) {
|
|
457
479
|
throw createLevelError(
|
|
458
480
|
"Action used where only temporal formula or state predicate allowed",
|
|
459
|
-
expression
|
|
481
|
+
expression,
|
|
460
482
|
);
|
|
461
483
|
}
|
|
462
|
-
if (LOGICAL_OPERATORS.has(expression.operator)) checkJunction(operands, expression
|
|
484
|
+
if (LOGICAL_OPERATORS.has(expression.operator)) checkJunction(operands, expression);
|
|
463
485
|
};
|
|
464
486
|
|
|
465
487
|
const checkTemporal = (
|
|
@@ -473,7 +495,7 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
473
495
|
expression.kind === "Always"
|
|
474
496
|
? "[] followed by action not of form [A]_v"
|
|
475
497
|
: "<> followed by action not of form <<A>>_v",
|
|
476
|
-
expression
|
|
498
|
+
expression,
|
|
477
499
|
);
|
|
478
500
|
};
|
|
479
501
|
|
|
@@ -501,7 +523,17 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
501
523
|
return data;
|
|
502
524
|
};
|
|
503
525
|
|
|
526
|
+
// SANY reports a level error of an operator's arguments at the application.
|
|
504
527
|
const analyze = (expression: Expression, scope: Scope): LevelData => {
|
|
528
|
+
try {
|
|
529
|
+
return analyzeNode(expression, scope);
|
|
530
|
+
} catch (error) {
|
|
531
|
+
if (!(error instanceof TlaSyntaxError) || error.sany) throw error;
|
|
532
|
+
throw createLevelError(error.message, expression);
|
|
533
|
+
}
|
|
534
|
+
};
|
|
535
|
+
|
|
536
|
+
const analyzeNode = (expression: Expression, scope: Scope): LevelData => {
|
|
505
537
|
switch (expression.kind) {
|
|
506
538
|
case "Number":
|
|
507
539
|
case "Decimal":
|
|
@@ -521,7 +553,7 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
521
553
|
case "And":
|
|
522
554
|
case "Or": {
|
|
523
555
|
const operands = toOperands(expression.operands, scope);
|
|
524
|
-
checkJunction(operands, expression
|
|
556
|
+
checkJunction(operands, expression);
|
|
525
557
|
return applyDefined(JUNCTION_LEVELS, operands);
|
|
526
558
|
}
|
|
527
559
|
case "Prime":
|
|
@@ -561,13 +593,14 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
561
593
|
expression.bounds.map((bound) => bound.set),
|
|
562
594
|
getBoundNames(expression.bounds),
|
|
563
595
|
);
|
|
564
|
-
|
|
565
|
-
data.level === TEMPORAL_LEVEL
|
|
566
|
-
|
|
567
|
-
|
|
596
|
+
const actionBound =
|
|
597
|
+
data.level === TEMPORAL_LEVEL
|
|
598
|
+
? expression.bounds.find((bound) => analyze(bound.set, scope).level === ACTION_LEVEL)
|
|
599
|
+
: undefined;
|
|
600
|
+
if (actionBound) {
|
|
568
601
|
throw createLevelError(
|
|
569
602
|
"Action-level bound of quantified temporal formula",
|
|
570
|
-
|
|
603
|
+
actionBound.set,
|
|
571
604
|
);
|
|
572
605
|
}
|
|
573
606
|
return data;
|
|
@@ -817,34 +850,131 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
817
850
|
return { analyze, analyzeDefinition, toOperand };
|
|
818
851
|
};
|
|
819
852
|
|
|
820
|
-
const analyzeAssumeProve = (
|
|
853
|
+
export const analyzeAssumeProve = (
|
|
821
854
|
assumeProve: AssumeProve,
|
|
822
855
|
scope: Scope,
|
|
823
856
|
analyzer: ReturnType<typeof createLevelAnalyzer>,
|
|
824
|
-
) => {
|
|
857
|
+
): LevelData => {
|
|
825
858
|
const inner = new Map(scope);
|
|
826
|
-
assumeProve.assumptions.
|
|
859
|
+
const parts = assumeProve.assumptions.flatMap((assumption) => {
|
|
827
860
|
if (assumption.kind === "NewSymbol") {
|
|
828
|
-
|
|
861
|
+
const set = assumption.set && analyzer.analyze(assumption.set, inner);
|
|
829
862
|
inner.set(assumption.name, { kind: "Formal", arity: assumption.arity });
|
|
830
|
-
return;
|
|
863
|
+
return set ? [set] : [];
|
|
831
864
|
}
|
|
832
|
-
|
|
833
|
-
|
|
865
|
+
return [
|
|
866
|
+
assumption.kind === "AssumeProve"
|
|
867
|
+
? analyzeAssumeProve(assumption, inner, analyzer)
|
|
868
|
+
: analyzer.analyze(assumption, inner),
|
|
869
|
+
];
|
|
834
870
|
});
|
|
835
|
-
analyzer.analyze(assumeProve.conclusion, inner);
|
|
871
|
+
parts.push(analyzer.analyze(assumeProve.conclusion, inner));
|
|
872
|
+
const data = createData(Math.max(...parts.map((part) => part.level)));
|
|
873
|
+
parts.forEach((part) => {
|
|
874
|
+
part.params.forEach((param) => data.params.add(param));
|
|
875
|
+
part.constraints.forEach((value, key) => putConstraint(data.constraints, key, value));
|
|
876
|
+
part.argConstraints.forEach((value, key) => putArgConstraint(data.argConstraints, key, value));
|
|
877
|
+
part.argParams.forEach((key) => data.argParams.add(key));
|
|
878
|
+
});
|
|
879
|
+
return data;
|
|
836
880
|
};
|
|
837
881
|
|
|
838
882
|
// SANY checks the level of every definition, assumption, and theorem of a module.
|
|
839
883
|
export const checkModuleLevels = (module: Module, context: LevelContext) => {
|
|
840
884
|
const analyzer = createLevelAnalyzer(context);
|
|
841
|
-
|
|
842
|
-
.
|
|
843
|
-
|
|
844
|
-
|
|
845
|
-
|
|
846
|
-
|
|
847
|
-
|
|
848
|
-
|
|
849
|
-
|
|
885
|
+
const getLevel = (expressions: Expression[]) =>
|
|
886
|
+
Math.max(0, ...expressions.map((expression) => analyzer.analyze(expression, new Map()).level));
|
|
887
|
+
const getStepLevel = (step: ProofStep) => {
|
|
888
|
+
const body = step.body;
|
|
889
|
+
if (body.kind === "Have" || body.kind === "Case") return getLevel([body.expression]);
|
|
890
|
+
if (body.kind === "Witness") return getLevel(body.expressions);
|
|
891
|
+
if (body.kind === "Take") return getLevel(body.bounds.map((bound) => bound.set));
|
|
892
|
+
if (body.kind === "Pick") {
|
|
893
|
+
return getLevel([body.body, ...body.bounds.map((bound) => bound.set)]);
|
|
894
|
+
}
|
|
895
|
+
if (body.kind !== "Assert") return 0;
|
|
896
|
+
return body.statement.kind === "AssumeProve"
|
|
897
|
+
? analyzeAssumeProve(body.statement, new Map(), analyzer).level
|
|
898
|
+
: getLevel([body.statement]);
|
|
899
|
+
};
|
|
900
|
+
// SANY's TheoremNode.LevelCheckTemporal: the proof of a temporal goal may only assume constants.
|
|
901
|
+
const checkTemporalGoal = (proof: Proof | undefined): SanyError[] =>
|
|
902
|
+
proof?.kind !== "Steps"
|
|
903
|
+
? []
|
|
904
|
+
: proof.steps.flatMap((step) => {
|
|
905
|
+
const location = formatRange(step.statement);
|
|
906
|
+
const isConstant = () => getStepLevel(step) === 0;
|
|
907
|
+
if (
|
|
908
|
+
step.body.kind === "Have" ||
|
|
909
|
+
step.body.kind === "Take" ||
|
|
910
|
+
step.body.kind === "Witness"
|
|
911
|
+
) {
|
|
912
|
+
return isConstant()
|
|
913
|
+
? []
|
|
914
|
+
: [{ location, message: "Non-constant TAKE, WITNESS, or HAVE for temporal goal." }];
|
|
915
|
+
}
|
|
916
|
+
if (step.body.kind === "Case") {
|
|
917
|
+
return [
|
|
918
|
+
...(isConstant()
|
|
919
|
+
? []
|
|
920
|
+
: [{ location, message: "Non-constant CASE for temporal goal." }]),
|
|
921
|
+
...checkTemporalGoal(step.proof),
|
|
922
|
+
];
|
|
923
|
+
}
|
|
924
|
+
return step.body.kind === "Qed" ? checkTemporalGoal(step.proof) : [];
|
|
925
|
+
});
|
|
926
|
+
// SANY checks each step as a theorem of its own after the steps of its proof.
|
|
927
|
+
const checkProof = (proof: Proof | undefined): SanyError[] =>
|
|
928
|
+
proof?.kind !== "Steps"
|
|
929
|
+
? []
|
|
930
|
+
: proof.steps.flatMap((step) => {
|
|
931
|
+
const body = step.body;
|
|
932
|
+
const isTemporal = () => getStepLevel(step) === TEMPORAL_LEVEL;
|
|
933
|
+
const pickErrors =
|
|
934
|
+
body.kind === "Pick" && body.bounds.length > 0 && isTemporal()
|
|
935
|
+
? body.bounds
|
|
936
|
+
.filter((bound) => getLevel([bound.set]) !== 0)
|
|
937
|
+
.flatMap((bound) =>
|
|
938
|
+
bound.set.location.range
|
|
939
|
+
? [
|
|
940
|
+
{
|
|
941
|
+
location: formatRange(bound.set.location.range),
|
|
942
|
+
message: "Non-constant bound of temporal PICK.",
|
|
943
|
+
},
|
|
944
|
+
]
|
|
945
|
+
: [],
|
|
946
|
+
)
|
|
947
|
+
: [];
|
|
948
|
+
return [
|
|
949
|
+
...checkProof(step.proof),
|
|
950
|
+
...pickErrors,
|
|
951
|
+
...(step.proof?.kind === "Steps" && isTemporal() ? checkTemporalGoal(step.proof) : []),
|
|
952
|
+
];
|
|
953
|
+
});
|
|
954
|
+
collectSemanticErrors([
|
|
955
|
+
...module.definitions
|
|
956
|
+
.filter((definition) => !definition.name.includes("!"))
|
|
957
|
+
.map((definition) => ({
|
|
958
|
+
location: definition.location,
|
|
959
|
+
check: () => analyzer.analyzeDefinition(definition, new Map()),
|
|
960
|
+
})),
|
|
961
|
+
...module.assumptions.map((assumption) => ({
|
|
962
|
+
location: assumption.location,
|
|
963
|
+
check: () => analyzer.analyze(assumption.expression, new Map()),
|
|
964
|
+
})),
|
|
965
|
+
...module.theorems.map((theorem) => ({
|
|
966
|
+
location: theorem.location,
|
|
967
|
+
check: () => {
|
|
968
|
+
const data =
|
|
969
|
+
theorem.statement.kind === "AssumeProve"
|
|
970
|
+
? analyzeAssumeProve(theorem.statement, new Map(), analyzer)
|
|
971
|
+
: analyzer.analyze(theorem.statement, new Map());
|
|
972
|
+
const errors = [
|
|
973
|
+
...checkProof(theorem.proof),
|
|
974
|
+
...(data.level === TEMPORAL_LEVEL ? checkTemporalGoal(theorem.proof) : []),
|
|
975
|
+
];
|
|
976
|
+
if (errors.length > 0) throw createSanyError(errors);
|
|
977
|
+
},
|
|
978
|
+
})),
|
|
979
|
+
]);
|
|
850
980
|
};
|
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
|
|
package/src/liveness.ts
CHANGED
|
@@ -210,12 +210,16 @@ export const expandTemporal = (
|
|
|
210
210
|
if (expanding.has(definition)) {
|
|
211
211
|
throw setExitCode(new TlaEvaluationError(STACK_OVERFLOW), EXIT_STATUS.error);
|
|
212
212
|
}
|
|
213
|
-
|
|
213
|
+
const expanded = expand(
|
|
214
214
|
definition.body,
|
|
215
215
|
undefined,
|
|
216
216
|
expression.name,
|
|
217
217
|
new Set([...expanding, definition]),
|
|
218
218
|
);
|
|
219
|
+
// TLC takes the body of a state-level definition in a specification as one initial predicate.
|
|
220
|
+
return !isProperty && getDefinitionLevel(definition, environment) < ACTION_LEVEL
|
|
221
|
+
? [{ expression: definition.body, scope: undefined, name: expression.name }]
|
|
222
|
+
: expanded;
|
|
219
223
|
}
|
|
220
224
|
}
|
|
221
225
|
const context = getConstantContext(environment, scope);
|