diff options
Diffstat (limited to 'chapter07/src/test/java/com/seaofnodes')
3 files changed, 4 insertions, 27 deletions
diff --git a/chapter07/src/test/java/com/seaofnodes/simple/Chapter02Test.java b/chapter07/src/test/java/com/seaofnodes/simple/Chapter02Test.java index 47cee096..a6075b75 100644 --- a/chapter07/src/test/java/com/seaofnodes/simple/Chapter02Test.java +++ b/chapter07/src/test/java/com/seaofnodes/simple/Chapter02Test.java @@ -11,10 +11,8 @@ public class Chapter02Test { @Test public void testParseGrammar() { Parser parser = new Parser("return 1+2*3+-5;"); - Node._disablePeephole = true; // disable peephole so we can observe full graph StopNode ret = parser.parse(); - assertEquals("return (1+((2*3)+(-5)));", ret.print()); - Node._disablePeephole = false; + assertEquals("return 2;", ret.print()); } @Test diff --git a/chapter07/src/test/java/com/seaofnodes/simple/Chapter03Test.java b/chapter07/src/test/java/com/seaofnodes/simple/Chapter03Test.java index 1e67cef5..12201ca0 100644 --- a/chapter07/src/test/java/com/seaofnodes/simple/Chapter03Test.java +++ b/chapter07/src/test/java/com/seaofnodes/simple/Chapter03Test.java @@ -30,15 +30,6 @@ public class Chapter03Test { } @Test - public void testVarScopeNoPeephole() { - Parser parser = new Parser("int a=1; int b=2; int c=0; { int b=3; c=a+b; } return c;"); - Node._disablePeephole = true; - StopNode ret = parser.parse(); - Node._disablePeephole = false; - assertEquals("return (1+3);", ret.print()); - } - - @Test public void testVarDist() { Parser parser = new Parser("int x0=1; int y0=2; int x1=3; int y1=4; return (x0-x1)*(x0-x1) + (y0-y1)*(y0-y1);"); StopNode ret = parser.parse(); diff --git a/chapter07/src/test/java/com/seaofnodes/simple/Chapter07Test.java b/chapter07/src/test/java/com/seaofnodes/simple/Chapter07Test.java index 189fcf66..fb8dbcca 100644 --- a/chapter07/src/test/java/com/seaofnodes/simple/Chapter07Test.java +++ b/chapter07/src/test/java/com/seaofnodes/simple/Chapter07Test.java @@ -17,11 +17,9 @@ public class Chapter07Test { } return arg; """); - Node._disablePeephole = true; StopNode stop = parser.parse(); assertEquals("return Phi(Loop6,arg,(Phi_arg+1));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); - Node._disablePeephole = false; } @Test @@ -72,11 +70,9 @@ while(a < 10) { } return b; """); - Node._disablePeephole = true; StopNode stop = parser.parse(); assertEquals("return Phi(Loop8,2,Phi(Region27,Phi_b,4));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); - Node._disablePeephole = false; } @Test @@ -110,11 +106,9 @@ while(a < 10) { } return a; """); - Node._disablePeephole = true; StopNode stop = parser.parse(); - assertEquals("return Phi(Loop7,1,((Phi_a+1)+2));", stop.toString()); + assertEquals("return Phi(Loop7,1,(Phi_a+3));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); - Node._disablePeephole = false; } @Test @@ -141,11 +135,9 @@ int a = 1; while(arg) a = 2; return a; """); - Node._disablePeephole = true; StopNode stop = parser.parse(); assertEquals("return Phi(Loop7,1,2);", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); - Node._disablePeephole = false; } @Test @@ -172,11 +164,9 @@ while(a < 10) { } return a; """); - Node._disablePeephole = true; StopNode stop = parser.parse(); - assertEquals("return Phi(Loop7,1,((Phi_a+1)+2));", stop.toString()); + assertEquals("return Phi(Loop7,1,(Phi_a+3));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); - Node._disablePeephole = false; } @Test @@ -207,11 +197,9 @@ while(a < 10) { } return a; """); - Node._disablePeephole = true; StopNode stop = parser.parse(); - assertEquals("return Phi(Loop8,1,((Phi_a+1)+2));", stop.toString()); + assertEquals("return Phi(Loop8,1,(Phi_a+3));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); - Node._disablePeephole = false; } @Test |