OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: fix fallout in flowgraph graphviz comparison dot files.

Browse Source
This commit is contained in:
Eduard Burtescu 2016-10-26 07:39:04 +03:00
parent 6b3cc0b8c8
commit 9ce1044bd5
26 changed files with 78 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,8 @@ digraph block {
N0[label="entry"];
N1[label="exit"];
N2[label="block { }"];
N3[label="expr { }"];
N0 -> N2;
N2 -> N1;
N2 -> N3;
N3 -> N1;
}

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

@ -4,8 +4,10 @@ digraph block {
N2[label="expr 1"];
N3[label="stmt 1;"];
N4[label="block { 1; }"];
N5[label="expr { 1; }"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
N4 -> N1;
N4 -> N5;
N5 -> N1;
}

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

@ -4,8 +4,10 @@ digraph block {
N2[label="local _x"];
N3[label="stmt let _x: isize;"];
N4[label="block { let _x: isize; }"];
N5[label="expr { let _x: isize; }"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
N4 -> N1;
N4 -> N5;
N5 -> N1;
}

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

@ -6,10 +6,12 @@ digraph block {
N4[label="expr 3 + 4"];
N5[label="stmt 3 + 4;"];
N6[label="block { 3 + 4; }"];
N7[label="expr { 3 + 4; }"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
N4 -> N5;
N5 -> N6;
N6 -> N1;
N6 -> N7;
N7 -> N1;
}

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

@ -5,9 +5,11 @@ digraph block {
N3[label="local _x"];
N4[label="stmt let _x = 4;"];
N5[label="block { let _x = 4; }"];
N6[label="expr { let _x = 4; }"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
N4 -> N5;
N5 -> N1;
N5 -> N6;
N6 -> N1;
}

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

@ -9,6 +9,7 @@ digraph block {
N7[label="pat (_x, _y)"];
N8[label="stmt let (_x, _y) = (5, 55);"];
N9[label="block { let (_x, _y) = (5, 55); }"];
N10[label="expr { let (_x, _y) = (5, 55); }"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
@ -17,5 +18,6 @@ digraph block {
N6 -> N7;
N7 -> N8;
N8 -> N9;
N9 -> N1;
N9 -> N10;
N10 -> N1;
}

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

@ -7,11 +7,13 @@ digraph block {
N5[label="pat S6 { val: _x }"];
N6[label="stmt let S6 { val: _x } = S6{val: 6,};"];
N7[label="block { let S6 { val: _x } = S6{val: 6,}; }"];
N8[label="expr { let S6 { val: _x } = S6{val: 6,}; }"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
N4 -> N5;
N5 -> N6;
N6 -> N7;
N7 -> N1;
N7 -> N8;
N8 -> N1;
}

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

@ -17,6 +17,7 @@ digraph block {
N15[label="expr x + y"];
N16[label="stmt match [7, 77, 777, 7777] { [x, y, ..] => x + y, };"];
N17[label="block { match [7, 77, 777, 7777] { [x, y, ..] => x + y, }; }"];
N18[label="expr { match [7, 77, 777, 7777] { [x, y, ..] => x + y, }; }"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
@ -33,5 +34,6 @@ digraph block {
N15 -> N7;
N7 -> N16;
N16 -> N17;
N17 -> N1;
N17 -> N18;
N18 -> N1;
}

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

@ -16,6 +16,7 @@ digraph block {
N14[label="block { _y = 888; }"];
N15[label="expr if x > 88 { _y = 888; }"];
N16[label="block { let x = 8; let _y; if x > 88 { _y = 888; } }"];
N17[label="expr { let x = 8; let _y; if x > 88 { _y = 888; } }"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
@ -32,5 +33,6 @@ digraph block {
N9 -> N15;
N14 -> N15;
N15 -> N16;
N16 -> N1;
N16 -> N17;
N17 -> N1;
}

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

@ -24,6 +24,7 @@ digraph block {
N22[label="expr { _y = 94 + 95; }"];
N23[label="expr if x > 92 { _y = 93; } else { _y = 94 + 95; }"];
N24[label="block { let x = 91; let _y; if x > 92 { _y = 93; } else { _y = 94 + 95; } }"];
N25[label="expr { let x = 91; let _y; if x > 92 { _y = 93; } else { _y = 94 + 95; } }"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
@ -48,5 +49,6 @@ digraph block {
N14 -> N23;
N22 -> N23;
N23 -> N24;
N24 -> N1;
N24 -> N25;
N25 -> N1;
}

4
src/test/run-make/graphviz-flowgraph/f10.dot-expected.dot
View File

@ -15,6 +15,7 @@ digraph block {
N13[label="stmt x -= 1;"];
N14[label="block { x -= 1; }"];
N15[label="block { let mut x = 10; while x > 0 { x -= 1; } }"];
N16[label="expr { let mut x = 10; while x > 0 { x -= 1; } }"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
@ -30,5 +31,6 @@ digraph block {
N13 -> N14;
N14 -> N5;
N9 -> N15;
N15 -> N1;
N15 -> N16;
N16 -> N1;
}

4
src/test/run-make/graphviz-flowgraph/f11.dot-expected.dot
View File

@ -15,6 +15,7 @@ digraph block {
N13[label="expr \"unreachable\""];
N14[label="stmt \"unreachable\";"];
N15[label="block { let mut _x = 11; loop { _x -= 1; } \"unreachable\"; }"];
N16[label="expr { let mut _x = 11; loop { _x -= 1; } \"unreachable\"; }"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
@ -29,5 +30,6 @@ digraph block {
N12 -> N13;
N13 -> N14;
N14 -> N15;
N15 -> N1;
N15 -> N16;
N16 -> N1;
}

4
src/test/run-make/graphviz-flowgraph/f12.dot-expected.dot
View File

@ -22,6 +22,7 @@ digraph block {
N20[label="expr if x == 2 { break ; \"unreachable\"; }"];
N21[label="block { x -= 1; if x == 2 { break ; \"unreachable\"; } }"];
N22[label="block { let mut x = 12; loop { x -= 1; if x == 2 { break ; \"unreachable\"; } } }"];
N23[label="expr { let mut x = 12; loop { x -= 1; if x == 2 { break ; \"unreachable\"; } } }"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
@ -44,5 +45,6 @@ digraph block {
N20 -> N21;
N21 -> N5;
N6 -> N22;
N22 -> N1;
N22 -> N23;
N23 -> N1;
}

4
src/test/run-make/graphviz-flowgraph/f13.dot-expected.dot
View File

@ -24,6 +24,7 @@ digraph block {
N22[label="expr _y"];
N23[label="expr _y = v + 1"];
N24[label="block {\l let x = E13::E13b(13);\l let _y;\l match x { E13::E13a => _y = 1, E13::E13b(v) => _y = v + 1, }\l}\l"];
N25[label="expr {\l let x = E13::E13b(13);\l let _y;\l match x { E13::E13a => _y = 1, E13::E13b(v) => _y = v + 1, }\l}\l"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
@ -48,5 +49,6 @@ digraph block {
N22 -> N23;
N23 -> N10;
N10 -> N24;
N24 -> N1;
N24 -> N25;
N25 -> N1;
}

4
src/test/run-make/graphviz-flowgraph/f14.dot-expected.dot
View File

@ -15,6 +15,7 @@ digraph block {
N13[label="block { return; \"unreachable\"; }"];
N14[label="expr if x > 1 { return; \"unreachable\"; }"];
N15[label="block { let x = 14; if x > 1 { return; \"unreachable\"; } }"];
N16[label="expr { let x = 14; if x > 1 { return; \"unreachable\"; } }"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
@ -30,5 +31,6 @@ digraph block {
N7 -> N14;
N13 -> N14;
N14 -> N15;
N15 -> N1;
N15 -> N16;
N16 -> N1;
}

4
src/test/run-make/graphviz-flowgraph/f15.dot-expected.dot
View File

@ -49,6 +49,7 @@ digraph block {
N47[label="stmt x -= 5;"];
N48[label="block {\l \'inner:\l loop {\l if x == 1 { break \'outer ; \"unreachable\"; }\l if y >= 2 { break ; \"unreachable\"; }\l y -= 3;\l }\l y -= 4;\l x -= 5;\l}\l"];
N49[label="block {\l let mut x = 15;\l let mut y = 151;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1 { break \'outer ; \"unreachable\"; }\l if y >= 2 { break ; \"unreachable\"; }\l y -= 3;\l }\l y -= 4;\l x -= 5;\l }\l}\l"];
N50[label="expr {\l let mut x = 15;\l let mut y = 151;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1 { break \'outer ; \"unreachable\"; }\l if y >= 2 { break ; \"unreachable\"; }\l y -= 3;\l }\l y -= 4;\l x -= 5;\l }\l}\l"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
@ -99,5 +100,6 @@ digraph block {
N47 -> N48;
N48 -> N8;
N9 -> N49;
N49 -> N1;
N49 -> N50;
N50 -> N1;
}

4
src/test/run-make/graphviz-flowgraph/f16.dot-expected.dot
View File

@ -52,6 +52,7 @@ digraph block {
N50[label="expr \"unreachable\""];
N51[label="stmt \"unreachable\";"];
N52[label="block {\l let mut x = 16;\l let mut y = 16;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1 { continue \'outer ; \"unreachable\"; }\l if y >= 1 { break ; \"unreachable\"; }\l y -= 1;\l }\l y -= 1;\l x -= 1;\l }\l \"unreachable\";\l}\l"];
N53[label="expr {\l let mut x = 16;\l let mut y = 16;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1 { continue \'outer ; \"unreachable\"; }\l if y >= 1 { break ; \"unreachable\"; }\l y -= 1;\l }\l y -= 1;\l x -= 1;\l }\l \"unreachable\";\l}\l"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
@ -105,5 +106,6 @@ digraph block {
N49 -> N50;
N50 -> N51;
N51 -> N52;
N52 -> N1;
N52 -> N53;
N53 -> N1;
}

4
src/test/run-make/graphviz-flowgraph/f17.dot-expected.dot
View File

@ -8,6 +8,7 @@ digraph block {
N6[label="local _v"];
N7[label="stmt let _v = [1, 7, 17];"];
N8[label="block { let _v = [1, 7, 17]; }"];
N9[label="expr { let _v = [1, 7, 17]; }"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
@ -15,5 +16,6 @@ digraph block {
N5 -> N6;
N6 -> N7;
N7 -> N8;
N8 -> N1;
N8 -> N9;
N9 -> N1;
}

4
src/test/run-make/graphviz-flowgraph/f18.dot-expected.dot
View File

@ -9,6 +9,7 @@ digraph block {
N7[label="expr inner(inner(18))"];
N8[label="stmt inner(inner(18));"];
N9[label="block { inner(inner(18)); }"];
N10[label="expr { inner(inner(18)); }"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
@ -17,5 +18,6 @@ digraph block {
N6 -> N7;
N7 -> N8;
N8 -> N9;
N9 -> N1;
N9 -> N10;
N10 -> N1;
}

4
src/test/run-make/graphviz-flowgraph/f19.dot-expected.dot
View File

@ -12,6 +12,7 @@ digraph block {
N10[label="expr s.inner().inner()"];
N11[label="stmt s.inner().inner();"];
N12[label="block { let s = S19{x: 19,}; s.inner().inner(); }"];
N13[label="expr { let s = S19{x: 19,}; s.inner().inner(); }"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
@ -23,5 +24,6 @@ digraph block {
N9 -> N10;
N10 -> N11;
N11 -> N12;
N12 -> N1;
N12 -> N13;
N13 -> N1;
}

4
src/test/run-make/graphviz-flowgraph/f20.dot-expected.dot
View File

@ -12,6 +12,7 @@ digraph block {
N10[label="expr v[20]"];
N11[label="stmt v[20];"];
N12[label="block { let v = [2, 0, 20]; v[20]; }"];
N13[label="expr { let v = [2, 0, 20]; v[20]; }"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
@ -23,5 +24,6 @@ digraph block {
N9 -> N10;
N10 -> N11;
N11 -> N12;
N12 -> N1;
N12 -> N13;
N13 -> N1;
}

4
src/test/run-make/graphviz-flowgraph/f21.dot-expected.dot
View File

@ -47,6 +47,7 @@ digraph block {
N45[label="stmt \"unreachable\";"];
N46[label="block {\l \'inner:\l loop {\l if x == 1 { break \'outer ; \"unreachable\"; }\l if y >= 2 { return; \"unreachable\"; }\l y -= 3;\l x -= 5;\l }\l \"unreachable\";\l}\l"];
N47[label="block {\l let mut x = 15;\l let mut y = 151;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1 { break \'outer ; \"unreachable\"; }\l if y >= 2 { return; \"unreachable\"; }\l y -= 3;\l x -= 5;\l }\l \"unreachable\";\l }\l}\l"];
N48[label="expr {\l let mut x = 15;\l let mut y = 151;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1 { break \'outer ; \"unreachable\"; }\l if y >= 2 { return; \"unreachable\"; }\l y -= 3;\l x -= 5;\l }\l \"unreachable\";\l }\l}\l"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
@ -95,5 +96,6 @@ digraph block {
N45 -> N46;
N46 -> N8;
N9 -> N47;
N47 -> N1;
N47 -> N48;
N48 -> N1;
}

4
src/test/run-make/graphviz-flowgraph/f22.dot-expected.dot
View File

@ -50,6 +50,7 @@ digraph block {
N48[label="expr \"unreachable\""];
N49[label="stmt \"unreachable\";"];
N50[label="block {\l let mut x = 15;\l let mut y = 151;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1 { continue \'outer ; \"unreachable\"; }\l if y >= 2 { return; \"unreachable\"; }\l x -= 1;\l y -= 3;\l }\l \"unreachable\";\l }\l \"unreachable\";\l}\l"];
N51[label="expr {\l let mut x = 15;\l let mut y = 151;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1 { continue \'outer ; \"unreachable\"; }\l if y >= 2 { return; \"unreachable\"; }\l x -= 1;\l y -= 3;\l }\l \"unreachable\";\l }\l \"unreachable\";\l}\l"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
@ -101,5 +102,6 @@ digraph block {
N47 -> N48;
N48 -> N49;
N49 -> N50;
N50 -> N1;
N50 -> N51;
N51 -> N1;
}

4
src/test/run-make/graphviz-flowgraph/f23.dot-expected.dot
View File

@ -52,6 +52,7 @@ digraph block {
N50[label="block { y -= 1; while z > 0 { z -= 1; } if x > 10 { return; \"unreachable\"; } }"];
N51[label="block {\l x -= 1;\l while y > 0 {\l y -= 1;\l while z > 0 { z -= 1; }\l if x > 10 { return; \"unreachable\"; }\l }\l}\l"];
N52[label="block {\l let mut x = 23;\l let mut y = 23;\l let mut z = 23;\l while x > 0 {\l x -= 1;\l while y > 0 {\l y -= 1;\l while z > 0 { z -= 1; }\l if x > 10 { return; \"unreachable\"; }\l }\l }\l}\l"];
N53[label="expr {\l let mut x = 23;\l let mut y = 23;\l let mut z = 23;\l while x > 0 {\l x -= 1;\l while y > 0 {\l y -= 1;\l while z > 0 { z -= 1; }\l if x > 10 { return; \"unreachable\"; }\l }\l }\l}\l"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
@ -107,5 +108,6 @@ digraph block {
N24 -> N51;
N51 -> N11;
N15 -> N52;
N52 -> N1;
N52 -> N53;
N53 -> N1;
}

4
src/test/run-make/graphviz-flowgraph/f24.dot-expected.dot
View File

@ -76,6 +76,7 @@ digraph block {
N74[label="block {\l if y == 0 { break ; \"unreachable\"; }\l y -= 1;\l loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }\l if x > 10 { return; \"unreachable\"; }\l}\l"];
N75[label="block {\l if x == 0 { break ; \"unreachable\"; }\l x -= 1;\l loop {\l if y == 0 { break ; \"unreachable\"; }\l y -= 1;\l loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }\l if x > 10 { return; \"unreachable\"; }\l }\l}\l"];
N76[label="block {\l let mut x = 24;\l let mut y = 24;\l let mut z = 24;\l loop {\l if x == 0 { break ; \"unreachable\"; }\l x -= 1;\l loop {\l if y == 0 { break ; \"unreachable\"; }\l y -= 1;\l loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }\l if x > 10 { return; \"unreachable\"; }\l }\l }\l}\l"];
N77[label="expr {\l let mut x = 24;\l let mut y = 24;\l let mut z = 24;\l loop {\l if x == 0 { break ; \"unreachable\"; }\l x -= 1;\l loop {\l if y == 0 { break ; \"unreachable\"; }\l y -= 1;\l loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }\l if x > 10 { return; \"unreachable\"; }\l }\l }\l}\l"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
@ -155,5 +156,6 @@ digraph block {
N29 -> N75;
N75 -> N11;
N12 -> N76;
N76 -> N1;
N76 -> N77;
N77 -> N1;
}

4
src/test/run-make/graphviz-flowgraph/f25.dot-expected.dot
View File

@ -76,6 +76,7 @@ digraph block {
N74[label="block {\l if y == 0 { break ; \"unreachable\"; }\l y -= 1;\l \'a: loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }\l if x > 10 { continue \'a ; \"unreachable\"; }\l}\l"];
N75[label="block {\l if x == 0 { break ; \"unreachable\"; }\l x -= 1;\l \'a:\l loop {\l if y == 0 { break ; \"unreachable\"; }\l y -= 1;\l \'a: loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }\l if x > 10 { continue \'a ; \"unreachable\"; }\l }\l}\l"];
N76[label="block {\l let mut x = 25;\l let mut y = 25;\l let mut z = 25;\l \'a:\l loop {\l if x == 0 { break ; \"unreachable\"; }\l x -= 1;\l \'a:\l loop {\l if y == 0 { break ; \"unreachable\"; }\l y -= 1;\l \'a: loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }\l if x > 10 { continue \'a ; \"unreachable\"; }\l }\l }\l}\l"];
N77[label="expr {\l let mut x = 25;\l let mut y = 25;\l let mut z = 25;\l \'a:\l loop {\l if x == 0 { break ; \"unreachable\"; }\l x -= 1;\l \'a:\l loop {\l if y == 0 { break ; \"unreachable\"; }\l y -= 1;\l \'a: loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }\l if x > 10 { continue \'a ; \"unreachable\"; }\l }\l }\l}\l"];
N0 -> N2;
N2 -> N3;
N3 -> N4;
@ -155,5 +156,6 @@ digraph block {
N29 -> N75;
N75 -> N11;
N12 -> N76;
N76 -> N1;
N76 -> N77;
N77 -> N1;
}