tla-ts 0.0.3-dev.037ac3b → 0.0.3-dev.19a7038
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 +45 -22
- package/dist/index.d.ts +45 -22
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/parallel.cjs +1 -1
- package/dist/parallel.js +1 -1
- package/dist/run-cli.cjs +5 -3
- package/dist/run-cli.js +20 -18
- package/dist/transfer.cjs +30 -21
- package/dist/transfer.js +30 -21
- package/package.json +1 -1
- package/src/ast.ts +3 -0
- package/src/builtins.ts +9 -3
- package/src/check.ts +309 -61
- package/src/codegen.ts +6 -3
- package/src/config.ts +224 -170
- package/src/environment.ts +52 -19
- package/src/errors.ts +78 -1
- package/src/evaluate.ts +172 -19
- package/src/exit-codes.ts +22 -3
- package/src/fingerprints.ts +2 -1
- package/src/instances.ts +1 -1
- package/src/levels.ts +55 -27
- package/src/live-check.ts +129 -49
- package/src/liveness.ts +68 -10
- package/src/parallel-worker.ts +2 -2
- package/src/parallel.ts +2 -2
- package/src/parser.ts +21 -10
- package/src/resolve.ts +106 -29
- package/src/run-cli.ts +56 -9
- package/src/spec-description.ts +1 -2
- package/src/standard-modules.ts +52 -38
- package/src/successors.ts +111 -31
- package/src/symmetry.ts +16 -6
- package/src/tableau.ts +1 -1
- package/src/tlc-module.ts +6 -6
- package/src/tlc-modules.ts +4 -0
- package/src/tlc-order.ts +8 -4
- package/src/value-sources.ts +29 -0
- package/src/values.ts +184 -51
package/src/config.ts
CHANGED
|
@@ -74,27 +74,96 @@ const KEYWORDS = new Set([
|
|
|
74
74
|
|
|
75
75
|
const SYMBOLS = ["<-", "<<", ">>", "=", "{", "}", ",", "[", "]", "(", ")"];
|
|
76
76
|
|
|
77
|
+
const SINGLE_KEYWORDS = {
|
|
78
|
+
INIT: "init",
|
|
79
|
+
NEXT: "next",
|
|
80
|
+
SPECIFICATION: "specification",
|
|
81
|
+
VIEW: "view",
|
|
82
|
+
SYMMETRY: "symmetry",
|
|
83
|
+
ALIAS: "alias",
|
|
84
|
+
_PERIODIC: "periodic",
|
|
85
|
+
_RL_REWARD: "rlReward",
|
|
86
|
+
} as const;
|
|
87
|
+
|
|
88
|
+
const LIST_KEYWORDS = {
|
|
89
|
+
INVARIANT: "invariants",
|
|
90
|
+
INVARIANTS: "invariants",
|
|
91
|
+
PROPERTY: "properties",
|
|
92
|
+
PROPERTIES: "properties",
|
|
93
|
+
CONSTRAINT: "constraints",
|
|
94
|
+
CONSTRAINTS: "constraints",
|
|
95
|
+
ACTION_CONSTRAINT: "actionConstraints",
|
|
96
|
+
ACTION_CONSTRAINTS: "actionConstraints",
|
|
97
|
+
POSTCONDITION: "postconditions",
|
|
98
|
+
POSTCONDITIONS: "postconditions",
|
|
99
|
+
_POSSIBLE: "possible",
|
|
100
|
+
} as const;
|
|
101
|
+
|
|
102
|
+
const isSingleKeyword = (text: string): text is keyof typeof SINGLE_KEYWORDS =>
|
|
103
|
+
Object.hasOwn(SINGLE_KEYWORDS, text);
|
|
104
|
+
|
|
105
|
+
const isListKeyword = (text: string): text is keyof typeof LIST_KEYWORDS =>
|
|
106
|
+
Object.hasOwn(LIST_KEYWORDS, text);
|
|
107
|
+
|
|
108
|
+
// JavaCC's TokenMgrError.addEscapes, which TLC's lexical errors use.
|
|
109
|
+
const escapeLexeme = (text: string) =>
|
|
110
|
+
[...text]
|
|
111
|
+
.map((character) => {
|
|
112
|
+
const escaped = { "\b": "\\b", "\t": "\\t", "\n": "\\n", "\f": "\\f", "\r": "\\r" }[
|
|
113
|
+
character
|
|
114
|
+
];
|
|
115
|
+
if (escaped) return escaped;
|
|
116
|
+
if (character === '"' || character === "'" || character === "\\") return `\\${character}`;
|
|
117
|
+
const code = character.codePointAt(0) ?? 0;
|
|
118
|
+
return code < 0x20 || code > 0x7e ? `\\u${code.toString(16).padStart(4, "0")}` : character;
|
|
119
|
+
})
|
|
120
|
+
.join("");
|
|
121
|
+
|
|
122
|
+
// TLC reads a configuration with SANY's lexer, which reports a character it cannot read as a
|
|
123
|
+
// JavaCC lexical error.
|
|
124
|
+
const createLexicalError = (line: number, column: number, found: string | undefined, after = "") =>
|
|
125
|
+
new TlaConfigError(
|
|
126
|
+
`TLC found an error in the configuration file:\nLexical error at line ${line}, column ${column}. Encountered: ${found === undefined ? "<EOF> " : `"${escapeLexeme(found)}" (${found.codePointAt(0)}), `}after : "${escapeLexeme(after)}"`,
|
|
127
|
+
);
|
|
128
|
+
|
|
129
|
+
const createConfigFileError = (line: number, detail: string) =>
|
|
130
|
+
new TlaConfigError(`TLC found an error in the configuration file at line ${line}\n${detail}`);
|
|
131
|
+
|
|
77
132
|
const tokenizeConfig = (source: string) => {
|
|
133
|
+
// TLC appends a newline so that a trailing \* comment ends.
|
|
134
|
+
const text = `${source}\n`;
|
|
78
135
|
const tokens: ConfigToken[] = [];
|
|
79
|
-
const cursor = { index: 0, line: 1 };
|
|
80
|
-
|
|
81
|
-
|
|
136
|
+
const cursor = { index: 0, line: 1, lineStart: 0 };
|
|
137
|
+
// Moves past text, keeping the line and where it starts.
|
|
138
|
+
const skip = (length: number) => {
|
|
139
|
+
const skipped = text.slice(cursor.index, cursor.index + length);
|
|
140
|
+
const lastBreak = skipped.lastIndexOf("\n");
|
|
141
|
+
if (lastBreak !== -1) {
|
|
142
|
+
cursor.line += skipped.split("\n").length - 1;
|
|
143
|
+
cursor.lineStart = cursor.index + lastBreak + 1;
|
|
144
|
+
}
|
|
145
|
+
cursor.index += length;
|
|
146
|
+
};
|
|
147
|
+
const getEndOfInputError = (after: string) =>
|
|
148
|
+
createLexicalError(cursor.line + 1, 0, undefined, after);
|
|
149
|
+
while (cursor.index < text.length) {
|
|
150
|
+
const rest = text.slice(cursor.index);
|
|
82
151
|
const whitespace = /^\s+/.exec(rest)?.[0];
|
|
83
152
|
if (whitespace) {
|
|
84
|
-
|
|
85
|
-
cursor.index += whitespace.length;
|
|
153
|
+
skip(whitespace.length);
|
|
86
154
|
continue;
|
|
87
155
|
}
|
|
88
156
|
if (rest.startsWith("\\*")) {
|
|
89
|
-
|
|
90
|
-
cursor.index += lineEnd === -1 ? rest.length : lineEnd;
|
|
157
|
+
cursor.index += rest.indexOf("\n");
|
|
91
158
|
continue;
|
|
92
159
|
}
|
|
93
160
|
if (rest.startsWith("(*")) {
|
|
94
161
|
const end = rest.indexOf("*)");
|
|
95
|
-
if (end === -1)
|
|
96
|
-
|
|
97
|
-
|
|
162
|
+
if (end === -1) {
|
|
163
|
+
cursor.line += rest.split("\n").length - 2;
|
|
164
|
+
throw getEndOfInputError("");
|
|
165
|
+
}
|
|
166
|
+
skip(end + 2);
|
|
98
167
|
continue;
|
|
99
168
|
}
|
|
100
169
|
const number = /^\d+(?![A-Za-z_])/.exec(rest)?.[0];
|
|
@@ -109,8 +178,18 @@ const tokenizeConfig = (source: string) => {
|
|
|
109
178
|
cursor.index += word.length;
|
|
110
179
|
continue;
|
|
111
180
|
}
|
|
112
|
-
|
|
113
|
-
|
|
181
|
+
if (rest.startsWith('"')) {
|
|
182
|
+
const string = /^"((?:[^"\\\n]|\\.)*)"/.exec(rest);
|
|
183
|
+
if (!string) {
|
|
184
|
+
const lineEnd = rest.indexOf("\n");
|
|
185
|
+
if (lineEnd === rest.length - 1) throw getEndOfInputError(rest);
|
|
186
|
+
throw createLexicalError(
|
|
187
|
+
cursor.line,
|
|
188
|
+
cursor.index + lineEnd - cursor.lineStart + 1,
|
|
189
|
+
"\n",
|
|
190
|
+
rest.slice(0, lineEnd),
|
|
191
|
+
);
|
|
192
|
+
}
|
|
114
193
|
tokens.push({ kind: "String", text: string[1], line: cursor.line });
|
|
115
194
|
cursor.index += string[0].length;
|
|
116
195
|
continue;
|
|
@@ -121,18 +200,18 @@ const tokenizeConfig = (source: string) => {
|
|
|
121
200
|
cursor.index += symbol.length;
|
|
122
201
|
continue;
|
|
123
202
|
}
|
|
124
|
-
const operator = matchOperator(
|
|
125
|
-
if (!operator)
|
|
126
|
-
throw
|
|
127
|
-
|
|
128
|
-
);
|
|
203
|
+
const operator = matchOperator(text, cursor.index);
|
|
204
|
+
if (!operator) {
|
|
205
|
+
throw createLexicalError(cursor.line, cursor.index - cursor.lineStart + 1, rest[0]);
|
|
206
|
+
}
|
|
129
207
|
tokens.push({ kind: "Word", text: operator.text, line: cursor.line });
|
|
130
208
|
cursor.index += operator.length;
|
|
131
209
|
}
|
|
132
|
-
tokens.push({ kind: "End", text: "", line: cursor.line });
|
|
210
|
+
tokens.push({ kind: "End", text: "", line: cursor.line - 1 });
|
|
133
211
|
return tokens;
|
|
134
212
|
};
|
|
135
213
|
|
|
214
|
+
// TLC's ModelConfig.parse, which takes any token for a name and stops a list at the next keyword.
|
|
136
215
|
export const parseConfig = (source: string): ModelConfig => {
|
|
137
216
|
const tokens = tokenizeConfig(source);
|
|
138
217
|
const cursor = { index: 0 };
|
|
@@ -155,183 +234,158 @@ export const parseConfig = (source: string): ModelConfig => {
|
|
|
155
234
|
periodic: undefined,
|
|
156
235
|
rlReward: undefined,
|
|
157
236
|
};
|
|
158
|
-
|
|
159
237
|
const deadlock = { isSet: false };
|
|
160
|
-
const
|
|
161
|
-
const advance = () => tokens[cursor.index++];
|
|
238
|
+
const advance = () => tokens[Math.min(cursor.index++, tokens.length - 1)];
|
|
162
239
|
const isKeyword = (token: ConfigToken) => token.kind === "Word" && KEYWORDS.has(token.text);
|
|
163
|
-
const expect = (text: string) => {
|
|
164
|
-
const token = advance();
|
|
165
|
-
if (token.text !== text) {
|
|
166
|
-
throw new TlaConfigError(
|
|
167
|
-
`Expected ${JSON.stringify(text)} but found ${JSON.stringify(token.text)} at line ${token.line}`,
|
|
168
|
-
);
|
|
169
|
-
}
|
|
170
|
-
};
|
|
171
|
-
const expectName = () => {
|
|
172
|
-
const token = advance();
|
|
173
|
-
if (token.kind !== "Word" || isKeyword(token)) {
|
|
174
|
-
throw new TlaConfigError(
|
|
175
|
-
`Expected a name but found ${JSON.stringify(token.text)} at line ${token.line}`,
|
|
176
|
-
);
|
|
177
|
-
}
|
|
178
|
-
return token.text;
|
|
179
|
-
};
|
|
180
|
-
const isNameAhead = () => peek().kind === "Word" && !isKeyword(peek());
|
|
181
|
-
const parseNames = () => {
|
|
182
|
-
const names: string[] = [];
|
|
183
|
-
while (isNameAhead()) names.push(advance().text);
|
|
184
|
-
return names;
|
|
185
|
-
};
|
|
186
|
-
const setSingle = (
|
|
187
|
-
key:
|
|
188
|
-
| "init"
|
|
189
|
-
| "next"
|
|
190
|
-
| "specification"
|
|
191
|
-
| "symmetry"
|
|
192
|
-
| "view"
|
|
193
|
-
| "alias"
|
|
194
|
-
| "periodic"
|
|
195
|
-
| "rlReward",
|
|
196
|
-
keyword: string,
|
|
197
|
-
) => {
|
|
198
|
-
if (config[key] !== undefined) throw new TlaConfigError(`The keyword ${keyword} appears twice`);
|
|
199
|
-
config[key] = expectName();
|
|
200
|
-
};
|
|
201
240
|
|
|
202
|
-
const parseValue = (): ConfigValue => {
|
|
203
|
-
|
|
204
|
-
if (
|
|
205
|
-
if (
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
if (
|
|
241
|
+
const parseValue = (first: ConfigToken): ConfigValue => {
|
|
242
|
+
if (first.kind === "Number") return { kind: "Number", value: Number(first.text) };
|
|
243
|
+
if (first.kind === "String") return { kind: "String", value: first.text };
|
|
244
|
+
if (first.text === "TRUE" || first.text === "FALSE") {
|
|
245
|
+
return { kind: "Boolean", value: first.text === "TRUE" };
|
|
246
|
+
}
|
|
247
|
+
if (first.text === "{") {
|
|
209
248
|
const elements: ConfigValue[] = [];
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
249
|
+
let token = advance();
|
|
250
|
+
if (token.text !== "}") {
|
|
251
|
+
for (;;) {
|
|
252
|
+
elements.push(parseValue(token));
|
|
253
|
+
token = advance();
|
|
254
|
+
if (token.text !== ",") break;
|
|
255
|
+
token = advance();
|
|
256
|
+
}
|
|
214
257
|
}
|
|
215
|
-
|
|
258
|
+
if (token.text !== "}")
|
|
259
|
+
throw createConfigFileError(token.line, "It was expecting }, but did not find it.");
|
|
216
260
|
return { kind: "Set", elements };
|
|
217
261
|
}
|
|
218
|
-
if (
|
|
219
|
-
throw
|
|
220
|
-
`Expected a value but found ${JSON.stringify(token.text)} at line ${token.line}`,
|
|
221
|
-
);
|
|
262
|
+
if (first.kind !== "End") return { kind: "ModelValue", name: first.text };
|
|
263
|
+
throw createConfigFileError(first.line, "It was expecting a value, but did not find it.");
|
|
222
264
|
};
|
|
223
265
|
|
|
224
|
-
const parseModuleScope = () => {
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
266
|
+
const parseModuleScope = (operator: string) => {
|
|
267
|
+
const name = advance();
|
|
268
|
+
if (name.kind === "End") {
|
|
269
|
+
throw createConfigFileError(name.line, `Expected an identifier after ${operator}[.`);
|
|
270
|
+
}
|
|
271
|
+
const close = advance();
|
|
272
|
+
if (close.text !== "]") {
|
|
273
|
+
throw createConfigFileError(close.line, "It was expecting ], but did not find it.");
|
|
274
|
+
}
|
|
275
|
+
return name.text;
|
|
230
276
|
};
|
|
231
277
|
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
278
|
+
// Returns the token after the constants, which starts the next section.
|
|
279
|
+
const parseConstants = (line: number) => {
|
|
280
|
+
for (;;) {
|
|
281
|
+
const first = advance();
|
|
282
|
+
if (first.kind === "End" || isKeyword(first)) return first;
|
|
283
|
+
const name = { text: first.text };
|
|
284
|
+
let token = advance();
|
|
285
|
+
while (token.text === "!") {
|
|
286
|
+
name.text = `${name.text}!${advance().text}`;
|
|
287
|
+
token = advance();
|
|
288
|
+
}
|
|
289
|
+
if (token.text === "<-") {
|
|
290
|
+
token = advance();
|
|
291
|
+
if (token.text === "[") {
|
|
292
|
+
const module = parseModuleScope("<-");
|
|
293
|
+
const target = advance();
|
|
294
|
+
if (target.kind === "End") {
|
|
295
|
+
throw createConfigFileError(target.line, "Expected an identifier after <-[mod].");
|
|
296
|
+
}
|
|
297
|
+
config.substitutions.push({ name: name.text, target: target.text, module });
|
|
298
|
+
continue;
|
|
299
|
+
}
|
|
300
|
+
if (token.kind === "End") {
|
|
301
|
+
throw createConfigFileError(token.line, "Expected an identifier after <-.");
|
|
241
302
|
}
|
|
242
|
-
|
|
243
|
-
expect("=");
|
|
244
|
-
const module = parseModuleScope();
|
|
245
|
-
config.constants.push({ name, value: parseValue(), args, ...(module && { module }) });
|
|
303
|
+
config.substitutions.push({ name: name.text, target: token.text });
|
|
246
304
|
continue;
|
|
247
305
|
}
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
306
|
+
const args: ConfigValue[] = [];
|
|
307
|
+
if (token.text === "(") {
|
|
308
|
+
for (;;) {
|
|
309
|
+
args.push(parseValue(advance()));
|
|
310
|
+
token = advance();
|
|
311
|
+
if (token.text !== ",") break;
|
|
312
|
+
}
|
|
313
|
+
if (token.text !== ")") throw createConfigFileError(line, "");
|
|
314
|
+
token = advance();
|
|
253
315
|
}
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
316
|
+
if (token.text !== "=") {
|
|
317
|
+
throw createConfigFileError(token.line, "It was expecting = or <-, but did not find it.");
|
|
318
|
+
}
|
|
319
|
+
token = advance();
|
|
320
|
+
const module = token.text === "[" ? parseModuleScope("=") : undefined;
|
|
321
|
+
const value = parseValue(module === undefined ? token : advance());
|
|
322
|
+
config.constants.push({
|
|
323
|
+
name: name.text,
|
|
324
|
+
value,
|
|
325
|
+
...(args.length > 0 && { args }),
|
|
326
|
+
...(module && { module }),
|
|
327
|
+
});
|
|
257
328
|
}
|
|
258
329
|
};
|
|
259
330
|
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
case "ACTION_CONSTRAINT":
|
|
295
|
-
case "ACTION_CONSTRAINTS":
|
|
296
|
-
config.actionConstraints.push(...parseNames());
|
|
297
|
-
break;
|
|
298
|
-
case "ALIAS":
|
|
299
|
-
setSingle("alias", token.text);
|
|
300
|
-
break;
|
|
301
|
-
case "POSTCONDITION":
|
|
302
|
-
case "POSTCONDITIONS":
|
|
303
|
-
config.postconditions.push(...parseNames());
|
|
304
|
-
break;
|
|
305
|
-
case "_POSSIBLE":
|
|
306
|
-
config.possible.push(...parseNames());
|
|
307
|
-
break;
|
|
308
|
-
case "_PERIODIC":
|
|
309
|
-
setSingle("periodic", token.text);
|
|
310
|
-
break;
|
|
311
|
-
case "_RL_REWARD":
|
|
312
|
-
setSingle("rlReward", token.text);
|
|
313
|
-
break;
|
|
314
|
-
case "CHECK_DEADLOCK": {
|
|
315
|
-
if (deadlock.isSet) throw new TlaConfigError("The keyword CHECK_DEADLOCK appears twice");
|
|
316
|
-
deadlock.isSet = true;
|
|
317
|
-
const value = advance().text;
|
|
318
|
-
if (value !== "TRUE" && value !== "FALSE") {
|
|
319
|
-
throw new TlaConfigError(
|
|
320
|
-
`CHECK_DEADLOCK expects TRUE or FALSE but found ${JSON.stringify(value)}`,
|
|
321
|
-
);
|
|
322
|
-
}
|
|
323
|
-
config.checkDeadlock = value === "TRUE";
|
|
324
|
-
break;
|
|
331
|
+
let token = advance();
|
|
332
|
+
while (token.kind !== "End") {
|
|
333
|
+
const keyword = token.text;
|
|
334
|
+
const line = token.line;
|
|
335
|
+
if (isSingleKeyword(keyword)) {
|
|
336
|
+
const name = advance();
|
|
337
|
+
if (name.kind === "End") {
|
|
338
|
+
throw createConfigFileError(
|
|
339
|
+
line,
|
|
340
|
+
`The keyword ${keyword} was not followed by an identifier.`,
|
|
341
|
+
);
|
|
342
|
+
}
|
|
343
|
+
const key = SINGLE_KEYWORDS[keyword];
|
|
344
|
+
if (config[key] !== undefined) {
|
|
345
|
+
throw createConfigFileError(line, `The keyword ${keyword} appeared twice.`);
|
|
346
|
+
}
|
|
347
|
+
config[key] = name.text;
|
|
348
|
+
token = advance();
|
|
349
|
+
} else if (isListKeyword(keyword)) {
|
|
350
|
+
const names = config[LIST_KEYWORDS[keyword]];
|
|
351
|
+
token = advance();
|
|
352
|
+
while (token.kind !== "End" && !isKeyword(token)) {
|
|
353
|
+
names.push(token.text);
|
|
354
|
+
token = advance();
|
|
355
|
+
}
|
|
356
|
+
} else if (keyword === "CONSTANT" || keyword === "CONSTANTS") {
|
|
357
|
+
token = parseConstants(line);
|
|
358
|
+
} else if (keyword === "CHECK_DEADLOCK") {
|
|
359
|
+
const value = advance();
|
|
360
|
+
if (value.kind === "End") {
|
|
361
|
+
throw createConfigFileError(
|
|
362
|
+
line,
|
|
363
|
+
"The keyword CHECK_DEADLOCK was not followed by an identifier.",
|
|
364
|
+
);
|
|
325
365
|
}
|
|
326
|
-
|
|
327
|
-
throw
|
|
366
|
+
if (value.text !== "TRUE" && value.text !== "FALSE") {
|
|
367
|
+
throw createConfigFileError(
|
|
368
|
+
value.line,
|
|
369
|
+
"It was expecting TRUE or FALSE, but did not find it.",
|
|
370
|
+
);
|
|
371
|
+
}
|
|
372
|
+
if (deadlock.isSet) {
|
|
373
|
+
throw createConfigFileError(line, "The keyword CHECK_DEADLOCK appeared twice.");
|
|
374
|
+
}
|
|
375
|
+
deadlock.isSet = true;
|
|
376
|
+
config.checkDeadlock = value.text === "TRUE";
|
|
377
|
+
token = advance();
|
|
378
|
+
} else {
|
|
379
|
+
throw createConfigFileError(line, "It was expecting a keyword, but did not find it.");
|
|
328
380
|
}
|
|
329
381
|
}
|
|
330
382
|
if (
|
|
331
383
|
config.specification !== undefined &&
|
|
332
384
|
(config.init !== undefined || config.next !== undefined)
|
|
333
385
|
) {
|
|
334
|
-
throw new TlaConfigError(
|
|
386
|
+
throw new TlaConfigError(
|
|
387
|
+
"The configuration file cannot specify both INIT/NEXT and SPECIFICATION fields.",
|
|
388
|
+
);
|
|
335
389
|
}
|
|
336
390
|
return config;
|
|
337
391
|
};
|
package/src/environment.ts
CHANGED
|
@@ -12,7 +12,13 @@ import {
|
|
|
12
12
|
import { BUNDLED_MODULES } from "./bundled-modules";
|
|
13
13
|
import type { ConfigValue, ModelConfig } from "./config";
|
|
14
14
|
import type { FileSystem } from "./json";
|
|
15
|
-
import {
|
|
15
|
+
import {
|
|
16
|
+
createSanyError,
|
|
17
|
+
TlaConfigError,
|
|
18
|
+
TlaEvaluationError,
|
|
19
|
+
TlaModuleError,
|
|
20
|
+
TlaSyntaxError,
|
|
21
|
+
} from "./errors";
|
|
16
22
|
import { EXIT_STATUS, setExitCode } from "./exit-codes";
|
|
17
23
|
import {
|
|
18
24
|
createBigNumberError,
|
|
@@ -47,6 +53,7 @@ import { CORE_OPERATORS, getStandardModule, STANDARD_DEPENDENCIES } from "./stan
|
|
|
47
53
|
import { resolveInstanceSubexpressions, resolveModuleSubexpressions } from "./subexpressions";
|
|
48
54
|
import { checkModuleLevels, createLevelAnalyzer } from "./levels";
|
|
49
55
|
import { checkInstances, type InstanceCheck } from "./substitution-levels";
|
|
56
|
+
import { getTlcDeclarationOrder } from "./tlc-order";
|
|
50
57
|
import {
|
|
51
58
|
checkInteger,
|
|
52
59
|
createModelValue,
|
|
@@ -259,7 +266,11 @@ export const createEnvironment = (
|
|
|
259
266
|
|
|
260
267
|
const getStandardSymbols = (name: string) => {
|
|
261
268
|
const symbols = addStandardModule(name);
|
|
262
|
-
|
|
269
|
+
const dependencies = STANDARD_DEPENDENCIES.get(name) ?? [];
|
|
270
|
+
if (symbols) useModule(name, dependencies);
|
|
271
|
+
// TLC loads the Java class of each module a standard module uses, so one that uses Integers
|
|
272
|
+
// overrides the arithmetic of Naturals.
|
|
273
|
+
if (symbols && dependencies.includes("Integers")) addStandardModule("Integers");
|
|
263
274
|
return symbols;
|
|
264
275
|
};
|
|
265
276
|
|
|
@@ -288,13 +299,25 @@ export const createEnvironment = (
|
|
|
288
299
|
BUNDLED_MODULES.get(name) ??
|
|
289
300
|
extractModule(options.source, name);
|
|
290
301
|
if (source === undefined)
|
|
291
|
-
throw
|
|
292
|
-
|
|
302
|
+
throw createSanyError(
|
|
303
|
+
[
|
|
304
|
+
{
|
|
305
|
+
location: `In module ${importer}`,
|
|
306
|
+
message: `Cannot find source file for module ${name} imported in module ${importer}.`,
|
|
307
|
+
},
|
|
308
|
+
],
|
|
309
|
+
true,
|
|
293
310
|
);
|
|
294
311
|
const module = parseModule(source);
|
|
295
312
|
if (module.name !== name) {
|
|
296
|
-
throw
|
|
297
|
-
|
|
313
|
+
throw createSanyError(
|
|
314
|
+
[
|
|
315
|
+
{
|
|
316
|
+
location: "Unknown location",
|
|
317
|
+
message: `File name '${name}' does not match the name '${module.name}' of the top level module it contains.`,
|
|
318
|
+
},
|
|
319
|
+
],
|
|
320
|
+
true,
|
|
298
321
|
);
|
|
299
322
|
}
|
|
300
323
|
return rejectModuleLiterals(module);
|
|
@@ -908,11 +931,19 @@ export const createEnvironment = (
|
|
|
908
931
|
if (symbol.key === key && name !== key) definitions.set(name, alias);
|
|
909
932
|
});
|
|
910
933
|
});
|
|
911
|
-
declaredConstants.
|
|
912
|
-
|
|
913
|
-
|
|
914
|
-
|
|
915
|
-
|
|
934
|
+
const unassigned = declaredConstants.filter(
|
|
935
|
+
(name) => !constants.has(name) && !substitutions.has(name) && !operatorKeys.has(name),
|
|
936
|
+
);
|
|
937
|
+
if (unassigned.length > 0) {
|
|
938
|
+
// TLC reports the first constant it finds unassigned in SANY's order of declarations.
|
|
939
|
+
const name =
|
|
940
|
+
getTlcDeclarationOrder(options.source, options.loadModule, "constant").find((constant) =>
|
|
941
|
+
unassigned.includes(constant),
|
|
942
|
+
) ?? unassigned[0];
|
|
943
|
+
throw new TlaConfigError(
|
|
944
|
+
`The constant parameter ${name} is not assigned a value by the configuration file.`,
|
|
945
|
+
);
|
|
946
|
+
}
|
|
916
947
|
|
|
917
948
|
const environment: Environment = {
|
|
918
949
|
runtime,
|
|
@@ -954,26 +985,28 @@ export const createEnvironment = (
|
|
|
954
985
|
]),
|
|
955
986
|
getDefinition: (name) => getDefinition(name, environment),
|
|
956
987
|
});
|
|
957
|
-
const
|
|
988
|
+
const getEvaluationError = (body: Expression) => {
|
|
958
989
|
try {
|
|
959
990
|
evaluate(body, { environment, scope: undefined, state: undefined, next: undefined });
|
|
960
|
-
return
|
|
991
|
+
return undefined;
|
|
961
992
|
} catch (error) {
|
|
962
|
-
if (error instanceof TlaEvaluationError) return
|
|
993
|
+
if (error instanceof TlaEvaluationError) return error;
|
|
963
994
|
throw error;
|
|
964
995
|
}
|
|
965
996
|
};
|
|
966
997
|
substitutions.forEach((target, name) => {
|
|
967
998
|
const definition = definitions.get(target);
|
|
968
|
-
|
|
999
|
+
const error =
|
|
969
1000
|
declaredConstants.includes(name) &&
|
|
970
1001
|
definition?.kind === "Operator" &&
|
|
971
1002
|
definition.params.length === 0 &&
|
|
972
|
-
analyzer.analyzeDefinition(definition, new Map()).level > 0
|
|
973
|
-
|
|
974
|
-
|
|
1003
|
+
analyzer.analyzeDefinition(definition, new Map()).level > 0
|
|
1004
|
+
? getEvaluationError(definition.body)
|
|
1005
|
+
: undefined;
|
|
1006
|
+
// TLC adds the reason unless a standard module's Java code failed.
|
|
1007
|
+
if (error) {
|
|
975
1008
|
throw new TlaConfigError(
|
|
976
|
-
`The configuration file substitutes constant ${name} with non-constant ${target}`,
|
|
1009
|
+
`The configuration file substitutes constant ${name} with non-constant ${target}${error instanceof TlaModuleError ? "" : ` - specifically: ${error.message}`}`,
|
|
977
1010
|
);
|
|
978
1011
|
}
|
|
979
1012
|
});
|