Add shared graph viewer to all chapters

3 files changed, 12 insertions, 16 deletions

diff --git a/chapter04/src/test/java/com/seaofnodes/simple/Chapter02Test.java b/chapter04/src/test/java/com/seaofnodes/simple/Chapter02Test.java
index 60ee8874..9de09d21 100644
--- a/chapter04/src/test/java/com/seaofnodes/simple/Chapter02Test.java
+++ b/chapter04/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
         ReturnNode 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;");
         ReturnNode ret = parser.parse();
         assertEquals("return 2;", ret.print());
-        GraphVisualizer gv = new GraphVisualizer();
-        System.out.println(gv.generateDotOutput(parser));
     }
 
 }
diff --git a/chapter04/src/test/java/com/seaofnodes/simple/Chapter03Test.java b/chapter04/src/test/java/com/seaofnodes/simple/Chapter03Test.java
index fc8e97b6..6a5d7072 100644
--- a/chapter04/src/test/java/com/seaofnodes/simple/Chapter03Test.java
+++ b/chapter04/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;
         ReturnNode 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); ");
         ReturnNode ret = parser.parse();
         assertEquals("return 8;", ret.print());
     }
diff --git a/chapter04/src/test/java/com/seaofnodes/simple/Chapter04Test.java b/chapter04/src/test/java/com/seaofnodes/simple/Chapter04Test.java
index faae0aee..28912d5d 100644
--- a/chapter04/src/test/java/com/seaofnodes/simple/Chapter04Test.java
+++ b/chapter04/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; ");
         ReturnNode 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; ");
         ReturnNode 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;", TypeInteger.BOT);
+        Parser parser = new Parser("return arg; ", TypeInteger.BOT);
         ReturnNode ret = parser.parse();
         assertTrue(ret.in(0) instanceof ProjNode);
         assertTrue(ret.in(1) instanceof ProjNode);
@@ -60,49 +60,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));
         ReturnNode 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; ");
         ReturnNode 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; ");
         ReturnNode 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; ");
         ReturnNode 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; ");
         ReturnNode 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; ");
         ReturnNode 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; ");
         ReturnNode ret = parser.parse();
         assertEquals("return (arg+1);", ret.print());
     }