1 files changed, 16 insertions, 21 deletions

diff --git a/src/test/java/com/seaofnodes/simple/Chapter03Test.java b/src/test/java/com/seaofnodes/simple/Chapter03Test.java
index 4525918c..a7fc3ae5 100644
--- a/src/test/java/com/seaofnodes/simple/Chapter03Test.java
+++ b/src/test/java/com/seaofnodes/simple/Chapter03Test.java
@@ -1,7 +1,5 @@
 package com.seaofnodes.simple;
 
-import com.seaofnodes.simple.node.*;
-import com.seaofnodes.simple.type.TypeInteger;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
@@ -10,45 +8,42 @@ 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());
+        CodeGen code = new CodeGen("int a=1; return a;");
+        code.parse(); assertEquals("return 1;", code.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());
+        CodeGen code = new CodeGen("int a=1; int b=2; return a+b;");
+        code.parse();
+        assertEquals("return 3;", code.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());
+        CodeGen code = new CodeGen("int a=1; int b=2; int c=0; { int b=3; c=a+b; } return c;");
+        code.parse();
+        assertEquals("return 4;", code.print());
     }
 
     @Test
     public void testVarScopeNoPeephole() {
-        Parser parser = new Parser("int a=1; int b=2; int !c=0; { int b=3; c=a+b;  } return c; ");
-        Node._disablePeephole = true;
-        StopNode ret = parser.parse();
-        Node._disablePeephole = false;
-        assertEquals("return (1+3);", ret.print());
+        CodeGen code = new CodeGen("int a=1; int b=2; int !c=0; { int b=3; c=a+b;  } return c; ");
+        code.parse(true);
+        assertEquals("return (1+3);", code.print());
     }
 
     @Test
     public void testVarDist() {
-        Parser parser = new Parser("int x0=1; int y0=2; int x1=3; int y1=4; return (x0-x1)*(x0-x1) + (y0-y1)*(y0-y1); ");
-        StopNode ret = parser.parse();
-        assertEquals("return 8;", ret.print());
+        CodeGen code = new CodeGen("int x0=1; int y0=2; int x1=3; int y1=4; return (x0-x1)*(x0-x1) + (y0-y1)*(y0-y1); ");
+        code.parse();
+        assertEquals("return 8;", code.print());
     }
 
     @Test
     public void testSelfAssign() {
         try {
-            new Parser("int a=a; return a;").parse();
+            new CodeGen("int a=a; return a;").parse();
             fail();
         } catch( RuntimeException e ) {
             assertEquals("Undefined name 'a'",e.getMessage());
@@ -58,7 +53,7 @@ public class Chapter03Test {
     @Test
     public void testBad1() {
         try {
-            new Parser("int a=1; int b=2; int !c=0; { int b=3; c=a+b;").parse();
+            new CodeGen("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());