Skip to content

Commit 9ce1044

Browse files
committed
tests: fix fallout in flowgraph graphviz comparison dot files.
1 parent 6b3cc0b commit 9ce1044

26 files changed

+78
-26
lines changed

src/test/run-make/graphviz-flowgraph/f00.dot-expected.dot

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ digraph block {
22
N0[label="entry"];
33
N1[label="exit"];
44
N2[label="block { }"];
5+
N3[label="expr { }"];
56
N0 -> N2;
6-
N2 -> N1;
7+
N2 -> N3;
8+
N3 -> N1;
79
}

src/test/run-make/graphviz-flowgraph/f01.dot-expected.dot

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ digraph block {
44
N2[label="expr 1"];
55
N3[label="stmt 1;"];
66
N4[label="block { 1; }"];
7+
N5[label="expr { 1; }"];
78
N0 -> N2;
89
N2 -> N3;
910
N3 -> N4;
10-
N4 -> N1;
11+
N4 -> N5;
12+
N5 -> N1;
1113
}

src/test/run-make/graphviz-flowgraph/f02.dot-expected.dot

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ digraph block {
44
N2[label="local _x"];
55
N3[label="stmt let _x: isize;"];
66
N4[label="block { let _x: isize; }"];
7+
N5[label="expr { let _x: isize; }"];
78
N0 -> N2;
89
N2 -> N3;
910
N3 -> N4;
10-
N4 -> N1;
11+
N4 -> N5;
12+
N5 -> N1;
1113
}

src/test/run-make/graphviz-flowgraph/f03.dot-expected.dot

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ digraph block {
66
N4[label="expr 3 + 4"];
77
N5[label="stmt 3 + 4;"];
88
N6[label="block { 3 + 4; }"];
9+
N7[label="expr { 3 + 4; }"];
910
N0 -> N2;
1011
N2 -> N3;
1112
N3 -> N4;
1213
N4 -> N5;
1314
N5 -> N6;
14-
N6 -> N1;
15+
N6 -> N7;
16+
N7 -> N1;
1517
}

src/test/run-make/graphviz-flowgraph/f04.dot-expected.dot

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ digraph block {
55
N3[label="local _x"];
66
N4[label="stmt let _x = 4;"];
77
N5[label="block { let _x = 4; }"];
8+
N6[label="expr { let _x = 4; }"];
89
N0 -> N2;
910
N2 -> N3;
1011
N3 -> N4;
1112
N4 -> N5;
12-
N5 -> N1;
13+
N5 -> N6;
14+
N6 -> N1;
1315
}

src/test/run-make/graphviz-flowgraph/f05.dot-expected.dot

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ digraph block {
99
N7[label="pat (_x, _y)"];
1010
N8[label="stmt let (_x, _y) = (5, 55);"];
1111
N9[label="block { let (_x, _y) = (5, 55); }"];
12+
N10[label="expr { let (_x, _y) = (5, 55); }"];
1213
N0 -> N2;
1314
N2 -> N3;
1415
N3 -> N4;
@@ -17,5 +18,6 @@ digraph block {
1718
N6 -> N7;
1819
N7 -> N8;
1920
N8 -> N9;
20-
N9 -> N1;
21+
N9 -> N10;
22+
N10 -> N1;
2123
}

src/test/run-make/graphviz-flowgraph/f06.dot-expected.dot

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ digraph block {
77
N5[label="pat S6 { val: _x }"];
88
N6[label="stmt let S6 { val: _x } = S6{val: 6,};"];
99
N7[label="block { let S6 { val: _x } = S6{val: 6,}; }"];
10+
N8[label="expr { let S6 { val: _x } = S6{val: 6,}; }"];
1011
N0 -> N2;
1112
N2 -> N3;
1213
N3 -> N4;
1314
N4 -> N5;
1415
N5 -> N6;
1516
N6 -> N7;
16-
N7 -> N1;
17+
N7 -> N8;
18+
N8 -> N1;
1719
}

src/test/run-make/graphviz-flowgraph/f07.dot-expected.dot

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ digraph block {
1717
N15[label="expr x + y"];
1818
N16[label="stmt match [7, 77, 777, 7777] { [x, y, ..] => x + y, };"];
1919
N17[label="block { match [7, 77, 777, 7777] { [x, y, ..] => x + y, }; }"];
20+
N18[label="expr { match [7, 77, 777, 7777] { [x, y, ..] => x + y, }; }"];
2021
N0 -> N2;
2122
N2 -> N3;
2223
N3 -> N4;
@@ -33,5 +34,6 @@ digraph block {
3334
N15 -> N7;
3435
N7 -> N16;
3536
N16 -> N17;
36-
N17 -> N1;
37+
N17 -> N18;
38+
N18 -> N1;
3739
}

src/test/run-make/graphviz-flowgraph/f08.dot-expected.dot

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ digraph block {
1616
N14[label="block { _y = 888; }"];
1717
N15[label="expr if x > 88 { _y = 888; }"];
1818
N16[label="block { let x = 8; let _y; if x > 88 { _y = 888; } }"];
19+
N17[label="expr { let x = 8; let _y; if x > 88 { _y = 888; } }"];
1920
N0 -> N2;
2021
N2 -> N3;
2122
N3 -> N4;
@@ -32,5 +33,6 @@ digraph block {
3233
N9 -> N15;
3334
N14 -> N15;
3435
N15 -> N16;
35-
N16 -> N1;
36+
N16 -> N17;
37+
N17 -> N1;
3638
}

src/test/run-make/graphviz-flowgraph/f09.dot-expected.dot

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ digraph block {
2424
N22[label="expr { _y = 94 + 95; }"];
2525
N23[label="expr if x > 92 { _y = 93; } else { _y = 94 + 95; }"];
2626
N24[label="block { let x = 91; let _y; if x > 92 { _y = 93; } else { _y = 94 + 95; } }"];
27+
N25[label="expr { let x = 91; let _y; if x > 92 { _y = 93; } else { _y = 94 + 95; } }"];
2728
N0 -> N2;
2829
N2 -> N3;
2930
N3 -> N4;
@@ -48,5 +49,6 @@ digraph block {
4849
N14 -> N23;
4950
N22 -> N23;
5051
N23 -> N24;
51-
N24 -> N1;
52+
N24 -> N25;
53+
N25 -> N1;
5254
}

0 commit comments

Comments
 (0)