tla-ts 0.0.3-dev.b0f84e8 → 0.0.3-dev.b4e335d
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 +150 -8
- package/dist/index.d.ts +150 -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 +57 -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 +1393 -226
- package/src/cli.ts +8 -1
- package/src/codegen.ts +68 -18
- package/src/config.ts +252 -179
- package/src/environment.ts +457 -132
- package/src/errors.ts +217 -3
- package/src/evaluate.ts +722 -112
- 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 +112 -29
- package/src/live-check.ts +220 -102
- package/src/liveness.ts +216 -52
- 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 +445 -147
- 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 +1465 -411
- 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 +3128 -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 +200 -148
- 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 +207 -103
- 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 +697 -180
package/src/lexer.ts
CHANGED
|
@@ -12,9 +12,11 @@ type TokenKind =
|
|
|
12
12
|
| "ModuleEnd"
|
|
13
13
|
| "End";
|
|
14
14
|
|
|
15
|
+
// spelling holds the text of an operator written as a synonym, such as (+) for \oplus.
|
|
15
16
|
export interface Token {
|
|
16
17
|
kind: TokenKind;
|
|
17
18
|
text: string;
|
|
19
|
+
spelling?: string;
|
|
18
20
|
line: number;
|
|
19
21
|
column: number;
|
|
20
22
|
endColumn: number;
|
|
@@ -232,38 +234,84 @@ const SYMBOL_OPERATORS = [
|
|
|
232
234
|
"?",
|
|
233
235
|
];
|
|
234
236
|
|
|
237
|
+
// The Unicode forms of the operators SANY's grammar, javacc/tla+.jj, reads, as their ASCII forms.
|
|
235
238
|
const UNICODE_OPERATORS = new Map([
|
|
239
|
+
["∃", "\\E"],
|
|
240
|
+
["∀", "\\A"],
|
|
241
|
+
["∷", "::"],
|
|
242
|
+
["≜", "=="],
|
|
243
|
+
["⟨", "<<"],
|
|
244
|
+
["⟩_", ">>_"],
|
|
245
|
+
["⟩", ">>"],
|
|
246
|
+
["→", "->"],
|
|
247
|
+
["←", "<-"],
|
|
248
|
+
["↦", "|->"],
|
|
249
|
+
["⁺", "^+"],
|
|
250
|
+
["¬", "~"],
|
|
251
|
+
["□", "[]"],
|
|
252
|
+
["◇", "<>"],
|
|
236
253
|
["∧", "/\\"],
|
|
237
254
|
["∨", "\\/"],
|
|
238
|
-
["
|
|
239
|
-
["
|
|
240
|
-
["
|
|
255
|
+
["∈", "\\in"],
|
|
256
|
+
["≈", "\\approx"],
|
|
257
|
+
["≔", ":="],
|
|
258
|
+
["≍", "\\asymp"],
|
|
259
|
+
["◯", "\\bigcirc"],
|
|
260
|
+
["⩴", "::="],
|
|
261
|
+
["●", "\\bullet"],
|
|
262
|
+
["∩", "\\cap"],
|
|
263
|
+
["⋅", "\\cdot"],
|
|
264
|
+
["∘", "\\o"],
|
|
265
|
+
["≅", "\\cong"],
|
|
266
|
+
["∪", "\\cup"],
|
|
267
|
+
["÷", "\\div"],
|
|
268
|
+
["≐", "\\doteq"],
|
|
269
|
+
["‥", ".."],
|
|
270
|
+
["…", "..."],
|
|
241
271
|
["≡", "<=>"],
|
|
272
|
+
["‼", "!!"],
|
|
273
|
+
["≥", ">="],
|
|
274
|
+
["≫", "\\gg"],
|
|
242
275
|
["⇔", "<=>"],
|
|
243
|
-
["
|
|
276
|
+
["⇒", "=>"],
|
|
277
|
+
["⫤", "=|"],
|
|
278
|
+
["↝", "~>"],
|
|
279
|
+
["≤", "<="],
|
|
280
|
+
["≪", "\\ll"],
|
|
281
|
+
["⊣", "-|"],
|
|
282
|
+
["≠", "#"],
|
|
244
283
|
["∉", "\\notin"],
|
|
245
|
-
["
|
|
284
|
+
["⊙", "\\odot"],
|
|
285
|
+
["⊖", "\\ominus"],
|
|
286
|
+
["⊕", "\\oplus"],
|
|
287
|
+
["⊘", "\\oslash"],
|
|
288
|
+
["⊗", "\\otimes"],
|
|
289
|
+
["⇸", "-+->"],
|
|
290
|
+
["≺", "\\prec"],
|
|
291
|
+
["⪯", "\\preceq"],
|
|
292
|
+
["∝", "\\propto"],
|
|
293
|
+
["⁇", "??"],
|
|
294
|
+
["⊨", "|="],
|
|
295
|
+
["⊢", "|-"],
|
|
296
|
+
["∼", "\\sim"],
|
|
297
|
+
["≃", "\\simeq"],
|
|
298
|
+
["⊓", "\\sqcap"],
|
|
299
|
+
["⊔", "\\sqcup"],
|
|
300
|
+
["⊏", "\\sqsubset"],
|
|
301
|
+
["⊑", "\\sqsubseteq"],
|
|
302
|
+
["⊐", "\\sqsupset"],
|
|
303
|
+
["⊒", "\\sqsupseteq"],
|
|
304
|
+
["⋆", "\\star"],
|
|
246
305
|
["⊂", "\\subset"],
|
|
247
|
-
["
|
|
306
|
+
["⊆", "\\subseteq"],
|
|
307
|
+
["≻", "\\succ"],
|
|
308
|
+
["⪰", "\\succeq"],
|
|
248
309
|
["⊃", "\\supset"],
|
|
249
|
-
["
|
|
250
|
-
["∩", "\\cap"],
|
|
310
|
+
["⊇", "\\supseteq"],
|
|
251
311
|
["×", "\\X"],
|
|
252
|
-
["
|
|
253
|
-
["
|
|
254
|
-
["
|
|
255
|
-
["≤", "<="],
|
|
256
|
-
["≥", ">="],
|
|
257
|
-
["↦", "|->"],
|
|
258
|
-
["→", "->"],
|
|
259
|
-
["⟨", "<<"],
|
|
260
|
-
["⟩", ">>"],
|
|
261
|
-
["□", "[]"],
|
|
262
|
-
["◇", "<>"],
|
|
263
|
-
["≜", "=="],
|
|
264
|
-
["′", "'"],
|
|
265
|
-
["∘", "\\o"],
|
|
266
|
-
["⋅", "\\cdot"],
|
|
312
|
+
["⊎", "\\uplus"],
|
|
313
|
+
["‖", "||"],
|
|
314
|
+
["≀", "\\wr"],
|
|
267
315
|
]);
|
|
268
316
|
|
|
269
317
|
const BASED_NUMBER = /^\\([bB][01]+|[oO][0-7]+|[hH][0-9a-fA-F]+)/;
|
|
@@ -301,8 +349,12 @@ export const matchOperator = (source: string, index: number): OperatorMatch | un
|
|
|
301
349
|
const operator = BACKSLASH_OPERATORS.get(word.slice(0, length.value));
|
|
302
350
|
return { text: operator ?? "\\", length: operator === undefined ? 1 : length.value + 1 };
|
|
303
351
|
}
|
|
304
|
-
const
|
|
305
|
-
|
|
352
|
+
const unicodeSymbol = [source.slice(index, index + 2), character].find((candidate) =>
|
|
353
|
+
UNICODE_OPERATORS.has(candidate),
|
|
354
|
+
);
|
|
355
|
+
if (unicodeSymbol !== undefined) {
|
|
356
|
+
return { text: UNICODE_OPERATORS.get(unicodeSymbol) ?? "", length: unicodeSymbol.length };
|
|
357
|
+
}
|
|
306
358
|
const symbol = SYMBOL_OPERATORS.find((candidate) => source.startsWith(candidate, index));
|
|
307
359
|
if (symbol) return { text: SYMBOL_ALIASES.get(symbol) ?? symbol, length: symbol.length };
|
|
308
360
|
return character === "\\" ? { text: "\\", length: 1 } : undefined;
|
|
@@ -335,6 +387,10 @@ const matchStep = (source: string, index: number) => {
|
|
|
335
387
|
);
|
|
336
388
|
};
|
|
337
389
|
|
|
390
|
+
// SANY's lexer reads @ as an identifier, which stands for the value an EXCEPT changes only alone.
|
|
391
|
+
export const readAtAsIdentifier = (token: Token): Token =>
|
|
392
|
+
token.kind === "Operator" && token.text === "@" ? { ...token, kind: "Identifier" } : token;
|
|
393
|
+
|
|
338
394
|
const TAB_SIZE = 8;
|
|
339
395
|
|
|
340
396
|
const getWidthAfter = (width: number, character: string | undefined) =>
|
|
@@ -367,9 +423,16 @@ export const tokenize = (source: string): Token[] => {
|
|
|
367
423
|
}
|
|
368
424
|
return getWidthAfter(scan.width, source[cursor.index]);
|
|
369
425
|
};
|
|
370
|
-
const pushToken = (kind: TokenKind, text: string, length: number) => {
|
|
426
|
+
const pushToken = (kind: TokenKind, text: string, length: number, spelling?: string) => {
|
|
371
427
|
const column = getColumn();
|
|
372
|
-
tokens.push({
|
|
428
|
+
tokens.push({
|
|
429
|
+
kind,
|
|
430
|
+
text,
|
|
431
|
+
spelling,
|
|
432
|
+
line: cursor.line,
|
|
433
|
+
column,
|
|
434
|
+
endColumn: column + length - 1,
|
|
435
|
+
});
|
|
373
436
|
cursor.index += length;
|
|
374
437
|
};
|
|
375
438
|
const advanceOver = (length: number) => {
|
|
@@ -442,11 +505,14 @@ export const tokenize = (source: string): Token[] => {
|
|
|
442
505
|
const characters: string[] = [];
|
|
443
506
|
advanceOver(1);
|
|
444
507
|
while (source[cursor.index] !== '"') {
|
|
445
|
-
if (cursor.index >= source.length || source[cursor.index]
|
|
508
|
+
if (cursor.index >= source.length || "\n\r".includes(source[cursor.index])) {
|
|
446
509
|
throw createError("Unterminated string");
|
|
447
510
|
}
|
|
448
511
|
if (source[cursor.index] === "\\") {
|
|
449
512
|
const escaped = source[cursor.index + 1];
|
|
513
|
+
if (escaped === undefined || !'ntrf\\"'.includes(escaped)) {
|
|
514
|
+
throw createError("Invalid escape in string");
|
|
515
|
+
}
|
|
450
516
|
characters.push({ n: "\n", t: "\t", r: "\r", f: "\f" }[escaped] ?? escaped);
|
|
451
517
|
advanceOver(2);
|
|
452
518
|
continue;
|
|
@@ -479,6 +545,12 @@ export const tokenize = (source: string): Token[] => {
|
|
|
479
545
|
pushToken(number.includes(".") ? "Decimal" : "Number", number, number.length);
|
|
480
546
|
continue;
|
|
481
547
|
}
|
|
548
|
+
// A word needs a letter to be a name, so SANY reads one without as underscores and numbers.
|
|
549
|
+
const part = /^(_|\d+)/.exec(word)?.[0];
|
|
550
|
+
if (part !== undefined && !/[A-Za-z]/.test(word)) {
|
|
551
|
+
pushToken(part === "_" ? "Operator" : "Number", part, part.length);
|
|
552
|
+
continue;
|
|
553
|
+
}
|
|
482
554
|
if (word.startsWith("WF_") || word.startsWith("SF_")) {
|
|
483
555
|
pushToken("Keyword", word.slice(0, 3), 3);
|
|
484
556
|
continue;
|
|
@@ -488,6 +560,11 @@ export const tokenize = (source: string): Token[] => {
|
|
|
488
560
|
pushToken(KEYWORDS.has(word) ? "Keyword" : "Identifier", name, word.length);
|
|
489
561
|
continue;
|
|
490
562
|
}
|
|
563
|
+
if ("ℕℤℝ".includes(character)) {
|
|
564
|
+
pushToken("Identifier", names.get(character) ?? character, 1);
|
|
565
|
+
names.set(character, character);
|
|
566
|
+
continue;
|
|
567
|
+
}
|
|
491
568
|
const stepLength = matchStep(source, cursor.index);
|
|
492
569
|
if (stepLength > 0) {
|
|
493
570
|
pushToken("Step", source.slice(cursor.index, cursor.index + stepLength), stepLength);
|
|
@@ -495,7 +572,13 @@ export const tokenize = (source: string): Token[] => {
|
|
|
495
572
|
}
|
|
496
573
|
const operator = matchOperator(source, cursor.index);
|
|
497
574
|
if (operator) {
|
|
498
|
-
|
|
575
|
+
const spelling = source.slice(cursor.index, cursor.index + operator.length);
|
|
576
|
+
pushToken(
|
|
577
|
+
"Operator",
|
|
578
|
+
operator.text,
|
|
579
|
+
operator.length,
|
|
580
|
+
spelling === operator.text ? undefined : spelling,
|
|
581
|
+
);
|
|
499
582
|
continue;
|
|
500
583
|
}
|
|
501
584
|
throw createError(`Unexpected character ${JSON.stringify(character)}`);
|