From fd8442075faa603b3956d51d81486424624c5355 Mon Sep 17 00:00:00 2001
From: Thalia Archibald <thalia@archibald.dev>
Date: Fri, 21 Jun 2024 12:58:51 -0700
Subject: Backport tests (#87)

* Fix unexpected number parse errors

* Add chapter titles

* Split test files by chapter

* Backport rename Fuzzer08Test to FuzzerWrap

* Replace graph build scripts with Makefile

* Backport Chapter05Test.testRegress1

* Backport require space after 'return'

* Backport check EOF after return statement
---
 .../main/java/com/seaofnodes/simple/Parser.java    |  10 +-
 .../java/com/seaofnodes/simple/Chapter01Test.java  | 100 +++
 .../java/com/seaofnodes/simple/Chapter02Test.java  |  66 ++
 .../java/com/seaofnodes/simple/Chapter03Test.java  |  68 ++
 .../java/com/seaofnodes/simple/Chapter04Test.java  | 128 ++++
 .../java/com/seaofnodes/simple/Chapter05Test.java  | 214 ++++++
 .../java/com/seaofnodes/simple/Chapter06Test.java  | 294 ++++++++
 .../java/com/seaofnodes/simple/Chapter07Test.java  | 812 +--------------------
 8 files changed, 890 insertions(+), 802 deletions(-)
 create mode 100644 chapter07/src/test/java/com/seaofnodes/simple/Chapter01Test.java
 create mode 100644 chapter07/src/test/java/com/seaofnodes/simple/Chapter02Test.java
 create mode 100644 chapter07/src/test/java/com/seaofnodes/simple/Chapter03Test.java
 create mode 100644 chapter07/src/test/java/com/seaofnodes/simple/Chapter04Test.java
 create mode 100644 chapter07/src/test/java/com/seaofnodes/simple/Chapter05Test.java
 create mode 100644 chapter07/src/test/java/com/seaofnodes/simple/Chapter06Test.java

(limited to 'chapter07/src')

diff --git a/chapter07/src/main/java/com/seaofnodes/simple/Parser.java b/chapter07/src/main/java/com/seaofnodes/simple/Parser.java
index 349b2ce7..b4418ced 100644
--- a/chapter07/src/main/java/com/seaofnodes/simple/Parser.java
+++ b/chapter07/src/main/java/com/seaofnodes/simple/Parser.java
@@ -547,6 +547,7 @@ public class Parser {
         String getAnyNextToken() {
             if (isEOF()) return "";
             if (isIdStart(peek())) return parseId();
+            if (isNumber(peek())) return parseNumberString();
             if (isPunctuation(peek())) return parsePunctuation();
             return String.valueOf(peek());
         }
@@ -555,13 +556,16 @@ public class Parser {
         boolean isNumber(char ch) {return Character.isDigit(ch);}
 
         private Type parseNumber() {
-            int start = _position;
-            while (isNumber(nextChar())) ;
-            String snum = new String(_input, start, --_position - start);
+            String snum = parseNumberString();
             if (snum.length() > 1 && snum.charAt(0) == '0')
                 throw error("Syntax error: integer values cannot start with '0'");
             return TypeInteger.constant(Long.parseLong(snum));
         }
+        private String parseNumberString() {
+            int start = _position;
+            while (isNumber(nextChar())) ;
+            return new String(_input, start, --_position - start);
+        }
 
         // First letter of an identifier
         private boolean isIdStart(char ch) {
diff --git a/chapter07/src/test/java/com/seaofnodes/simple/Chapter01Test.java b/chapter07/src/test/java/com/seaofnodes/simple/Chapter01Test.java
new file mode 100644
index 00000000..547c36f8
--- /dev/null
+++ b/chapter07/src/test/java/com/seaofnodes/simple/Chapter01Test.java
@@ -0,0 +1,100 @@
+package com.seaofnodes.simple;
+
+import com.seaofnodes.simple.node.*;
+import com.seaofnodes.simple.type.TypeInteger;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class Chapter01Test {
+
+    @Test
+    public void testSimpleProgram() {
+        Parser parser = new Parser("return 1;");
+        StopNode stop = parser.parse();
+        StartNode start = Parser.START;
+        ReturnNode ret = (ReturnNode)stop.in(0);
+
+        assertTrue(ret.ctrl() instanceof ProjNode);
+        Node expr = ret.expr();
+        if( expr instanceof ConstantNode con ) {
+            assertEquals(start,con.in(0));
+            assertEquals(TypeInteger.constant(1), con._type);
+        } else {
+            fail();
+        }
+    }
+
+    @Test
+    public void testZero() {
+        Parser parser = new Parser("return 0;");
+        parser.parse();
+        StartNode start = Parser.START;
+        for( Node use : start._outputs )
+            if( use instanceof ConstantNode con )
+                assertEquals(TypeInteger.constant(0),con._type);
+    }
+
+    @Test
+    public void testBad1() {
+        try {
+            new Parser("ret").parse();
+            fail();
+        } catch( RuntimeException e ) {
+            assertEquals("Syntax error, expected =: ",e.getMessage());
+        }
+    }
+
+    @Test
+    public void testBad2() {
+        try {
+            new Parser("return 0123;").parse();
+            fail();
+        } catch( RuntimeException e ) {
+            assertEquals("Syntax error: integer values cannot start with '0'",e.getMessage());
+        }
+    }
+
+    @Test
+    public void testNotBad3() {
+        // this test used to fail in chapter 1
+        assertEquals("return 12;", new Parser("return --12;").parse().print());
+    }
+
+    @Test
+    public void testBad4() {
+        try {
+            new Parser("return 100").parse();
+            fail();
+        } catch( RuntimeException e ) {
+            assertEquals("Syntax error, expected ;: ",e.getMessage());
+        }
+    }
+
+    @Test
+    public void testNotBad5() {
+        // this test used to fail in chapter 1
+        assertEquals("return -100;", new Parser("return -100;").parse().print());
+    }
+
+    @Test
+    public void testBad6() {
+        try {
+            new Parser("return100").parse();
+            fail();
+        } catch( RuntimeException e ) {
+            assertEquals("Syntax error, expected =: ",e.getMessage());
+        }
+    }
+
+    @Test
+    public void testBad7() {
+        try {
+            new Parser("return 1;}").parse();
+            fail();
+        } catch( RuntimeException e ) {
+            assertEquals("Syntax error, unexpected }",e.getMessage());
+        }
+    }
+
+}
diff --git a/chapter07/src/test/java/com/seaofnodes/simple/Chapter02Test.java b/chapter07/src/test/java/com/seaofnodes/simple/Chapter02Test.java
new file mode 100644
index 00000000..4085ed7e
--- /dev/null
+++ b/chapter07/src/test/java/com/seaofnodes/simple/Chapter02Test.java
@@ -0,0 +1,66 @@
+package com.seaofnodes.simple;
+
+import com.seaofnodes.simple.node.*;
+import com.seaofnodes.simple.type.TypeInteger;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+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());
+        GraphVisualizer gv = new GraphVisualizer();
+        System.out.println(gv.generateDotOutput(parser));
+        Node._disablePeephole = false;
+    }
+
+    @Test
+    public void testAddPeephole() {
+        Parser parser = new Parser("return 1+2;");
+        StopNode ret = parser.parse();
+        assertEquals("return 3;", ret.print());
+    }
+
+    @Test
+    public void testSubPeephole() {
+        Parser parser = new Parser("return 1-2;");
+        StopNode ret = parser.parse();
+        assertEquals("return -1;", ret.print());
+    }
+
+    @Test
+    public void testMulPeephole() {
+        Parser parser = new Parser("return 2*3;");
+        StopNode ret = parser.parse();
+        assertEquals("return 6;", ret.print());
+    }
+
+    @Test
+    public void testDivPeephole() {
+        Parser parser = new Parser("return 6/3;");
+        StopNode ret = parser.parse();
+        assertEquals("return 2;", ret.print());
+    }
+
+    @Test
+    public void testMinusPeephole() {
+        Parser parser = new Parser("return 6/-3;");
+        StopNode ret = parser.parse();
+        assertEquals("return -2;", ret.print());
+    }
+
+    @Test
+    public void testExample() {
+        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
new file mode 100644
index 00000000..407fbe48
--- /dev/null
+++ b/chapter07/src/test/java/com/seaofnodes/simple/Chapter03Test.java
@@ -0,0 +1,68 @@
+package com.seaofnodes.simple;
+
+import com.seaofnodes.simple.node.*;
+import com.seaofnodes.simple.type.TypeInteger;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class Chapter03Test {
+
+    @Test
+    public void testVarDecl() {
+        Parser parser = new Parser("int a=1; return a;");
+        StopNode ret = parser.parse();
+        assertEquals("return 1;", ret.print());
+    }
+
+    @Test
+    public void testVarAdd() {
+        Parser parser = new Parser("int a=1; int b=2; return a+b;");
+        StopNode ret = parser.parse();
+        assertEquals("return 3;", ret.print());
+    }
+
+    @Test
+    public void testVarScope() {
+        Parser parser = new Parser("int a=1; int b=2; int c=0; { int b=3; c=a+b; } return c;");
+        StopNode ret = parser.parse();
+        assertEquals("return 4;", ret.print());
+    }
+
+    @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;");
+        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); #showGraph;");
+        StopNode ret = parser.parse();
+        assertEquals("return 8;", ret.print());
+    }
+
+    @Test
+    public void testSelfAssign() {
+        try {
+            new Parser("int a=a; return a;").parse();
+            fail();
+        } catch( RuntimeException e ) {
+            assertEquals("Undefined name 'a'",e.getMessage());
+        }
+    }
+
+    @Test
+    public void testBad1() {
+        try {
+            new Parser("int a=1; int b=2; int c=0; { int b=3; c=a+b;").parse();
+            fail();
+        } catch( RuntimeException e ) {
+            assertEquals("Syntax error, expected }: ",e.getMessage());
+        }
+    }
+
+}
diff --git a/chapter07/src/test/java/com/seaofnodes/simple/Chapter04Test.java b/chapter07/src/test/java/com/seaofnodes/simple/Chapter04Test.java
new file mode 100644
index 00000000..cde23324
--- /dev/null
+++ b/chapter07/src/test/java/com/seaofnodes/simple/Chapter04Test.java
@@ -0,0 +1,128 @@
+package com.seaofnodes.simple;
+
+import com.seaofnodes.simple.node.*;
+import com.seaofnodes.simple.type.TypeInteger;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class Chapter04Test {
+
+    @Test
+    public void testPeephole() {
+        Parser parser = new Parser("return 1+arg+2; #showGraph;");
+        StopNode ret = parser.parse();
+        assertEquals("return (arg+3);", ret.print());
+    }
+
+    @Test
+    public void testPeephole2() {
+        Parser parser = new Parser("return (1+arg)+2;");
+        StopNode ret = parser.parse();
+        assertEquals("return (arg+3);", ret.print());
+    }
+
+    @Test
+    public void testAdd0() {
+        Parser parser = new Parser("return 0+arg;");
+        StopNode ret = parser.parse();
+        assertEquals("return arg;", ret.print());
+    }
+
+    @Test
+    public void testAddAddMul() {
+        Parser parser = new Parser("return arg+0+arg;");
+        StopNode ret = parser.parse();
+        assertEquals("return (arg*2);", ret.print());
+    }
+
+    @Test
+    public void testPeephole3() {
+        Parser parser = new Parser("return 1+arg+2+arg+3; #showGraph;");
+        StopNode ret = parser.parse();
+        assertEquals("return ((arg*2)+6);", ret.print());
+    }
+
+    @Test
+    public void testMul1() {
+        Parser parser = new Parser("return 1*arg;");
+        StopNode ret = parser.parse();
+        assertEquals("return arg;", ret.print());
+    }
+
+    @Test
+    public void testVarArg() {
+        Parser parser = new Parser("return arg; #showGraph;");
+        StopNode stop = parser.parse();
+        ReturnNode ret = stop.ret();
+        assertTrue(ret.in(0) instanceof ProjNode);
+        assertTrue(ret.in(1) instanceof ProjNode);
+    }
+
+    @Test
+    public void testConstantArg() {
+        Parser parser = new Parser("return arg; #showGraph;", TypeInteger.constant(2));
+        StopNode ret = parser.parse();
+        assertEquals("return 2;", ret.print());
+    }
+
+    @Test
+    public void testCompEq() {
+        Parser parser = new Parser("return 3==3; #showGraph;");
+        StopNode ret = parser.parse();
+        assertEquals("return 1;", ret.print());
+    }
+
+    @Test
+    public void testCompEq2() {
+        Parser parser = new Parser("return 3==4; #showGraph;");
+        StopNode ret = parser.parse();
+        assertEquals("return 0;", ret.print());
+    }
+
+    @Test
+    public void testCompNEq() {
+        Parser parser = new Parser("return 3!=3; #showGraph;");
+        StopNode ret = parser.parse();
+        assertEquals("return 0;", ret.print());
+    }
+
+    @Test
+    public void testCompNEq2() {
+        Parser parser = new Parser("return 3!=4; #showGraph;");
+        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;");
+        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;");
+        StopNode ret = parser.parse();
+        assertEquals("return (arg+1);", ret.print());
+    }
+
+    @Test
+    public void testBug3() {
+        try {
+            new Parser("inta=1; return a;").parse();
+            fail();
+        } catch( RuntimeException e ) {
+            assertEquals("Undefined name 'inta'",e.getMessage());
+        }
+    }
+
+    @Test
+    public void testBug4() {
+        Parser parser = new Parser("return -arg;");
+        StopNode ret = parser.parse();
+        assertEquals("return (-arg);", ret.print());
+    }
+
+}
diff --git a/chapter07/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter07/src/test/java/com/seaofnodes/simple/Chapter05Test.java
new file mode 100644
index 00000000..99e35d0a
--- /dev/null
+++ b/chapter07/src/test/java/com/seaofnodes/simple/Chapter05Test.java
@@ -0,0 +1,214 @@
+package com.seaofnodes.simple;
+
+import com.seaofnodes.simple.node.*;
+import com.seaofnodes.simple.type.TypeInteger;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import static org.junit.Assert.*;
+
+public class Chapter05Test {
+
+    @Test
+    public void testIfStmt() {
+        Parser parser = new Parser(
+"""
+int a = 1;
+if (arg == 1)
+    a = arg+2;
+else {
+    a = arg-3;
+    #showGraph;
+}
+#showGraph;
+return a;""");
+        StopNode ret = parser.parse(true);
+        assertEquals("return Phi(Region17,(arg+2),(arg-3));", ret.toString());
+    }
+
+    @Test
+    public void testTest() {
+        Parser parser = new Parser(
+"""
+int c = 3;
+int b = 2;
+if (arg == 1) {
+    b = 3;
+    c = 4;
+}
+return c;""", TypeInteger.BOT);
+        StopNode ret = parser.parse(true);
+        assertEquals("return Phi(Region16,4,3);", ret.toString());
+    }
+
+    @Test
+    public void testReturn2() {
+        Parser parser = new Parser(
+"""
+if( arg==1 )
+    return 3;
+else
+    return 4;
+#showGraph;""", TypeInteger.BOT);
+        StopNode stop = parser.parse();
+        assertEquals("Stop[ return 3; return 4; ]", stop.toString());
+    }
+
+    @Test
+    public void testIfMergeB() {
+        Parser parser = new Parser(
+"""
+int a=arg+1;
+int b=0;
+if( arg==1 )
+    b=a;
+else
+    b=a+1;
+return a+b;""");
+        StopNode ret = parser.parse(true);
+        assertEquals("return ((arg*2)+Phi(Region20,2,3));", ret.toString());
+    }
+
+    @Test
+    public void testIfMerge2() {
+        Parser parser = new Parser(
+"""
+int a=arg+1;
+int b=arg+2;
+if( arg==1 )
+    b=b+a;
+else
+    a=b+1;
+return a+b;""");
+        StopNode ret = parser.parse(true);
+        assertEquals("return ((Phi(Region31,(arg*2),arg)+arg)+Phi(Region,4,5));", ret.toString());
+    }
+
+    @Test
+    public void testMerge3() {
+        Parser parser = new Parser(
+"""
+int a=1;
+if( arg==1 )
+    if( arg==2 )
+        a=2;
+    else
+        a=3;
+else if( arg==3 )
+    a=4;
+else
+    a=5;
+return a;
+#showGraph;""", TypeInteger.BOT);
+        StopNode stop = parser.parse();
+        assertEquals("return Phi(Region33,Phi(Region21,2,3),Phi(Region31,4,5));", stop.toString());
+    }
+
+    @Test
+    public void testMerge4() {
+        Parser parser = new Parser(
+"""
+int a=0;
+int b=0;
+if( arg )
+    a=1;
+if( arg==0 )
+    b=2;
+return arg+a+b;
+#showGraph;""", TypeInteger.BOT);
+        StopNode stop = parser.parse();
+        assertEquals("return ((arg+Phi(Region13,1,0))+Phi(Region22,2,0));", stop.toString());
+    }
+
+    @Test
+    public void testMerge5() {
+        Parser parser = new Parser(
+"""
+int a=arg==2;
+if( arg==1 )
+{
+    a=arg==3;
+}
+return a;""");
+        StopNode ret = parser.parse(true);
+        assertEquals("return (arg==Phi(Region16,3,2));", ret.toString());
+    }
+
+    @Test
+    public void testTrue() {
+      StopNode stop = new Parser("return true;").parse();
+      assertEquals("return 1;",stop.toString());
+    }
+
+    @Test
+    public void testHalfDef() {
+        try {
+            new Parser("if( arg==1 ) int b=2; return b;").parse();
+            fail();
+        } catch( RuntimeException e ) {
+            assertEquals("Cannot define a new name on one arm of an if",e.getMessage());
+        }
+    }
+
+    @Test
+    public void testHalfDef2() {
+        try {
+            new Parser("if( arg==1 ) { int b=2; } else { int b=3; } return b;").parse();
+            fail();
+        } catch( RuntimeException e ) {
+            assertEquals("Undefined name 'b'",e.getMessage());
+        }
+    }
+
+    @Test
+    public void testRegress1() {
+        try {
+            new Parser("if(arg==2) int a=1; else int b=2; return a;").parse();
+            fail();
+        } catch( RuntimeException e ) {
+            assertEquals("Cannot define a new name on one arm of an if",e.getMessage());
+        }
+    }
+
+    @Test
+    public void testBadNum() {
+        try {
+            new Parser("return 1-;").parse();
+            fail();
+        } catch( RuntimeException e ) {
+            assertEquals("Syntax error, expected an identifier or expression: ;",e.getMessage());
+        }
+    }
+
+    @Test
+    public void testKeyword1() {
+        try {
+            new Parser("int true=0; return true;").parse();
+            fail();
+        } catch( RuntimeException e ) {
+            assertEquals("Expected an identifier, found 'true'",e.getMessage());
+        }
+    }
+
+    @Test
+    public void testKeyword2() {
+        try {
+            new Parser("int else=arg; if(else) else=2; else else=1; return else;").parse();
+            fail();
+        } catch( RuntimeException e ) {
+            assertEquals("Expected an identifier, found 'else'",e.getMessage());
+        }
+    }
+
+    @Test
+    public void testKeyword3() {
+        try {
+            new Parser("int a=1; ififif(arg)inta=2;return a;").parse();
+            fail();
+        } catch( RuntimeException e ) {
+            assertEquals("Syntax error, expected =: (",e.getMessage());
+        }
+    }
+
+}
diff --git a/chapter07/src/test/java/com/seaofnodes/simple/Chapter06Test.java b/chapter07/src/test/java/com/seaofnodes/simple/Chapter06Test.java
new file mode 100644
index 00000000..618c8ca6
--- /dev/null
+++ b/chapter07/src/test/java/com/seaofnodes/simple/Chapter06Test.java
@@ -0,0 +1,294 @@
+package com.seaofnodes.simple;
+
+import com.seaofnodes.simple.node.*;
+import com.seaofnodes.simple.type.TypeInteger;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class Chapter06Test {
+
+    @Test
+    public void testPeepholeReturn() {
+        Parser parser = new Parser(
+"""
+if( true ) return 2;
+return 1;
+""");
+        StopNode stop = parser.parse(true);
+        assertEquals("return 2;", stop.toString());
+        assertTrue(stop.ret().ctrl() instanceof ProjNode);
+    }
+
+    @Test
+    public void testPeepholeRotate() {
+        Parser parser = new Parser(
+"""
+int a = 1;
+if (arg)
+    a = 2;
+return (arg < a) < 3;
+""");
+        StopNode stop = parser.parse(false);
+        assertEquals("return ((arg<Phi(Region12,2,1))<3);", stop.toString());
+    }
+
+    @Test
+    public void testPeepholeCFG() {
+        Parser parser = new Parser(
+"""
+int a=1;
+if( true )
+  a=2;
+else
+  a=3;
+return a;
+""");
+        StopNode stop = parser.parse(true);
+        assertEquals("return 2;", stop.toString());
+        assertTrue(stop.ret().ctrl() instanceof ProjNode);
+    }
+
+    @Test
+    public void testIfIf() {
+        Parser parser = new Parser(
+"""
+int a=1;
+if( arg!=1 )
+    a=2;
+else
+    a=3;
+int b=4;
+if( a==2 )
+    b=42;
+else
+    b=5;
+return b;""", TypeInteger.BOT);
+        StopNode stop = parser.parse(true);
+        assertEquals("return Phi(Region32,42,5);", stop.toString());
+    }
+
+    @Test
+    public void testIfArgIf() {
+        Parser parser = new Parser(
+"""
+int a=1;
+if( 1==1 )
+    a=2;
+else
+    a=3;
+int b=4;
+if( arg==2 )
+    b=a;
+else
+    b=5;
+return b;""", TypeInteger.BOT);
+        StopNode stop = parser.parse(true);
+        assertEquals("return Phi(Region28,2,5);", stop.toString());
+    }
+
+    @Test
+    public void testMerge3With2() {
+        Parser parser = new Parser(
+"""
+int a=1;
+if( arg==1 )
+    if( arg==2 )
+        a=2;
+    else
+        a=3;
+else if( arg==3 )
+    a=4;
+else
+    a=5;
+return a;
+#showGraph;""", TypeInteger.constant(2));
+        StopNode stop = parser.parse();
+        assertEquals("return 5;", stop.toString());
+    }
+
+    @Test
+    public void testMerge3With1() {
+        Parser parser = new Parser(
+"""
+int a=1;
+if( arg==1 )
+    if( arg==2 )
+        a=2;
+    else
+        a=3;
+else if( arg==3 )
+    a=4;
+else
+    a=5;
+return a;
+""", TypeInteger.constant(1));
+        StopNode stop = parser.parse(true);
+        assertEquals("return 3;", stop.toString());
+    }
+
+    @Test
+    public void testMerge3Peephole() {
+        Parser parser = new Parser(
+"""
+int a=1;
+if( arg==1 )
+    if( 1==2 )
+        a=2;
+    else
+        a=3;
+else if( arg==3 )
+    a=4;
+else
+    a=5;
+return a;
+""", TypeInteger.BOT);
+        StopNode stop = parser.parse(true);
+        assertEquals("return Phi(Region36,3,Phi(Region34,4,5));", stop.toString());
+    }
+
+    @Test
+    public void testMerge3Peephole1() {
+        Parser parser = new Parser(
+"""
+int a=1;
+if( arg==1 )
+    if( 1==2 )
+        a=2;
+    else
+        a=3;
+else if( arg==3 )
+    a=4;
+else
+    a=5;
+return a;
+""", TypeInteger.constant(1));
+        StopNode stop = parser.parse(true);
+        assertEquals("return 3;", stop.toString());
+    }
+
+    @Test
+    public void testMerge3Peephole3() {
+        Parser parser = new Parser(
+"""
+int a=1;
+if( arg==1 )
+    if( 1==2 )
+        a=2;
+    else
+        a=3;
+else if( arg==3 )
+    a=4;
+else
+    a=5;
+return a;
+""", TypeInteger.constant(3));
+        StopNode stop = parser.parse(true);
+        assertEquals("return 4;", stop.toString());
+    }
+
+    @Test
+    public void testDemo1NonConst() {
+        Parser parser = new Parser("""
+int a = 0;
+int b = 1;
+if( arg ) {
+    a = 2;
+    if( arg ) { b = 2; }
+    else b = 3;
+}
+return a+b;
+""");
+        StopNode ret = parser.parse(true);
+        assertEquals("return Phi(Region22,4,1);", ret.toString());
+    }
+
+
+    @Test
+    public void testDemo1True() {
+        Parser parser = new Parser("""
+int a = 0;
+int b = 1;
+if( arg ) {
+    a = 2;
+    if( arg ) { b = 2; }
+    else b = 3;
+}
+return a+b;
+""", TypeInteger.constant(1));
+        StopNode ret = parser.parse(true);
+        assertEquals("return 4;", ret.toString());
+    }
+
+    @Test
+    public void testDemo1False() {
+        Parser parser = new Parser("""
+int a = 0;
+int b = 1;
+if( arg ) {
+    a = 2;
+    if( arg ) { b = 2; }
+    else b = 3;
+}
+return a+b;
+""", TypeInteger.constant(0));
+        StopNode ret = parser.parse(true);
+        assertEquals("return 1;", ret.toString());
+    }
+
+    @Test
+    public void testDemo2NonConst() {
+        Parser parser = new Parser("""
+int a = 0;
+int b = 1;
+int c = 0;
+if( arg ) {
+    a = 1;
+    if( arg==2 ) { c=2; } else { c=3; }
+    if( arg ) { b = 2; }
+    else b = 3;
+}
+return a+b+c;
+""");
+        StopNode ret = parser.parse(true);
+        assertEquals("return (Phi(Region33,Phi(Region22,2,3),0)+Phi(Region,3,1));", ret.toString());
+    }
+
+
+    @Test
+    public void testDemo2True() {
+        Parser parser = new Parser("""
+int a = 0;
+int b = 1;
+int c = 0;
+if( arg ) {
+    a = 1;
+    if( arg==2 ) { c=2; } else { c=3; }
+    if( arg ) { b = 2; }
+    else b = 3;
+}
+return a+b+c;
+""", TypeInteger.constant(1));
+        StopNode ret = parser.parse(true);
+        assertEquals("return 6;", ret.toString());
+    }
+
+    @Test
+    public void testDemo2arg2() {
+        Parser parser = new Parser("""
+int a = 0;
+int b = 1;
+int c = 0;
+if( arg ) {
+    a = 1;
+    if( arg==2 ) { c=2; } else { c=3; }
+    if( arg ) { b = 2; }
+    else b = 3;
+}
+return a+b+c;
+""", TypeInteger.constant(2));
+        StopNode ret = parser.parse(true);
+        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 9afcc49a..2e34b520 100644
--- a/chapter07/src/test/java/com/seaofnodes/simple/Chapter07Test.java
+++ b/chapter07/src/test/java/com/seaofnodes/simple/Chapter07Test.java
@@ -9,7 +9,7 @@ import static org.junit.Assert.*;
 public class Chapter07Test {
 
     @Test
-    public void testChapter7Example() {
+    public void testExample() {
         Parser parser = new Parser(
                 """
                 while(arg < 10) {
@@ -26,9 +26,8 @@ public class Chapter07Test {
     }
 
     @Test
-    public void testChapter7Regression() {
+    public void testRegression() {
         Parser parser = new Parser(
-
 """
 int a = 1;
 if(arg){}else{
@@ -43,9 +42,8 @@ return a;
     }
 
     @Test
-    public void testChapter7WhileNested() {
+    public void testWhileNested() {
         Parser parser = new Parser(
-
 """
 int sum = 0;
 int i = 0;
@@ -65,7 +63,7 @@ return sum;
     }
 
     @Test
-    public void testChapter7WhileScope() {
+    public void testWhileScope() {
         Parser parser = new Parser(
 """
 int a = 1;
@@ -85,7 +83,7 @@ return b;
     }
 
     @Test
-    public void testChapter7WhileNestedIfAndInc() {
+    public void testWhileNestedIfAndInc() {
         Parser parser = new Parser(
 """
 int a = 1;
@@ -106,7 +104,7 @@ return b;
 
 
     @Test
-    public void testChapter7While() {
+    public void testWhile() {
         Parser parser = new Parser(
 """
 int a = 1;
@@ -124,7 +122,7 @@ return a;
     }
 
     @Test
-    public void testChapter7WhilePeep() {
+    public void testWhilePeep() {
         Parser parser = new Parser(
 """
 int a = 1;
@@ -140,7 +138,7 @@ return a;
     }
 
     @Test
-    public void testChapter7While2() {
+    public void testWhile2() {
         Parser parser = new Parser(
 """
 int a = 1;
@@ -156,7 +154,7 @@ return a;
     }
 
     @Test
-    public void testChapter7While2Peep() {
+    public void testWhile2Peep() {
         Parser parser = new Parser(
 """
 int a = 1;
@@ -170,7 +168,7 @@ return a;
     }
 
     @Test
-    public void testChapter7While3() {
+    public void testWhile3() {
         Parser parser = new Parser(
 """
 int a = 1;
@@ -188,7 +186,7 @@ return a;
     }
 
     @Test
-    public void testChapter7While3Peep() {
+    public void testWhile3Peep() {
         Parser parser = new Parser(
 """
 int a = 1;
@@ -204,7 +202,7 @@ return a;
     }
 
     @Test
-    public void testChapter7While4() {
+    public void testWhile4() {
         Parser parser = new Parser(
 """
 int a = 1;
@@ -223,7 +221,7 @@ return a;
     }
 
     @Test
-    public void testChapter7While4Peep() {
+    public void testWhile4Peep() {
         Parser parser = new Parser(
 """
 int a = 1;
@@ -239,788 +237,4 @@ return a;
         assertTrue(stop.ret().ctrl() instanceof ProjNode);
     }
 
-    @Test
-    public void testChapter6PeepholeReturn() {
-        Parser parser = new Parser(
-"""
-if( true ) return 2;
-return 1;
-""");
-        StopNode stop = parser.parse(true);
-        assertEquals("return 2;", stop.toString());
-        assertTrue(stop.ret().ctrl() instanceof ProjNode);
-    }
-
-    @Test
-    public void testChapter6PeepholeRotate() {
-        Parser parser = new Parser(
-"""
-int a = 1;
-if (arg)
-    a = 2;
-return (arg < a) < 3;
-""");
-        StopNode stop = parser.parse(false);
-        assertEquals("return ((arg<Phi(Region12,2,1))<3);", stop.toString());
-    }
-
-    @Test
-    public void testChapter6PeepholeCFG() {
-        Parser parser = new Parser(
-"""
-int a=1;
-if( true )
-  a=2;
-else
-  a=3;
-return a;
-""");
-        StopNode stop = parser.parse(true);
-        assertEquals("return 2;", stop.toString());
-        assertTrue(stop.ret().ctrl() instanceof ProjNode);
-    }
-
-    @Test
-    public void testChapter6IfIf() {
-        Parser parser = new Parser(
-"""
-int a=1;
-if( arg!=1 )
-    a=2;
-else
-    a=3;
-int b=4;
-if( a==2 )
-    b=42;
-else
-    b=5;
-return b;""", TypeInteger.BOT);
-        StopNode stop = parser.parse(true);
-        assertEquals("return Phi(Region32,42,5);", stop.toString());
-    }
-
-    @Test
-    public void testChapter6IfArgIf() {
-        Parser parser = new Parser(
-"""
-int a=1;
-if( 1==1 )
-    a=2;
-else
-    a=3;
-int b=4;
-if( arg==2 )
-    b=a;
-else
-    b=5;
-return b;""", TypeInteger.BOT);
-        StopNode stop = parser.parse(true);
-        assertEquals("return Phi(Region28,2,5);", stop.toString());
-    }
-
-    @Test
-    public void testChapter6Merge3With2() {
-        Parser parser = new Parser(
-"""
-int a=1;
-if( arg==1 )
-    if( arg==2 )
-        a=2;
-    else
-        a=3;
-else if( arg==3 )
-    a=4;
-else
-    a=5;
-return a;
-#showGraph;""", TypeInteger.constant(2));
-        StopNode stop = parser.parse();
-        assertEquals("return 5;", stop.toString());
-    }
-
-    @Test
-    public void testChapter6Merge3With1() {
-        Parser parser = new Parser(
-"""
-int a=1;
-if( arg==1 )
-    if( arg==2 )
-        a=2;
-    else
-        a=3;
-else if( arg==3 )
-    a=4;
-else
-    a=5;
-return a;
-""", TypeInteger.constant(1));
-        StopNode stop = parser.parse(true);
-        assertEquals("return 3;", stop.toString());
-    }
-
-    @Test
-    public void testChapter6Merge3Peephole() {
-        Parser parser = new Parser(
-"""
-int a=1;
-if( arg==1 )
-    if( 1==2 )
-        a=2;
-    else
-        a=3;
-else if( arg==3 )
-    a=4;
-else
-    a=5;
-return a;
-""", TypeInteger.BOT);
-        StopNode stop = parser.parse(true);
-        assertEquals("return Phi(Region36,3,Phi(Region34,4,5));", stop.toString());
-    }
-
-    @Test
-    public void testChapter6Merge3Peephole1() {
-        Parser parser = new Parser(
-"""
-int a=1;
-if( arg==1 )
-    if( 1==2 )
-        a=2;
-    else
-        a=3;
-else if( arg==3 )
-    a=4;
-else
-    a=5;
-return a;
-""", TypeInteger.constant(1));
-        StopNode stop = parser.parse(true);
-        assertEquals("return 3;", stop.toString());
-    }
-
-    @Test
-    public void testChapter6Merge3Peephole3() {
-        Parser parser = new Parser(
-"""
-int a=1;
-if( arg==1 )
-    if( 1==2 )
-        a=2;
-    else
-        a=3;
-else if( arg==3 )
-    a=4;
-else
-    a=5;
-return a;
-""", TypeInteger.constant(3));
-        StopNode stop = parser.parse(true);
-        assertEquals("return 4;", stop.toString());
-    }
-
-    @Test
-    public void testChapter6Demo1NonConst() {
-        Parser parser = new Parser("""
-int a = 0;
-int b = 1;
-if( arg ) {
-    a = 2;
-    if( arg ) { b = 2; }
-    else b = 3;
-}
-return a+b;
-""");
-        StopNode ret = parser.parse(true);
-        assertEquals("return Phi(Region22,4,1);", ret.toString());
-    }
-
-
-    @Test
-    public void testChapter6Demo1True() {
-        Parser parser = new Parser("""
-int a = 0;
-int b = 1;
-if( arg ) {
-    a = 2;
-    if( arg ) { b = 2; }
-    else b = 3;
-}
-return a+b;
-""", TypeInteger.constant(1));
-        StopNode ret = parser.parse(true);
-        assertEquals("return 4;", ret.toString());
-    }
-
-    @Test
-    public void testChapter6Demo1False() {
-        Parser parser = new Parser("""
-int a = 0;
-int b = 1;
-if( arg ) {
-    a = 2;
-    if( arg ) { b = 2; }
-    else b = 3;
-}
-return a+b;
-""", TypeInteger.constant(0));
-        StopNode ret = parser.parse(true);
-        assertEquals("return 1;", ret.toString());
-    }
-
-    @Test
-    public void testChapter6Demo2NonConst() {
-        Parser parser = new Parser("""
-int a = 0;
-int b = 1;
-int c = 0;
-if( arg ) {
-    a = 1;
-    if( arg==2 ) { c=2; } else { c=3; }
-    if( arg ) { b = 2; }
-    else b = 3;
-}
-return a+b+c;
-""");
-        StopNode ret = parser.parse(true);
-        assertEquals("return (Phi(Region33,Phi(Region22,2,3),0)+Phi(Region,3,1));", ret.toString());
-    }
-
-
-    @Test
-    public void testChapter6Demo2True() {
-        Parser parser = new Parser("""
-int a = 0;
-int b = 1;
-int c = 0;
-if( arg ) {
-    a = 1;
-    if( arg==2 ) { c=2; } else { c=3; }
-    if( arg ) { b = 2; }
-    else b = 3;
-}
-return a+b+c;
-""", TypeInteger.constant(1));
-        StopNode ret = parser.parse(true);
-        assertEquals("return 6;", ret.toString());
-    }
-
-    @Test
-    public void testChapter6Demo2arg2() {
-        Parser parser = new Parser("""
-int a = 0;
-int b = 1;
-int c = 0;
-if( arg ) {
-    a = 1;
-    if( arg==2 ) { c=2; } else { c=3; }
-    if( arg ) { b = 2; }
-    else b = 3;
-}
-return a+b+c;
-""", TypeInteger.constant(2));
-        StopNode ret = parser.parse(true);
-        assertEquals("return 5;", ret.toString());
-    }
-
-
-
-    @Test
-    public void testChapter5IfStmt() {
-        Parser parser = new Parser(
-"""
-int a = 1;
-if (arg == 1)
-    a = arg+2;
-else {
-    a = arg-3;
-    #showGraph;
-}
-#showGraph;
-return a;""");
-        StopNode ret = parser.parse(true);
-        assertEquals("return Phi(Region17,(arg+2),(arg-3));", ret.toString());
-    }
-
-    @Test
-    public void testChapter5Test() {
-        Parser parser = new Parser(
-"""
-int c = 3;
-int b = 2;
-if (arg == 1) {
-    b = 3;
-    c = 4;
-}
-return c;""", TypeInteger.BOT);
-        StopNode ret = parser.parse(true);
-        assertEquals("return Phi(Region16,4,3);", ret.toString());
-    }
-
-    @Test
-    public void testChapter5Return2() {
-        Parser parser = new Parser(
-"""
-if( arg==1 )
-    return 3;
-else
-    return 4;
-#showGraph;""", TypeInteger.BOT);
-        StopNode stop = parser.parse();
-        assertEquals("Stop[ return 3; return 4; ]", stop.toString());
-    }
-
-    @Test
-    public void testChapter5IfMergeB() {
-        Parser parser = new Parser(
-"""
-int a=arg+1;
-int b=0;
-if( arg==1 )
-    b=a;
-else
-    b=a+1;
-return a+b;""");
-        StopNode ret = parser.parse(true);
-        assertEquals("return ((arg*2)+Phi(Region20,2,3));", ret.toString());
-    }
-
-    @Test
-    public void testChapter5IfMerge2() {
-        Parser parser = new Parser(
-"""
-int a=arg+1;
-int b=arg+2;
-if( arg==1 )
-    b=b+a;
-else
-    a=b+1;
-return a+b;""");
-        StopNode ret = parser.parse(true);
-        assertEquals("return ((Phi(Region31,(arg*2),arg)+arg)+Phi(Region,4,5));", ret.toString());
-    }
-
-    @Test
-    public void testChapter5Merge3() {
-        Parser parser = new Parser(
-"""
-int a=1;
-if( arg==1 )
-    if( arg==2 )
-        a=2;
-    else
-        a=3;
-else if( arg==3 )
-    a=4;
-else
-    a=5;
-return a;
-#showGraph;""", TypeInteger.BOT);
-        StopNode stop = parser.parse();
-        assertEquals("return Phi(Region33,Phi(Region21,2,3),Phi(Region31,4,5));", stop.toString());
-    }
-
-    @Test
-    public void testChapter5Merge4() {
-        Parser parser = new Parser(
-"""
-int a=0;
-int b=0;
-if( arg )
-    a=1;
-if( arg==0 )
-    b=2;
-return arg+a+b;
-#showGraph;""", TypeInteger.BOT);
-        StopNode stop = parser.parse();
-        assertEquals("return ((arg+Phi(Region13,1,0))+Phi(Region22,2,0));", stop.toString());
-    }
-
-    @Test
-    public void testChapter5Merge5() {
-        Parser parser = new Parser(
-"""
-int a=arg==2;
-if( arg==1 )
-{
-    a=arg==3;
-}
-return a;""");
-        StopNode ret = parser.parse(true);
-        assertEquals("return (arg==Phi(Region16,3,2));", ret.toString());
-    }
-
-    @Test
-    public void testChapter5True() {
-      StopNode stop = new Parser("return true;").parse();
-      assertEquals("return 1;",stop.toString());
-    }
-
-    @Test
-    public void testChapter5HalfDef() {
-        try {
-            new Parser("if( arg==1 ) int b=2; return b;").parse();
-            fail();
-        } catch( RuntimeException e ) {
-            assertEquals("Cannot define a new name on one arm of an if",e.getMessage());
-        }
-    }
-
-    @Test
-    public void testChapter5HalfDef2() {
-        try {
-            new Parser("if( arg==1 ) { int b=2; } else { int b=3; } return b;").parse();
-            fail();
-        } catch( RuntimeException e ) {
-            assertEquals("Undefined name 'b'",e.getMessage());
-        }
-    }
-
-    @Test
-    public void testChapter5BadNum() {
-        try {
-            new Parser("return 1-;").parse();
-            fail();
-        } catch( RuntimeException e ) {
-            assertEquals("Syntax error, expected an identifier or expression: ;",e.getMessage());
-        }
-    }
-
-    @Test
-    public void testChapter5Keyword1() {
-        try {
-            new Parser("int true=0; return true;").parse();
-            fail();
-        } catch( RuntimeException e ) {
-            assertEquals("Expected an identifier, found 'true'",e.getMessage());
-        }
-    }
-
-    @Test
-    public void testChapter5Keyword2() {
-        try {
-            new Parser("int else=arg; if(else) else=2; else else=1; return else;").parse();
-            fail();
-        } catch( RuntimeException e ) {
-            assertEquals("Expected an identifier, found 'else'",e.getMessage());
-        }
-    }
-
-    @Test
-        public void testChapter5Keyword3() {
-        try {
-            new Parser("int a=1; ififif(arg)inta=2;return a;").parse();
-            fail();
-        } catch( RuntimeException e ) {
-            assertEquals("Syntax error, expected =: (",e.getMessage());
-        }
-    }
-
-    @Test
-    public void testChapter4Peephole() {
-        Parser parser = new Parser("return 1+arg+2; #showGraph;");
-        StopNode ret = parser.parse();
-        assertEquals("return (arg+3);", ret.print());
-    }
-
-    @Test
-    public void testChapter4Peephole2() {
-        Parser parser = new Parser("return (1+arg)+2;");
-        StopNode ret = parser.parse();
-        assertEquals("return (arg+3);", ret.print());
-    }
-
-    @Test
-    public void testChapter4Add0() {
-        Parser parser = new Parser("return 0+arg;");
-        StopNode ret = parser.parse();
-        assertEquals("return arg;", ret.print());
-    }
-
-    @Test
-    public void testChapter4AddAddMul() {
-        Parser parser = new Parser("return arg+0+arg;");
-        StopNode ret = parser.parse();
-        assertEquals("return (arg*2);", ret.print());
-    }
-
-    @Test
-    public void testChapter4Peephole3() {
-        Parser parser = new Parser("return 1+arg+2+arg+3; #showGraph;");
-        StopNode ret = parser.parse();
-        assertEquals("return ((arg*2)+6);", ret.print());
-    }
-
-    @Test
-    public void testChapter4Mul1() {
-        Parser parser = new Parser("return 1*arg;");
-        StopNode ret = parser.parse();
-        assertEquals("return arg;", ret.print());
-    }
-
-    @Test
-    public void testChapter4VarArg() {
-        Parser parser = new Parser("return arg; #showGraph;");
-        StopNode stop = parser.parse();
-        ReturnNode ret = stop.ret();
-        assertTrue(ret.in(0) instanceof ProjNode);
-        assertTrue(ret.in(1) instanceof ProjNode);
-    }
-
-    @Test
-    public void testChapter4ConstantArg() {
-        Parser parser = new Parser("return arg; #showGraph;", TypeInteger.constant(2));
-        StopNode ret = parser.parse();
-        assertEquals("return 2;", ret.print());
-    }
-
-    @Test
-    public void testChapter4CompEq() {
-        Parser parser = new Parser("return 3==3; #showGraph;");
-        StopNode ret = parser.parse();
-        assertEquals("return 1;", ret.print());
-    }
-
-    @Test
-    public void testChapter4CompEq2() {
-        Parser parser = new Parser("return 3==4; #showGraph;");
-        StopNode ret = parser.parse();
-        assertEquals("return 0;", ret.print());
-    }
-
-    @Test
-    public void testChapter4CompNEq() {
-        Parser parser = new Parser("return 3!=3; #showGraph;");
-        StopNode ret = parser.parse();
-        assertEquals("return 0;", ret.print());
-    }
-
-    @Test
-    public void testChapter4CompNEq2() {
-        Parser parser = new Parser("return 3!=4; #showGraph;");
-        StopNode ret = parser.parse();
-        assertEquals("return 1;", ret.print());
-    }
-
-    @Test
-    public void testChapter4Bug1() {
-        Parser parser = new Parser("int a=arg+1; int b=a; b=1; return a+2; #showGraph;");
-        StopNode ret = parser.parse();
-        assertEquals("return (arg+3);", ret.print());
-    }
-
-    @Test
-    public void testChapter4Bug2() {
-        Parser parser = new Parser("int a=arg+1; a=a; return a; #showGraph;");
-        StopNode ret = parser.parse();
-        assertEquals("return (arg+1);", ret.print());
-    }
-
-    @Test
-    public void testChapter4Bug3() {
-        try {
-            new Parser("inta=1; return a;").parse();
-            fail();
-        } catch( RuntimeException e ) {
-            assertEquals("Undefined name 'inta'",e.getMessage());
-        }
-    }
-
-    @Test
-    public void testChapter4Bug4() {
-        Parser parser = new Parser("return -arg;");
-        StopNode ret = parser.parse();
-        assertEquals("return (-arg);", ret.print());
-    }
-
-    @Test
-    public void testVarDecl() {
-        Parser parser = new Parser("int a=1; return a;");
-        StopNode ret = parser.parse();
-        assertEquals("return 1;", ret.print());
-    }
-
-    @Test
-    public void testVarAdd() {
-        Parser parser = new Parser("int a=1; int b=2; return a+b;");
-        StopNode ret = parser.parse();
-        assertEquals("return 3;", ret.print());
-    }
-
-    @Test
-    public void testVarScope() {
-        Parser parser = new Parser("int a=1; int b=2; int c=0; { int b=3; c=a+b; } return c;");
-        StopNode ret = parser.parse();
-        assertEquals("return 4;", ret.print());
-    }
-
-    @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;");
-        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); #showGraph;");
-        StopNode ret = parser.parse();
-        assertEquals("return 8;", ret.print());
-    }
-
-    @Test
-    public void testSelfAssign() {
-        try {
-            new Parser("int a=a; return a;").parse();
-            fail();
-        } catch( RuntimeException e ) {
-            assertEquals("Undefined name 'a'",e.getMessage());
-        }
-    }
-
-    @Test
-    public void testChapter2ParseGrammar() {
-        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());
-        GraphVisualizer gv = new GraphVisualizer();
-        System.out.println(gv.generateDotOutput(parser));
-        Node._disablePeephole = false;
-    }
-
-    @Test
-    public void testChapter2AddPeephole() {
-        Parser parser = new Parser("return 1+2;");
-        StopNode ret = parser.parse();
-        assertEquals("return 3;", ret.print());
-    }
-
-    @Test
-    public void testChapter2SubPeephole() {
-        Parser parser = new Parser("return 1-2;");
-        StopNode ret = parser.parse();
-        assertEquals("return -1;", ret.print());
-    }
-
-    @Test
-    public void testChapter2MulPeephole() {
-        Parser parser = new Parser("return 2*3;");
-        StopNode ret = parser.parse();
-        assertEquals("return 6;", ret.print());
-    }
-
-    @Test
-    public void testChapter2DivPeephole() {
-        Parser parser = new Parser("return 6/3;");
-        StopNode ret = parser.parse();
-        assertEquals("return 2;", ret.print());
-    }
-
-    @Test
-    public void testChapter2MinusPeephole() {
-        Parser parser = new Parser("return 6/-3;");
-        StopNode ret = parser.parse();
-        assertEquals("return -2;", ret.print());
-    }
-
-    @Test
-    public void testChapter2Example() {
-        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));
-    }
-
-    @Test
-    public void testSimpleProgram() {
-        Parser parser = new Parser("return 1;");
-        StopNode stop = parser.parse();
-        StartNode start = Parser.START;
-        ReturnNode ret = (ReturnNode)stop.in(0);
-
-        assertTrue(ret.ctrl() instanceof ProjNode);
-        Node expr = ret.expr();
-        if( expr instanceof ConstantNode con ) {
-            assertEquals(start,con.in(0));
-            assertEquals(TypeInteger.constant(1), con._type);
-        } else {
-            fail();
-        }
-    }
-
-    @Test
-    public void testZero() {
-        Parser parser = new Parser("return 0;");
-        parser.parse();
-        StartNode start = Parser.START;
-        for( Node use : start._outputs )
-            if( use instanceof ConstantNode con )
-                assertEquals(TypeInteger.constant(0),con._type);
-    }
-
-    @Test
-    public void testBad1() {
-        try {
-            new Parser("ret").parse();
-            fail();
-        } catch( RuntimeException e ) {
-            assertEquals("Syntax error, expected =: ",e.getMessage());
-        }
-    }
-
-    @Test
-    public void testBad2() {
-        try {
-            new Parser("return 0123;").parse();
-            fail();
-        } catch( RuntimeException e ) {
-            assertEquals("Syntax error: integer values cannot start with '0'",e.getMessage());
-        }
-    }
-
-    @Test
-    public void testNotBad3() {
-        // this test used to fail in chapter 1
-        assertEquals("return 12;", new Parser("return --12;").parse().print());
-    }
-
-    @Test
-    public void testBad4() {
-        try {
-            new Parser("return 100").parse();
-            fail();
-        } catch( RuntimeException e ) {
-            assertEquals("Syntax error, expected ;: ",e.getMessage());
-        }
-    }
-
-    @Test
-    public void testNotBad5() {
-        // this test used to fail in chapter 1
-        assertEquals("return -100;", new Parser("return -100;").parse().print());
-    }
-
-    @Test
-    public void testBad6() {
-        try {
-            new Parser("int a=1; int b=2; int c=0; { int b=3; c=a+b;").parse();
-            fail();
-        } catch( RuntimeException e ) {
-            assertEquals("Syntax error, expected }: ",e.getMessage());
-        }
-    }
-
-    @Test
-    public void testBad7() {
-        try {
-            new Parser("return 1;}").parse();
-            fail();
-        } catch( RuntimeException e ) {
-            assertEquals("Syntax error, unexpected }",e.getMessage());
-        }
-    }
-
 }
-- 
cgit v1.2.3