diff options
Diffstat (limited to 'chapter09/src/test/java/com')
8 files changed, 80 insertions, 92 deletions
diff --git a/chapter09/src/test/java/com/seaofnodes/simple/Chapter02Test.java b/chapter09/src/test/java/com/seaofnodes/simple/Chapter02Test.java index 2deba460..75ee0b70 100644 --- a/chapter09/src/test/java/com/seaofnodes/simple/Chapter02Test.java +++ b/chapter09/src/test/java/com/seaofnodes/simple/Chapter02Test.java @@ -14,8 +14,6 @@ public class Chapter02Test { Node._disablePeephole = true; // disable peephole so we can observe full graph StopNode ret = parser.parse(); assertEquals("return ((1+(2*3))+(-5));", ret.print()); - GraphVisualizer gv = new GraphVisualizer(); - System.out.println(gv.generateDotOutput(parser)); Node._disablePeephole = false; } @@ -59,8 +57,6 @@ public class Chapter02Test { Parser parser = new Parser("return 1+2*3+-5;"); StopNode ret = parser.parse(); assertEquals("return 2;", ret.print()); - GraphVisualizer gv = new GraphVisualizer(); - System.out.println(gv.generateDotOutput(parser)); } } diff --git a/chapter09/src/test/java/com/seaofnodes/simple/Chapter03Test.java b/chapter09/src/test/java/com/seaofnodes/simple/Chapter03Test.java index 407fbe48..a243beb1 100644 --- a/chapter09/src/test/java/com/seaofnodes/simple/Chapter03Test.java +++ b/chapter09/src/test/java/com/seaofnodes/simple/Chapter03Test.java @@ -31,7 +31,7 @@ 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; #showGraph; } return c; #showGraph;"); + 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; @@ -40,7 +40,7 @@ public class Chapter03Test { @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); #showGraph;"); + 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(); assertEquals("return 8;", ret.print()); } diff --git a/chapter09/src/test/java/com/seaofnodes/simple/Chapter04Test.java b/chapter09/src/test/java/com/seaofnodes/simple/Chapter04Test.java index cde23324..e23a10b1 100644 --- a/chapter09/src/test/java/com/seaofnodes/simple/Chapter04Test.java +++ b/chapter09/src/test/java/com/seaofnodes/simple/Chapter04Test.java @@ -10,7 +10,7 @@ public class Chapter04Test { @Test public void testPeephole() { - Parser parser = new Parser("return 1+arg+2; #showGraph;"); + Parser parser = new Parser("return 1+arg+2; "); StopNode ret = parser.parse(); assertEquals("return (arg+3);", ret.print()); } @@ -38,7 +38,7 @@ public class Chapter04Test { @Test public void testPeephole3() { - Parser parser = new Parser("return 1+arg+2+arg+3; #showGraph;"); + Parser parser = new Parser("return 1+arg+2+arg+3; "); StopNode ret = parser.parse(); assertEquals("return ((arg*2)+6);", ret.print()); } @@ -52,7 +52,7 @@ public class Chapter04Test { @Test public void testVarArg() { - Parser parser = new Parser("return arg; #showGraph;"); + Parser parser = new Parser("return arg; "); StopNode stop = parser.parse(); ReturnNode ret = stop.ret(); assertTrue(ret.in(0) instanceof ProjNode); @@ -61,49 +61,49 @@ public class Chapter04Test { @Test public void testConstantArg() { - Parser parser = new Parser("return arg; #showGraph;", TypeInteger.constant(2)); + Parser parser = new Parser("return arg; ", TypeInteger.constant(2)); StopNode ret = parser.parse(); assertEquals("return 2;", ret.print()); } @Test public void testCompEq() { - Parser parser = new Parser("return 3==3; #showGraph;"); + Parser parser = new Parser("return 3==3; "); StopNode ret = parser.parse(); assertEquals("return 1;", ret.print()); } @Test public void testCompEq2() { - Parser parser = new Parser("return 3==4; #showGraph;"); + Parser parser = new Parser("return 3==4; "); StopNode ret = parser.parse(); assertEquals("return 0;", ret.print()); } @Test public void testCompNEq() { - Parser parser = new Parser("return 3!=3; #showGraph;"); + Parser parser = new Parser("return 3!=3; "); StopNode ret = parser.parse(); assertEquals("return 0;", ret.print()); } @Test public void testCompNEq2() { - Parser parser = new Parser("return 3!=4; #showGraph;"); + Parser parser = new Parser("return 3!=4; "); StopNode ret = parser.parse(); assertEquals("return 1;", ret.print()); } @Test public void testBug1() { - Parser parser = new Parser("int a=arg+1; int b=a; b=1; return a+2; #showGraph;"); + Parser parser = new Parser("int a=arg+1; int b=a; b=1; return a+2; "); StopNode ret = parser.parse(); assertEquals("return (arg+3);", ret.print()); } @Test public void testBug2() { - Parser parser = new Parser("int a=arg+1; a=a; return a; #showGraph;"); + Parser parser = new Parser("int a=arg+1; a=a; return a; "); StopNode ret = parser.parse(); assertEquals("return (arg+1);", ret.print()); } diff --git a/chapter09/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter09/src/test/java/com/seaofnodes/simple/Chapter05Test.java index c82914a1..6ad3af15 100644 --- a/chapter09/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter09/src/test/java/com/seaofnodes/simple/Chapter05Test.java @@ -17,11 +17,11 @@ if (arg == 1) a = arg+2; else { a = arg-3; - #showGraph; + } -#showGraph; + return a;"""); - StopNode ret = parser.parse().iterate(true); + StopNode ret = parser.parse().iterate(); assertEquals("return Phi(Region17,(arg+2),(arg-3));", ret.toString()); } @@ -36,7 +36,7 @@ if (arg == 1) { c = 4; } return c;""", TypeInteger.BOT); - StopNode ret = parser.parse().iterate(true); + StopNode ret = parser.parse().iterate(); assertEquals("return Phi(Region16,4,3);", ret.toString()); } @@ -48,7 +48,7 @@ if( arg==1 ) return 3; else return 4; -#showGraph;""", TypeInteger.BOT); +""", TypeInteger.BOT); StopNode stop = parser.parse(); assertEquals("Stop[ return 3; return 4; ]", stop.toString()); } @@ -64,7 +64,7 @@ if( arg==1 ) else b=a+1; return a+b;"""); - StopNode ret = parser.parse().iterate(true); + StopNode ret = parser.parse().iterate(); assertEquals("return ((arg*2)+Phi(Region20,2,3));", ret.toString()); } @@ -79,7 +79,7 @@ if( arg==1 ) else a=b+1; return a+b;"""); - StopNode ret = parser.parse().iterate(true); + StopNode ret = parser.parse().iterate(); assertEquals("return ((Phi(Region31,(arg*2),arg)+arg)+Phi(Region,4,5));", ret.toString()); } @@ -98,7 +98,7 @@ else if( arg==3 ) else a=5; return a; -#showGraph;""", TypeInteger.BOT); +""", TypeInteger.BOT); StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Region33,Phi(Region21,2,3),Phi(Region31,4,5));", stop.toString()); } @@ -114,7 +114,7 @@ if( arg ) if( arg==0 ) b=2; return arg+a+b; -#showGraph;""", TypeInteger.BOT); +""", TypeInteger.BOT); StopNode stop = parser.parse(); assertEquals("return ((arg+Phi(Region13,1,0))+Phi(Region22,2,0));", stop.toString()); } diff --git a/chapter09/src/test/java/com/seaofnodes/simple/Chapter06Test.java b/chapter09/src/test/java/com/seaofnodes/simple/Chapter06Test.java index e5961223..054e96e8 100644 --- a/chapter09/src/test/java/com/seaofnodes/simple/Chapter06Test.java +++ b/chapter09/src/test/java/com/seaofnodes/simple/Chapter06Test.java @@ -15,7 +15,7 @@ public class Chapter06Test { if( true ) return 2; return 1; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return 2;", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); } @@ -44,7 +44,7 @@ else a=3; return a; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return 2;", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); } @@ -64,7 +64,7 @@ if( a==2 ) else b=5; return b;""", TypeInteger.BOT); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Region32,42,5);", stop.toString()); } @@ -83,7 +83,7 @@ if( arg==2 ) else b=5; return b;""", TypeInteger.BOT); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Region29,2,5);", stop.toString()); } @@ -102,7 +102,7 @@ else if( arg==3 ) else a=5; return a; -#showGraph;""", TypeInteger.constant(2)); +""", TypeInteger.constant(2)); StopNode stop = parser.parse(); assertEquals("return 5;", stop.toString()); } @@ -123,7 +123,7 @@ else a=5; return a; """, TypeInteger.constant(1)); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return 3;", stop.toString()); } @@ -143,7 +143,7 @@ else a=5; return a; """, TypeInteger.BOT); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Region37,3,Phi(Region35,4,5));", stop.toString()); } @@ -163,7 +163,7 @@ else a=5; return a; """, TypeInteger.constant(1)); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return 3;", stop.toString()); } @@ -183,7 +183,7 @@ else a=5; return a; """, TypeInteger.constant(3)); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return 4;", stop.toString()); } @@ -199,7 +199,7 @@ if( arg ) { } return a+b; """); - StopNode ret = parser.parse().iterate(true); + StopNode ret = parser.parse().iterate(); assertEquals("return Phi(Region24,4,1);", ret.toString()); } @@ -216,7 +216,7 @@ if( arg ) { } return a+b; """, TypeInteger.constant(1)); - StopNode ret = parser.parse().iterate(true); + StopNode ret = parser.parse().iterate(); assertEquals("return 4;", ret.toString()); } @@ -232,7 +232,7 @@ if( arg ) { } return a+b; """, TypeInteger.constant(0)); - StopNode ret = parser.parse().iterate(true); + StopNode ret = parser.parse().iterate(); assertEquals("return 1;", ret.toString()); } @@ -250,7 +250,7 @@ if( arg ) { } return a+b+c; """); - StopNode ret = parser.parse().iterate(true); + StopNode ret = parser.parse().iterate(); assertEquals("return (Phi(Region35,Phi(Region22,2,3),0)+Phi(Region,3,1));", ret.toString()); } @@ -269,7 +269,7 @@ if( arg ) { } return a+b+c; """, TypeInteger.constant(1)); - StopNode ret = parser.parse().iterate(true); + StopNode ret = parser.parse().iterate(); assertEquals("return 6;", ret.toString()); } @@ -287,7 +287,7 @@ if( arg ) { } return a+b+c; """, TypeInteger.constant(2)); - StopNode ret = parser.parse().iterate(true); + StopNode ret = parser.parse().iterate(); assertEquals("return 5;", ret.toString()); } diff --git a/chapter09/src/test/java/com/seaofnodes/simple/Chapter07Test.java b/chapter09/src/test/java/com/seaofnodes/simple/Chapter07Test.java index 2c378623..adf10471 100644 --- a/chapter09/src/test/java/com/seaofnodes/simple/Chapter07Test.java +++ b/chapter09/src/test/java/com/seaofnodes/simple/Chapter07Test.java @@ -14,12 +14,11 @@ public class Chapter07Test { """ while(arg < 10) { arg = arg + 1; - #showGraph; } return arg; """); Node._disablePeephole = true; - StopNode stop = parser.parse(true); + StopNode stop = parser.parse(); assertEquals("return Phi(Loop6,arg,(Phi_arg+1));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); Node._disablePeephole = false; @@ -37,7 +36,7 @@ if(arg){}else{ } return a; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Region22,1,Phi(Loop11,1,(Phi_a+1)));", stop.toString()); } @@ -57,9 +56,8 @@ while(i < arg) { } return sum; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop8,0,Phi(Loop20,Phi_sum,(Phi_sum+Phi(Loop,0,(Phi_j+1)))));", stop.toString()); - System.out.println(IRPrinter.prettyPrint(stop,99)); } @Test @@ -75,11 +73,10 @@ while(a < 10) { return b; """); Node._disablePeephole = true; - StopNode stop = parser.parse(true); + StopNode stop = parser.parse(); assertEquals("return Phi(Loop8,2,Phi(Region26,Phi_b,4));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); Node._disablePeephole = false; - System.out.println(IRPrinter.prettyPrint(stop,99)); } @Test @@ -96,10 +93,9 @@ while(a < 10) { } return b; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop8,2,(Phi(Region26,Phi_b,4)+1));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); - System.out.println(IRPrinter.prettyPrint(stop,99)); } @@ -115,7 +111,7 @@ while(a < 10) { return a; """); Node._disablePeephole = true; - StopNode stop = parser.parse(true); + StopNode stop = parser.parse(); assertEquals("return Phi(Loop7,1,((Phi_a+1)+2));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); Node._disablePeephole = false; @@ -132,7 +128,7 @@ while(a < 10) { } return a; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop7,1,(Phi_a+3));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); } @@ -146,11 +142,10 @@ while(arg) a = 2; return a; """); Node._disablePeephole = true; - StopNode stop = parser.parse(true); + StopNode stop = parser.parse(); assertEquals("return Phi(Loop7,1,2);", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); Node._disablePeephole = false; - System.out.println(IRPrinter.prettyPrint(stop,99)); } @Test @@ -164,7 +159,6 @@ return a; StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop7,1,2);", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); - System.out.println(IRPrinter.prettyPrint(stop, 99)); } @Test @@ -179,7 +173,7 @@ while(a < 10) { return a; """); Node._disablePeephole = true; - StopNode stop = parser.parse(true); + StopNode stop = parser.parse(); assertEquals("return Phi(Loop7,1,((Phi_a+1)+2));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); Node._disablePeephole = false; @@ -196,7 +190,7 @@ while(a < 10) { } return a; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop7,1,(Phi_a+3));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); } @@ -214,7 +208,7 @@ while(a < 10) { return a; """); Node._disablePeephole = true; - StopNode stop = parser.parse(true); + StopNode stop = parser.parse(); assertEquals("return Phi(Loop8,1,((Phi_a+1)+2));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); Node._disablePeephole = false; @@ -232,7 +226,7 @@ while(a < 10) { } return a; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop8,1,(Phi_a+3));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); } diff --git a/chapter09/src/test/java/com/seaofnodes/simple/Chapter08Test.java b/chapter09/src/test/java/com/seaofnodes/simple/Chapter08Test.java index d78d5358..cea6dd0f 100644 --- a/chapter09/src/test/java/com/seaofnodes/simple/Chapter08Test.java +++ b/chapter09/src/test/java/com/seaofnodes/simple/Chapter08Test.java @@ -22,7 +22,7 @@ while(arg < 10) { } return arg; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Region36,Phi(Region25,Phi(Loop6,arg,(Phi_arg+1)),Add),Add);", stop.toString()); assertTrue(stop.ret().ctrl() instanceof RegionNode); Assert.assertEquals(5, GraphEvaluator.evaluate(stop, 1)); @@ -45,10 +45,9 @@ while(arg < 10) { } return a; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop7,1,Phi(Region42,Phi_a,(Phi_a+1)));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); - System.out.println(IRPrinter.prettyPrint(stop,99)); } @@ -65,7 +64,7 @@ while(arg < 10) { } return arg; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Region34,Phi(Loop6,arg,(Phi_arg+1)),Add);", stop.toString()); assertTrue(stop.ret().ctrl() instanceof RegionNode); } @@ -81,7 +80,7 @@ while(arg < 10) { } return arg; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Region25,Phi(Loop6,arg,(Phi_arg+1)),Add);", stop.toString()); assertTrue(stop.ret().ctrl() instanceof RegionNode); } @@ -100,7 +99,7 @@ while(arg < 10) { } return arg; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop6,arg,(Phi_arg+1));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); } @@ -117,7 +116,7 @@ while(arg < 10) { } return arg; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop6,arg,(Phi_arg+1));", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode); } @@ -133,15 +132,14 @@ while( arg < 10 ) { } return arg; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return arg;", stop.toString()); - System.out.println(IRPrinter.prettyPrint(stop,99)); } @Test public void testRegress2() { Parser parser = new Parser("if(1) return 0; else while(arg>--arg) arg=arg+1; return 0;"); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return 0;", stop.toString()); } @@ -169,7 +167,7 @@ while(arg < 10) { } return arg; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return arg;", stop.toString()); } @@ -186,7 +184,7 @@ while(arg < 10) { } return a; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Region28,Phi(Loop7,1,(Phi_a+1)),Add);", stop.toString()); assertTrue(stop.ret().ctrl() instanceof RegionNode); } @@ -202,7 +200,7 @@ while(1) { } return a; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return (Phi(Loop7,1,Add)+1);", stop.toString()); assertTrue(stop.ret().ctrl() instanceof ProjNode prj && prj._idx==1 ); } diff --git a/chapter09/src/test/java/com/seaofnodes/simple/Chapter09Test.java b/chapter09/src/test/java/com/seaofnodes/simple/Chapter09Test.java index 834ba3d4..5567299a 100644 --- a/chapter09/src/test/java/com/seaofnodes/simple/Chapter09Test.java +++ b/chapter09/src/test/java/com/seaofnodes/simple/Chapter09Test.java @@ -25,7 +25,7 @@ while(v0) { } return 0; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); } @Test @@ -41,7 +41,7 @@ else { } return x; """); - StopNode stop = parser.parse(true); + StopNode stop = parser.parse(); assertEquals("Stop[ return (arg*2); return (Mul+1); ]", stop.toString()); Assert.assertEquals(2, GraphEvaluator.evaluate(stop, 1)); Assert.assertEquals(23, GraphEvaluator.evaluate(stop, 11)); @@ -53,7 +53,7 @@ return x; """ return arg*arg-arg*arg; """); - StopNode stop = parser.parse(true); + StopNode stop = parser.parse(); assertEquals("return 0;", stop.toString()); Assert.assertEquals(0, GraphEvaluator.evaluate(stop, 1)); } @@ -68,7 +68,7 @@ while (arg < 10) { } return arg; """); - StopNode stop = parser.parse(true).iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop7,arg,(Phi_arg+2));", stop.toString()); Assert.assertEquals(11, GraphEvaluator.evaluate(stop, 1)); } @@ -85,7 +85,7 @@ while (arg < 10) { } return arg; """); - StopNode stop = parser.parse(true).iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop8,arg,(Phi_arg+4));", stop.toString()); Assert.assertEquals(13, GraphEvaluator.evaluate(stop, 1)); } @@ -114,7 +114,7 @@ while (arg) { } return arg; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop14,arg,(Phi_arg+1));", stop.toString()); } @@ -132,14 +132,14 @@ while(v1+arg) { v1=v2; } """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("Stop[ ]", stop.toString()); } @Test public void testWhile0() { Parser parser = new Parser("while(0) continue; if(0) arg=0;"); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("Stop[ ]", stop.toString()); } @@ -151,7 +151,7 @@ if(0) while(0) { while(0) {} } """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("Stop[ ]", stop.toString()); } @@ -159,14 +159,14 @@ if(0) while(0) { @Test public void testPrecedence() { Parser parser = new Parser("return 3-1+2;"); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return 4;", stop.toString()); } @Test public void testSwap2() { Parser parser = new Parser("return 1+(1+1);"); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return 3;", stop.toString()); } @@ -184,7 +184,7 @@ while(arg) { } return a; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop9,0,(-(Phi_a+3)));", stop.toString()); } @@ -198,7 +198,7 @@ arg=0; int v0=0!=0<-0; return -0+0+0; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("Stop[ ]", stop.toString()); } @@ -206,14 +206,14 @@ return -0+0+0; @Test public void testFuzz2() { Parser parser = new Parser("return 0+-0;"); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("return 0;", stop.toString()); } @Test public void testFuzz3() { Parser parser = new Parser("int v0=0; while(0==69) while(v0) return 0;"); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("Stop[ ]", stop.toString()); } @@ -225,7 +225,7 @@ while(1) { if(1<0) while(arg==-0) arg=arg-arg; } """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("Stop[ ]", stop.toString()); } @@ -247,7 +247,7 @@ while(1) { } return 0!=0; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("Stop[ ]", stop.toString()); } @@ -258,7 +258,7 @@ int v0=0; while(0==1) while(v0) v0=1+v0; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("Stop[ ]", stop.toString()); } @@ -274,14 +274,14 @@ while(1) v1=1; return v1+v0; """); - StopNode stop = parser.parse().iterate(true); + StopNode stop = parser.parse().iterate(); assertEquals("Stop[ ]", stop.toString()); } @Test public void testFuzz8() { - Parser parser = new Parser("while(arg) arg = arg - 1; #showGraph; return arg;"); - StopNode stop = parser.parse().iterate(true); + Parser parser = new Parser("while(arg) arg = arg - 1; return arg;"); + StopNode stop = parser.parse().iterate(); assertEquals("return Phi(Loop6,arg,(Phi_arg-1));", stop.toString()); } |