Turn off all printing during test runs

was making 10000 lines of ignored output

6 files changed, 49 insertions, 61 deletions

diff --git a/chapter07/src/test/java/com/seaofnodes/simple/Chapter02Test.java b/chapter07/src/test/java/com/seaofnodes/simple/Chapter02Test.java
index 4085ed7e..47cee096 100644
--- a/chapter07/src/test/java/com/seaofnodes/simple/Chapter02Test.java
+++ b/chapter07/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/chapter07/src/test/java/com/seaofnodes/simple/Chapter03Test.java b/chapter07/src/test/java/com/seaofnodes/simple/Chapter03Test.java
index 407fbe48..33e2e824 100644
--- a/chapter07/src/test/java/com/seaofnodes/simple/Chapter03Test.java
+++ b/chapter07/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/chapter07/src/test/java/com/seaofnodes/simple/Chapter04Test.java b/chapter07/src/test/java/com/seaofnodes/simple/Chapter04Test.java
index cde23324..2b6b5ae2 100644
--- a/chapter07/src/test/java/com/seaofnodes/simple/Chapter04Test.java
+++ b/chapter07/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/chapter07/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter07/src/test/java/com/seaofnodes/simple/Chapter05Test.java
index ea348968..5bb67817 100644
--- a/chapter07/src/test/java/com/seaofnodes/simple/Chapter05Test.java
+++ b/chapter07/src/test/java/com/seaofnodes/simple/Chapter05Test.java
@@ -17,11 +17,9 @@ if (arg == 1)
     a = arg+2;
 else {
     a = arg-3;
-    #showGraph;
 }
-#showGraph;
 return a;""");
-        StopNode ret = parser.parse(true);
+        StopNode ret = parser.parse();
         assertEquals("return Phi(Region17,(arg+2),(arg-3));", ret.toString());
     }
 
@@ -36,7 +34,7 @@ if (arg == 1) {
     c = 4;
 }
 return c;""", TypeInteger.BOT);
-        StopNode ret = parser.parse(true);
+        StopNode ret = parser.parse();
         assertEquals("return Phi(Region16,4,3);", ret.toString());
     }
 
@@ -48,7 +46,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 +62,7 @@ if( arg==1 )
 else
     b=a+1;
 return a+b;""");
-        StopNode ret = parser.parse(true);
+        StopNode ret = parser.parse();
         assertEquals("return ((arg*2)+Phi(Region20,2,3));", ret.toString());
     }
 
@@ -79,7 +77,7 @@ if( arg==1 )
 else
     a=b+1;
 return a+b;""");
-        StopNode ret = parser.parse(true);
+        StopNode ret = parser.parse();
         assertEquals("return ((Phi(Region31,(arg*2),arg)+arg)+Phi(Region,4,5));", ret.toString());
     }
 
@@ -98,7 +96,7 @@ else if( arg==3 )
 else
     a=5;
 return a;
-#showGraph;""", TypeInteger.BOT);
+""", TypeInteger.BOT);
         StopNode stop = parser.parse();
         assertEquals("return Phi(Region33,Phi(Region21,2,3),Phi(Region31,4,5));", stop.toString());
     }
@@ -114,7 +112,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());
     }
@@ -129,7 +127,7 @@ if( arg==1 )
     a=arg==3;
 }
 return a;""");
-        StopNode ret = parser.parse(true);
+        StopNode ret = parser.parse();
         assertEquals("return (arg==Phi(Region16,3,2));", ret.toString());
     }
 
diff --git a/chapter07/src/test/java/com/seaofnodes/simple/Chapter06Test.java b/chapter07/src/test/java/com/seaofnodes/simple/Chapter06Test.java
index 618c8ca6..00d725bc 100644
--- a/chapter07/src/test/java/com/seaofnodes/simple/Chapter06Test.java
+++ b/chapter07/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(true);
+        StopNode stop = parser.parse();
         assertEquals("return 2;", stop.toString());
         assertTrue(stop.ret().ctrl() instanceof ProjNode);
     }
@@ -29,7 +29,7 @@ if (arg)
     a = 2;
 return (arg < a) < 3;
 """);
-        StopNode stop = parser.parse(false);
+        StopNode stop = parser.parse();
         assertEquals("return ((arg<Phi(Region12,2,1))<3);", stop.toString());
     }
 
@@ -44,7 +44,7 @@ else
   a=3;
 return a;
 """);
