1 files changed, 49 insertions, 48 deletions

diff --git a/src/test/java/com/seaofnodes/simple/Chapter04Test.java b/src/test/java/com/seaofnodes/simple/Chapter04Test.java
index 0db3afde..afed67d1 100644
--- a/src/test/java/com/seaofnodes/simple/Chapter04Test.java
+++ b/src/test/java/com/seaofnodes/simple/Chapter04Test.java
@@ -3,6 +3,7 @@ package com.seaofnodes.simple;
 import com.seaofnodes.simple.node.*;
 import com.seaofnodes.simple.type.TypeInteger;
 import org.junit.Test;
+import org.junit.Ignore;
 
 import static org.junit.Assert.*;
 
@@ -10,102 +11,102 @@ public class Chapter04Test {
 
     @Test
     public void testPeephole() {
-        Parser parser = new Parser("return 1+arg+2; ");
-        StopNode ret = parser.parse();
-        assertEquals("return (arg+3);", ret.print());
+        CodeGen code = new CodeGen("return 1+arg+2; ");
+        code.parse();
+        assertEquals("return (arg+3);", code.print());
     }
 
     @Test
     public void testPeephole2() {
-        Parser parser = new Parser("return (1+arg)+2;");
-        StopNode ret = parser.parse();
-        assertEquals("return (arg+3);", ret.print());
+        CodeGen code = new CodeGen("return (1+arg)+2;");
+        code.parse();
+        assertEquals("return (arg+3);", code.print());
     }
 
     @Test
     public void testAdd0() {
-        Parser parser = new Parser("return 0+arg;");
-        StopNode ret = parser.parse();
-        assertEquals("return arg;", ret.print());
+        CodeGen code = new CodeGen("return 0+arg;");
+        code.parse();
+        assertEquals("return arg;", code.print());
     }
 
     @Test
     public void testAddAddMul() {
-        Parser parser = new Parser("return arg+0+arg;");
-        StopNode ret = parser.parse();
-        assertEquals("return (arg*2);", ret.print());
+        CodeGen code = new CodeGen("return arg+0+arg;");
+        code.parse();
+        assertEquals("return (arg*2);", code.print());
     }
 
     @Test
     public void testPeephole3() {
-        Parser parser = new Parser("return 1+arg+2+arg+3; ");
-        StopNode ret = parser.parse();
-        assertEquals("return ((arg*2)+6);", ret.print());
+        CodeGen code = new CodeGen("return 1+arg+2+arg+3; ");
+        code.parse();
+        assertEquals("return ((arg*2)+6);", code.print());
     }
 
     @Test
     public void testMul1() {
-        Parser parser = new Parser("return 1*arg;");
-        StopNode ret = parser.parse();
-        assertEquals("return arg;", ret.print());
+        CodeGen code = new CodeGen("return 1*arg;");
+        code.parse();
+        assertEquals("return arg;", code.print());
     }
 
     @Test
     public void testVarArg() {
-        Parser parser = new Parser("return arg; ");
-        StopNode stop = parser.parse();
-        ReturnNode ret = stop.ret();
-        assertTrue(ret.in(0) instanceof CProjNode);
-        assertTrue(ret.in(1) instanceof  ProjNode);
+        CodeGen code = new CodeGen("return arg; ");
+        code.parse();
+        assertTrue(code.ctrl() instanceof  FunNode);
+        assertTrue(code.expr() instanceof ParmNode);
     }
 
-    @Test
+    // Adding functions means `main` does not constant fold the incoming arg value
+    @Ignore @Test
     public void testConstantArg() {
-        Parser parser = new Parser("return arg; ", TypeInteger.constant(2));
-        StopNode ret = parser.parse();
-        assertEquals("return 2;", ret.print());
+        CodeGen code = new CodeGen("return arg; ", TypeInteger.constant(2));
+        code.parse();
+        assertEquals("return 2;", code.expr().in(1).toString());
     }
 
     @Test
     public void testCompEq() {
-        Parser parser = new Parser("return 3==3; ");
-        StopNode ret = parser.parse();
-        assertEquals("return 1;", ret.print());
+        CodeGen code = new CodeGen("return 3==3; ");
+        code.parse();
+        assertEquals("return 1;", code.print());
     }
 
     @Test
     public void testCompEq2() {
-        Parser parser = new Parser("return 3==4; ");
-        StopNode ret = parser.parse();
-        assertEquals("return 0;", ret.print());
+        CodeGen code = new CodeGen("return 3==4; ");
+        code.parse();
+        assertEquals("return 0;", code.print());
     }
 
     @Test
     public void testCompNEq() {
-        Parser parser = new Parser("return 3!=3; ");
-        StopNode ret = parser.parse();
-        assertEquals("return 0;", ret.print());
+        CodeGen code = new CodeGen("return 3!=3; ");
+        code.parse();
+        assertEquals("return 0;", code.print());
     }
 
     @Test
     public void testCompNEq2() {
-        Parser parser = new Parser("return 3!=4; ");
-        StopNode ret = parser.parse();
-        assertEquals("return 1;", ret.print());
+        CodeGen code = new CodeGen("return 3!=4; ");
+        code.parse();
+        assertEquals("return 1;", code.print());
     }
 
     @Test
     public void testBug1() {
-        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());
+        CodeGen code = new CodeGen("int a=arg+1; int !b=a; b=1; return a+2; ");
+        code.parse();
+        assertEquals("return (arg+3);", code.print());
     }
 
     @Test
     public void testBug2() {
-        Parser parser = new Parser("int !a=arg+1; a=a; return a; ");
-        StopNode ret = parser.parse();
-        assertEquals("return (arg+1);", ret.print());
+        CodeGen code = new CodeGen("int !a=arg+1; a=a; return a; ");
+        code.parse();
+        assertEquals("return (arg+1);", code.print());
     }
 
     @Test
@@ -120,9 +121,9 @@ public class Chapter04Test {
 
     @Test
     public void testBug4() {
-        Parser parser = new Parser("return -arg;");
-        StopNode ret = parser.parse();
-        assertEquals("return (-arg);", ret.print());
+        CodeGen code = new CodeGen("return -arg;");
+        code.parse();
+        assertEquals("return (-arg);", code.print());
     }
 
     @Test