1 files changed, 9 insertions, 9 deletions
diff --git a/src/test/java/com/seaofnodes/simple/Chapter16Test.java b/src/test/java/com/seaofnodes/simple/Chapter16Test.java
index 67962acd..d066357f 100644
--- a/src/test/java/com/seaofnodes/simple/Chapter16Test.java
+++ b/src/test/java/com/seaofnodes/simple/Chapter16Test.java
@@ -15,7 +15,7 @@ public class Chapter16Test {
 """
 return 3.14;
 """);
-        code.parse().iter().finalizeIR();
+        code.driver(CodeGen.Phase.FinalizeIR);
         assertEquals("return 3.14;", code.print());
         assertEquals("3.14", Eval2.eval(code,  0));
     }
@@ -28,7 +28,7 @@ return 3.14;
 int x, y;
 return x+y;
 """);
-        code.parse().iter().finalizeIR();
+        code.driver(CodeGen.Phase.FinalizeIR);
         assertEquals("return 0;", code.print());
         assertEquals("0", Eval2.eval(code,  0));
     }
@@ -39,7 +39,7 @@ return x+y;
 int x=2, y=x+1;
 return x+y;
 """);
-        code.parse().iter().finalizeIR();
+        code.driver(CodeGen.Phase.FinalizeIR);
         assertEquals("return 5;", code.print());
         assertEquals("5", Eval2.eval(code,  0));
     }
@@ -52,7 +52,7 @@ struct X { int x=3; };
 X z = new X;
 return z.x;
 """);
-        code.parse().iter().finalizeIR();
+        code.driver(CodeGen.Phase.FinalizeIR);
         assertEquals("return 3;", code.print());
         assertEquals("3", Eval2.eval(code,  0));
     }
@@ -64,7 +64,7 @@ struct X { int x=3; };
 X z = new X { x = 4; };
 return z.x;
 """);
-        code.parse().iter().finalizeIR();
+        code.driver(CodeGen.Phase.FinalizeIR);
         assertEquals("return 4;", code.print());
         assertEquals("4", Eval2.eval(code,  0));
     }
@@ -85,7 +85,7 @@ LLI? next = head.next;
 if( !next ) return 1;
 return next.i;
 """);
-        code.parse().iter().finalizeIR();
+        code.driver(CodeGen.Phase.FinalizeIR);
         assertEquals("return Phi(Region,0,1,.i);", code.print());
         assertEquals("0", Eval2.eval(code,  0));
         assertEquals("1", Eval2.eval(code,  1));
@@ -116,7 +116,7 @@ LLI? next = head.next;
 if( !next ) return 1;
 return next.i;
 """);
-        code.parse().iter().finalizeIR();
+        code.driver(CodeGen.Phase.FinalizeIR);
         assertEquals("return Phi(Region,0,1,.i);", code.print());
         assertEquals("0", Eval2.eval(code,  0));
         assertEquals("1", Eval2.eval(code,  1));
@@ -141,7 +141,7 @@ struct Square {
 };
 return new Square;
 """);
-        code.parse().iter().finalizeIR();
+        code.driver(CodeGen.Phase.FinalizeIR);
         assertEquals("return Square;", code.print());
         assertEquals("Square{side=3.0,diag=1.7320508075688772}", Eval2.eval(code,  3));
         assertEquals("Square{side=4.0,diag=2.0}", Eval2.eval(code, 4));
@@ -165,7 +165,7 @@ return new Square;
         """;
 
     @Test public void testConstructorMemory() {
-        var code = new CodeGen(CONSTRUCTOR_MEMORY).parse().iter().finalizeIR();
+        var code = new CodeGen(CONSTRUCTOR_MEMORY).driver(CodeGen.Phase.FinalizeIR);
         assertEquals("111249",Eval2.eval(code,0));
         assertEquals("222352",Eval2.eval(code,1));
     }