-        StopNode stop = parser.parse(true);
+        StopNode stop = parser.parse();
         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(true);
+        StopNode stop = parser.parse();
         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(true);
+        StopNode stop = parser.parse();
         assertEquals("return Phi(Region28,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(true);
+        StopNode stop = parser.parse();
         assertEquals("return 3;", stop.toString());
     }
 
@@ -143,7 +143,7 @@ else
     a=5;
 return a;
 """, TypeInteger.BOT);
-        StopNode stop = parser.parse(true);
+        StopNode stop = parser.parse();
         assertEquals("return Phi(Region36,3,Phi(Region34,4,5));", stop.toString());
     }
 
@@ -163,7 +163,7 @@ else
     a=5;
 return a;
 """, TypeInteger.constant(1));
-        StopNode stop = parser.parse(true);
+        StopNode stop = parser.parse();
         assertEquals("return 3;", stop.toString());
     }
 
@@ -183,7 +183,7 @@ else
     a=5;
 return a;
 """, TypeInteger.constant(3));
-        StopNode stop = parser.parse(true);
+        StopNode stop = parser.parse();
         assertEquals("return 4;", stop.toString());
     }
 
@@ -199,7 +199,7 @@ if( arg ) {
 }
 return a+b;
 """);
-        StopNode ret = parser.parse(true);
+        StopNode ret = parser.parse();
         assertEquals("return Phi(Region22,4,1);", ret.toString());
     }
 
@@ -216,7 +216,7 @@ if( arg ) {
 }
 return a+b;
 """, TypeInteger.constant(1));
-        StopNode ret = parser.parse(true);
+        StopNode ret = parser.parse();
         assertEquals("return 4;", ret.toString());
     }
 
@@ -232,7 +232,7 @@ if( arg ) {
 }
 return a+b;
 """, TypeInteger.constant(0));
-        StopNode ret = parser.parse(true);
+        StopNode ret = parser.parse();
         assertEquals("return 1;", ret.toString());
     }
 
@@ -250,7 +250,7 @@ if( arg ) {
 }
 return a+b+c;
 """);
-        StopNode ret = parser.parse(true);
+        StopNode ret = parser.parse();
         assertEquals("return (Phi(Region33,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(true);
+        StopNode ret = parser.parse();
         assertEquals("return 6;", ret.toString());
     }
 
@@ -287,7 +287,7 @@ if( arg ) {
 }
 return a+b+c;
 """, TypeInteger.constant(2));
-        StopNode ret = parser.parse(true);
+        StopNode ret = parser.parse();
         assertEquals("return 5;", ret.toString());
     }
 
diff --git a/chapter07/src/test/java/com/seaofnodes/simple/Chapter07Test.java b/chapter07/src/test/java/com/seaofnodes/simple/Chapter07Test.java
index 2e34b520..189fcf66 100644
--- a/chapter07/src/test/java/com/seaofnodes/simple/Chapter07Test.java
+++ b/chapter07/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(true);
+        StopNode stop = parser.parse();
         assertEquals("return Phi(Region23,1,Phi(Loop11,1,(Phi_a+1)));", stop.toString());
     }
 
@@ -57,9 +56,8 @@ while(i < arg) {
 }
 return sum;
 """);
-        StopNode stop = parser.parse(true);
+        StopNode stop = parser.parse();
         assertEquals("return Phi(Loop8,0,Phi(Loop21,Phi_sum,(Phi(Loop,0,(Phi_j+1))+Phi_sum)));", 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(Region27,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(true);
+        StopNode stop = parser.parse();
         assertEquals("return Phi(Loop8,2,(Phi(Region27,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(true);
+        StopNode stop = parser.parse();
         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
@@ -161,10 +156,9 @@ int a = 1;
 while(arg) a = 2;
 return a;
 """);
-        StopNode stop = parser.parse(false);
+        StopNode stop = parser.parse();
         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(true);
+        StopNode stop = parser.parse();
         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(true);
+        StopNode stop = parser.parse();
         assertEquals("return Phi(Loop8,1,(Phi_a+3));", stop.toString());
         assertTrue(stop.ret().ctrl() instanceof ProjNode);
     }