tla-ts 0.0.10-dev.b4a856304 → 0.0.10-dev.f16792fed
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 +34 -0
- package/dist/index.d.ts +34 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +48 -48
- package/dist/prove.js +29 -29
- package/dist/run.cjs +40 -40
- package/dist/run.js +31 -31
- package/dist/transfer.cjs +36 -36
- package/dist/transfer.js +40 -40
- package/package.json +1 -1
- package/src/ast.ts +0 -5
- package/src/bags.ts +2 -5
- package/src/builtins.ts +1 -8
- package/src/check.ts +128 -193
- package/src/cli/options.ts +1 -1
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +8 -7
- package/src/cli/shared.ts +0 -4
- package/src/cli/tlc-arguments.ts +24 -30
- package/src/cli/tlc-usage.ts +2 -3
- package/src/coverage.ts +3 -8
- package/src/evaluate.ts +26 -102
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -9
- package/src/json-reader.ts +1 -2
- package/src/json.ts +4 -11
- package/src/levels.ts +7 -15
- package/src/lexer.ts +72 -83
- package/src/liveness-checker.ts +77 -106
- package/src/liveness.ts +10 -34
- package/src/parallel.ts +26 -33
- package/src/parser.ts +163 -226
- package/src/pcal/ast.ts +53 -65
- package/src/pcal/parse.ts +144 -191
- package/src/pcal/tokenize.ts +91 -115
- package/src/pcal/translate.ts +83 -98
- package/src/pcal/validate.ts +48 -50
- package/src/pretty-print.ts +6 -6
- package/src/randomization.ts +1 -4
- package/src/resolve.ts +12 -70
- package/src/runtime.ts +11 -18
- package/src/sany/builtins.ts +1 -3
- package/src/sany/generator.ts +74 -127
- package/src/sany/levels.ts +5 -9
- package/src/sany/lexer.ts +40 -44
- package/src/sany/linter.ts +0 -1
- package/src/sany/nodes.ts +4 -10
- package/src/search.ts +1 -1
- package/src/simulate.ts +50 -59
- package/src/spec-description.ts +23 -34
- package/src/standard-definitions.ts +0 -3
- package/src/standard-modules.ts +1 -12
- package/src/state-graph.ts +3 -15
- package/src/subexpressions.ts +38 -47
- package/src/successors.ts +14 -35
- package/src/symmetry.ts +4 -19
- package/src/tlc/fingerprint.ts +15 -21
- package/src/tlc/jar-data.ts +0 -1
- package/src/tlc/messages.ts +2 -21
- package/src/tlc/order.ts +22 -47
- package/src/tlc/random.ts +18 -30
- package/src/tlc/replay.ts +13 -33
- package/src/tlc/summary.ts +36 -45
- package/src/tlc/tlc-operators.ts +4 -14
- package/src/tlc/tlcext-operators.ts +11 -15
- package/src/tlc/trace-spec.ts +4 -9
- package/src/tlc/value-stream.ts +9 -13
- package/src/tlc/version.ts +0 -1
- package/src/values.ts +74 -186
package/src/pcal/ast.ts
CHANGED
|
@@ -9,8 +9,6 @@ export interface PcalToken {
|
|
|
9
9
|
type: number;
|
|
10
10
|
}
|
|
11
11
|
|
|
12
|
-
// For each line, the token of an earlier line it is aligned under, with that token's column when
|
|
13
|
-
// the expression was normalized.
|
|
14
12
|
export interface PcalExpr {
|
|
15
13
|
tokens: PcalToken[][];
|
|
16
14
|
anchorTokens: (PcalToken | undefined)[] | undefined;
|
|
@@ -22,8 +20,6 @@ interface PcalCoord {
|
|
|
22
20
|
item: number;
|
|
23
21
|
}
|
|
24
22
|
|
|
25
|
-
// The Java keeps these in static fields that SANY never resets, so options one module sets carry
|
|
26
|
-
// over to the modules SANY validates after it.
|
|
27
23
|
export interface PcalParams {
|
|
28
24
|
labelFlag: boolean;
|
|
29
25
|
labelRoot: string;
|
|
@@ -46,20 +42,21 @@ export const createPcalParams = (): PcalParams => ({
|
|
|
46
42
|
inputVersionNumber: PCAL_VERSION_WEIGHT,
|
|
47
43
|
});
|
|
48
44
|
|
|
49
|
-
// "1.5" is 1500, and -1 means a malformed version.
|
|
50
45
|
export const getPcalVersionNumber = (text: string) => {
|
|
51
|
-
|
|
46
|
+
let result = 0;
|
|
47
|
+
let digitsAfterDecimal = 0;
|
|
48
|
+
let isAfterDecimal = false;
|
|
52
49
|
for (const char of text) {
|
|
53
50
|
if (char === ".") {
|
|
54
|
-
|
|
51
|
+
isAfterDecimal = true;
|
|
55
52
|
continue;
|
|
56
53
|
}
|
|
57
54
|
if (char < "0" || char > "9") return -1;
|
|
58
|
-
|
|
59
|
-
if (
|
|
60
|
-
if (
|
|
55
|
+
result = 10 * result + Number(char);
|
|
56
|
+
if (isAfterDecimal) digitsAfterDecimal += 1;
|
|
57
|
+
if (digitsAfterDecimal > 3) return -1;
|
|
61
58
|
}
|
|
62
|
-
return
|
|
59
|
+
return result * 10 ** Math.max(0, 3 - digitsAfterDecimal);
|
|
63
60
|
};
|
|
64
61
|
|
|
65
62
|
interface PcalBase {
|
|
@@ -225,7 +222,6 @@ export interface PcalCall extends PcalBase {
|
|
|
225
222
|
args: PcalExpr[];
|
|
226
223
|
}
|
|
227
224
|
|
|
228
|
-
// A Return or CallReturn outside a procedure has a null from, which Java prints as "null".
|
|
229
225
|
export interface PcalReturn extends PcalBase {
|
|
230
226
|
kind: "Return";
|
|
231
227
|
from: string | undefined;
|
|
@@ -315,8 +311,7 @@ export const toLabeledStmt = (node: PcalStmt) => {
|
|
|
315
311
|
return node;
|
|
316
312
|
};
|
|
317
313
|
|
|
318
|
-
|
|
319
|
-
export const getElement = <T>(vector: T[], index: number) => {
|
|
314
|
+
export const getElement = <Item>(vector: Item[], index: number) => {
|
|
320
315
|
if (index < 0 || index >= vector.length) {
|
|
321
316
|
throw new PcalRuntimeError(`ArrayIndexOutOfBoundsException: ${index}`);
|
|
322
317
|
}
|
|
@@ -329,7 +324,6 @@ export const createPcalToken = (string: string, column: number, type: number): P
|
|
|
329
324
|
type,
|
|
330
325
|
});
|
|
331
326
|
|
|
332
|
-
// A string token's width counts its quotes.
|
|
333
327
|
export const getPcalTokenWidth = (token: PcalToken) =>
|
|
334
328
|
token.type === PCAL_TOKEN.string ? token.string.length + 2 : token.string.length;
|
|
335
329
|
|
|
@@ -450,12 +444,10 @@ export const stepPcalCoord = (expr: PcalExpr, coord: PcalCoord, steps: number) =
|
|
|
450
444
|
return result;
|
|
451
445
|
};
|
|
452
446
|
|
|
453
|
-
// Skips a record field name, such as the a in r.a, [a |-> 1] or [a : S].
|
|
454
447
|
const findNextInstance = (expr: PcalExpr, id: string, start: PcalCoord) => {
|
|
455
448
|
for (let coord = expr.tokens.length === 0 ? undefined : { ...start }; coord !== undefined;) {
|
|
456
449
|
const token = getPcalTokenAt(expr, coord);
|
|
457
450
|
const isString = token.type === PCAL_TOKEN.string;
|
|
458
|
-
// The id is an identifier, so a token that is the id is none of the tokens skipped below.
|
|
459
451
|
if (!isString && token.string === id) return coord;
|
|
460
452
|
const afterNext =
|
|
461
453
|
!isString && (token.string === "[" || token.string === ",")
|
|
@@ -492,12 +484,10 @@ const substituteAt = (
|
|
|
492
484
|
? tokenLine[coord.item + 1].column - (token.column + getPcalTokenWidth(token))
|
|
493
485
|
: 0;
|
|
494
486
|
const restOfLine = tokenLine.splice(coord.item + 1);
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
};
|
|
500
|
-
const getLine = () => expr.tokens[cursor.lineIndex];
|
|
487
|
+
let lineIndex = coord.line;
|
|
488
|
+
let indent = (isParenthesized ? 1 : 0) + token.column;
|
|
489
|
+
let isInserting = !isParenthesized;
|
|
490
|
+
const getLine = () => expr.tokens[lineIndex];
|
|
501
491
|
if (isOneTokenPcalExpr(replacement)) {
|
|
502
492
|
const replacementToken = replacement.tokens[0][0];
|
|
503
493
|
token.string = replacementToken.string;
|
|
@@ -510,30 +500,30 @@ const substituteAt = (
|
|
|
510
500
|
const newExpr = clonePcalExpr(replacement);
|
|
511
501
|
newExpr.tokens.forEach((replacementLine, index) => {
|
|
512
502
|
replacementLine.forEach((nextToken) => {
|
|
513
|
-
nextToken.column +=
|
|
514
|
-
if (!
|
|
503
|
+
nextToken.column += indent;
|
|
504
|
+
if (!isInserting) {
|
|
515
505
|
getLine().push(nextToken);
|
|
516
506
|
return;
|
|
517
507
|
}
|
|
518
508
|
token.string = nextToken.string;
|
|
519
509
|
token.type = nextToken.type;
|
|
520
|
-
|
|
510
|
+
isInserting = false;
|
|
521
511
|
});
|
|
522
512
|
if (index + 1 >= newExpr.tokens.length) return;
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
const currentLine =
|
|
513
|
+
indent = 0;
|
|
514
|
+
lineIndex += 1;
|
|
515
|
+
const currentLine = lineIndex;
|
|
526
516
|
expr.tokens.splice(currentLine, 0, []);
|
|
527
517
|
const oldAnchors = expr.anchorTokens ?? [];
|
|
528
518
|
const oldColumns = expr.anchorTokCol ?? [];
|
|
529
|
-
expr.anchorTokens = expr.tokens.map((
|
|
519
|
+
expr.anchorTokens = expr.tokens.map((_line, item) =>
|
|
530
520
|
item < currentLine
|
|
531
521
|
? oldAnchors[item]
|
|
532
522
|
: item === currentLine
|
|
533
523
|
? newExpr.anchorTokens?.[index + 1]
|
|
534
524
|
: oldAnchors[item - 1],
|
|
535
525
|
);
|
|
536
|
-
expr.anchorTokCol = expr.tokens.map((
|
|
526
|
+
expr.anchorTokCol = expr.tokens.map((_line, item) =>
|
|
537
527
|
item < currentLine
|
|
538
528
|
? oldColumns[item]
|
|
539
529
|
: item === currentLine
|
|
@@ -549,7 +539,7 @@ const substituteAt = (
|
|
|
549
539
|
}
|
|
550
540
|
}
|
|
551
541
|
const line = getLine();
|
|
552
|
-
const result = { line:
|
|
542
|
+
const result = { line: lineIndex, item: line.length - 1 };
|
|
553
543
|
if (restOfLine.length > 0) {
|
|
554
544
|
const previous = line[line.length - 1];
|
|
555
545
|
const shift = previous.column + getPcalTokenWidth(previous) + spaces - restOfLine[0].column;
|
|
@@ -610,7 +600,6 @@ export const getSubstitutedPcalExpr = (expr: PcalExpr, args: PcalExpr[], params:
|
|
|
610
600
|
export const substitutePcalExprs = (exprs: PcalExpr[], args: PcalExpr[], params: string[]) =>
|
|
611
601
|
exprs.map((expr) => getSubstitutedPcalExpr(expr, args, params));
|
|
612
602
|
|
|
613
|
-
// TLAExpr.toString, which names the column of a junction except in TLC 1.7.4.
|
|
614
603
|
const formatPcalExpr = (expr: PcalExpr, version?: TlcVersion) => {
|
|
615
604
|
const getColumn = (token: PcalToken) => (version === "1.7.4" ? "" : `(col${token.column}) `);
|
|
616
605
|
const tokens = expr.tokens.map((line) =>
|
|
@@ -639,95 +628,94 @@ export const formatPcalNode = (
|
|
|
639
628
|
) => {
|
|
640
629
|
const formatExpr = (expr: PcalExpr) => formatPcalExpr(expr, version);
|
|
641
630
|
const columns = [0];
|
|
642
|
-
|
|
631
|
+
let depth = 0;
|
|
643
632
|
const indent = (text: string) => {
|
|
644
|
-
columns[depth
|
|
645
|
-
depth
|
|
633
|
+
columns[depth + 1] = columns[depth] + text.length;
|
|
634
|
+
depth += 1;
|
|
646
635
|
return text;
|
|
647
636
|
};
|
|
648
637
|
const endIndent = () => {
|
|
649
|
-
depth
|
|
638
|
+
depth -= 1;
|
|
650
639
|
return "";
|
|
651
640
|
};
|
|
652
|
-
const
|
|
641
|
+
const getNewLine = () => `\n${" ".repeat(columns[depth])}`;
|
|
653
642
|
const isOldVersion = inputVersionNumber < 1500;
|
|
654
|
-
// The separators' new lines take the indentation the elements before them leave.
|
|
655
643
|
const formatSeq = (vector: (PcalNode | PcalExpr)[]) =>
|
|
656
644
|
`${indent("<<")}${vector
|
|
657
645
|
.map(
|
|
658
646
|
(element, index) =>
|
|
659
|
-
`${index > 0 ? `, ${
|
|
647
|
+
`${index > 0 ? `, ${getNewLine()}` : ""}${"kind" in element ? format(element) : formatExpr(element)}`,
|
|
660
648
|
)
|
|
661
649
|
.join("")}>>${endIndent()}`;
|
|
662
650
|
const formatQuotedSeq = (vector: string[]) =>
|
|
663
651
|
`${indent("<<")}${vector.map((element) => `"${element}"`).join(", ")}>>${endIndent()}`;
|
|
664
652
|
const formatSeqOfSeqs = (vectors: PcalStmt[][]) =>
|
|
665
653
|
`${indent("<< ")}${vectors
|
|
666
|
-
.map((vector, index) => `${index > 0 ? `, ${
|
|
654
|
+
.map((vector, index) => `${index > 0 ? `, ${getNewLine()}` : ""}${formatSeq(vector)}`)
|
|
667
655
|
.join("")} >>${endIndent()}`;
|
|
668
656
|
const formatEqOrIn = (isEq: boolean) => (isEq ? '"="' : '"\\\\in"');
|
|
669
657
|
const format = (node: PcalNode): string => {
|
|
670
658
|
switch (node.kind) {
|
|
671
659
|
case "Uniprocess":
|
|
672
|
-
return `${indent("")}[type |-> "uniprocess", ${
|
|
660
|
+
return `${indent("")}[type |-> "uniprocess", ${getNewLine()} name |-> "${node.name}", ${getNewLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${getNewLine()}${indent(" defs |-> ")}${formatExpr(node.defs)},${endIndent()}${getNewLine()}${indent(" prcds |-> ")}${formatSeq(node.prcds)},${endIndent()}${getNewLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`;
|
|
673
661
|
case "Multiprocess":
|
|
674
|
-
return `${indent("")}[type |-> "multiprocess", ${
|
|
662
|
+
return `${indent("")}[type |-> "multiprocess", ${getNewLine()} name |-> "${node.name}", ${getNewLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${getNewLine()}${indent(" defs |-> ")}${formatExpr(node.defs)},${endIndent()}${getNewLine()}${indent(" prcds |-> ")}${formatSeq(node.prcds)},${endIndent()}${getNewLine()}${indent(" procs |-> ")}${formatSeq(node.procs)}]${endIndent()}${endIndent()}`;
|
|
675
663
|
case "Procedure":
|
|
676
664
|
return isOldVersion
|
|
677
|
-
? `${indent("")}[name |-> "${node.name}", ${
|
|
678
|
-
: `${indent("")}[name |-> "${node.name}", ${
|
|
665
|
+
? `${indent("")}[name |-> "${node.name}", ${getNewLine()}${indent(" params |-> ")}${formatSeq(node.params)},${endIndent()}${getNewLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${getNewLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`
|
|
666
|
+
: `${indent("")}[name |-> "${node.name}", ${getNewLine()}minusLabels |-> ${formatQuotedSeq(node.minusLabels)}, plusLabels |->${formatQuotedSeq(node.plusLabels)}, proceduresCalled |->${formatQuotedSeq(node.proceduresCalled)},${getNewLine()}${indent(" params |-> ")}${formatSeq(node.params)},${endIndent()}${getNewLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${getNewLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`;
|
|
679
667
|
case "Process":
|
|
680
668
|
return isOldVersion
|
|
681
|
-
? `${indent("")}[name |-> "${node.name}", ${
|
|
682
|
-
: `${indent("")}[name |-> "${node.name}",${
|
|
669
|
+
? `${indent("")}[name |-> "${node.name}", ${getNewLine()} eqOrIn |-> ${formatEqOrIn(node.isEq)},${getNewLine()} id |-> ${formatExpr(node.id)},${getNewLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${getNewLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`
|
|
670
|
+
: `${indent("")}[name |-> "${node.name}",${getNewLine()} fairness |-> "${PCAL_FAIRNESS[node.fairness]}", minusLabels |-> ${formatQuotedSeq(node.minusLabels)}, plusLabels |->${formatQuotedSeq(node.plusLabels)}, proceduresCalled |->${formatQuotedSeq(node.proceduresCalled)},${getNewLine()} eqOrIn |-> ${formatEqOrIn(node.isEq)},${getNewLine()} id |-> ${formatExpr(node.id)},${getNewLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${getNewLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`;
|
|
683
671
|
case "VarDecl":
|
|
684
672
|
return `${indent("")}[var |-> "${node.var}", eqOrIn |-> ${formatEqOrIn(node.isEq)}, val |-> ${formatExpr(node.val)}]${endIndent()}`;
|
|
685
673
|
case "PVarDecl":
|
|
686
674
|
return `${indent("")}[var |-> "${node.var}", eqOrIn |-> "=", val |-> ${formatExpr(node.val)}]${endIndent()}`;
|
|
687
675
|
case "LabeledStmt":
|
|
688
|
-
return `${indent("")}[label |-> "${node.label}",${
|
|
676
|
+
return `${indent("")}[label |-> "${node.label}",${getNewLine()}${indent(" stmts |-> ")}${formatSeq(node.stmts)}]${endIndent()}${endIndent()}`;
|
|
689
677
|
case "While":
|
|
690
|
-
return `${indent("")}[type |-> "while", ${
|
|
678
|
+
return `${indent("")}[type |-> "while", ${getNewLine()} test |-> ${formatExpr(node.test)},${getNewLine()}${indent(" labDo |-> ")}${formatSeq(node.labDo)},${endIndent()}${getNewLine()}${indent(" unlabDo |-> ")}${formatSeq(node.unlabDo)}]${endIndent()}${endIndent()}`;
|
|
691
679
|
case "Assign":
|
|
692
|
-
return `${indent("")}[type |-> "assignment",${
|
|
680
|
+
return `${indent("")}[type |-> "assignment",${getNewLine()}${indent(" ass |-> ")}${formatSeq(node.ass)}]${endIndent()}${endIndent()}`;
|
|
693
681
|
case "SingleAssign":
|
|
694
|
-
return `${indent("")}[lhs |-> ${format(node.lhs)},${
|
|
682
|
+
return `${indent("")}[lhs |-> ${format(node.lhs)},${getNewLine()} rhs |-> ${formatExpr(node.rhs)}]${endIndent()}`;
|
|
695
683
|
case "Lhs":
|
|
696
684
|
return `[var |-> "${node.var}", sub |-> ${formatExpr(node.sub)}]`;
|
|
697
685
|
case "If":
|
|
698
|
-
return `${indent("")}[type |-> "if", ${
|
|
686
|
+
return `${indent("")}[type |-> "if", ${getNewLine()} test |-> ${formatExpr(node.test)},${getNewLine()}${indent(" then |-> ")}${formatSeq(node.Then)},${endIndent()}${getNewLine()}${indent(" else |-> ")}${formatSeq(node.Else)}]${endIndent()}${endIndent()}`;
|
|
699
687
|
case "Either":
|
|
700
|
-
return `${indent("")}[type |-> "either", ${
|
|
688
|
+
return `${indent("")}[type |-> "either", ${getNewLine()}${indent(" ors |-> ")}${formatSeqOfSeqs(node.ors)}]${endIndent()}${endIndent()}`;
|
|
701
689
|
case "With":
|
|
702
|
-
return `${indent("")}[type |-> "with", ${
|
|
690
|
+
return `${indent("")}[type |-> "with", ${getNewLine()} var |-> "${node.var}",${getNewLine()} eqOrIn |-> ${formatEqOrIn(node.isEq)},${getNewLine()} exp |-> ${formatExpr(node.exp)},${getNewLine()}${indent(" do |-> ")}${formatSeq(node.Do)}]${endIndent()}${endIndent()}`;
|
|
703
691
|
case "When":
|
|
704
|
-
return `${indent("")}[type |-> "when", ${
|
|
692
|
+
return `${indent("")}[type |-> "when", ${getNewLine()} exp |-> ${formatExpr(node.exp)}]${endIndent()}`;
|
|
705
693
|
case "PrintS":
|
|
706
|
-
return `${indent("")}[type |-> "print", ${
|
|
694
|
+
return `${indent("")}[type |-> "print", ${getNewLine()} exp |-> ${formatExpr(node.exp)}]${endIndent()}`;
|
|
707
695
|
case "Assert":
|
|
708
|
-
return `${indent("")}[type |-> "assert", ${
|
|
696
|
+
return `${indent("")}[type |-> "assert", ${getNewLine()} exp |-> ${formatExpr(node.exp)}]${endIndent()}`;
|
|
709
697
|
case "Skip":
|
|
710
698
|
return '[type |-> "skip"]';
|
|
711
699
|
case "LabelIf":
|
|
712
|
-
return `${indent("")}[type |-> "labelIf",${
|
|
700
|
+
return `${indent("")}[type |-> "labelIf",${getNewLine()} test |-> ${formatExpr(node.test)},${getNewLine()}${indent(" unlabThen |-> ")}${formatSeq(node.unlabThen)},${endIndent()}${getNewLine()}${indent(" labThen |-> ")}${formatSeq(node.labThen)},${endIndent()}${getNewLine()}${indent(" unlabElse |-> ")}${formatSeq(node.unlabElse)},${endIndent()}${getNewLine()}${indent(" labElse |-> ")}${formatSeq(node.labElse)}]${endIndent()}${getNewLine()}${endIndent()}`;
|
|
713
701
|
case "LabelEither":
|
|
714
|
-
return `${indent("")}[type |-> "labelEither",${
|
|
702
|
+
return `${indent("")}[type |-> "labelEither",${getNewLine()}${indent(" clauses |-> ")}${formatSeq(node.clauses)}]${endIndent()}${getNewLine()}${endIndent()}`;
|
|
715
703
|
case "Clause":
|
|
716
|
-
return `${indent("")}${indent("[unlabOr |-> ")}${formatSeq(node.unlabOr)},${endIndent()}${
|
|
704
|
+
return `${indent("")}${indent("[unlabOr |-> ")}${formatSeq(node.unlabOr)},${endIndent()}${getNewLine()}${indent(" labOr |-> ")}${formatSeq(node.labOr)}]${endIndent()}${getNewLine()}${endIndent()}`;
|
|
717
705
|
case "Call":
|
|
718
|
-
return `${indent("")}[type |-> "call",${
|
|
706
|
+
return `${indent("")}[type |-> "call",${getNewLine()} returnTo |-> "${node.returnTo}",${getNewLine()} to |-> "${node.to}",${getNewLine()}${indent(" args |-> ")}${formatSeq(node.args)}]${endIndent()}${endIndent()}`;
|
|
719
707
|
case "Return":
|
|
720
708
|
return `[type |-> "return", from |-> "${node.from ?? "null"}"]`;
|
|
721
709
|
case "CallReturn":
|
|
722
|
-
return `${indent("")}[type |-> "callReturn",${
|
|
710
|
+
return `${indent("")}[type |-> "callReturn",${getNewLine()} from |-> "${node.from ?? "null"}",${getNewLine()} to |-> "${node.to}",${getNewLine()}${indent("args |-> ")}${formatSeq(node.args)}]${getNewLine()}${endIndent()}${endIndent()}`;
|
|
723
711
|
case "CallGoto":
|
|
724
|
-
return `${indent("")}[type |-> "callGoto",${
|
|
712
|
+
return `${indent("")}[type |-> "callGoto",${getNewLine()} after |-> "${node.after}",${getNewLine()} to |-> "${node.to}",${getNewLine()}${indent("args |-> ")}${formatSeq(node.args)}]${getNewLine()}${endIndent()}${endIndent()}`;
|
|
725
713
|
case "Goto":
|
|
726
714
|
return `[type |-> "goto", to |-> "${node.to}"]`;
|
|
727
715
|
case "Macro":
|
|
728
|
-
return `${indent("")}[name |-> "${node.name}", ${
|
|
716
|
+
return `${indent("")}[name |-> "${node.name}", ${getNewLine()}${indent(" params |-> ")}${indent("<<")}${node.params.join(`, ${getNewLine()}`)}>>${endIndent()},${endIndent()}${getNewLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`;
|
|
729
717
|
case "MacroCall":
|
|
730
|
-
return `${indent("")}[type |-> "macrocall",${
|
|
718
|
+
return `${indent("")}[type |-> "macrocall",${getNewLine()} name |-> "${node.name}",${getNewLine()}${indent(" args |-> ")}${formatSeq(node.args)}]${endIndent()}${endIndent()}`;
|
|
731
719
|
}
|
|
732
720
|
};
|
|
733
721
|
return format(node);
|