3 files changed, 44 insertions, 0 deletions
diff --git a/chapter22/src/test/java/com/seaofnodes/simple/Chapter04Test.java b/chapter22/src/test/java/com/seaofnodes/simple/Chapter04Test.java
index c6199193..e5a16680 100644
--- a/chapter22/src/test/java/com/seaofnodes/simple/Chapter04Test.java
+++ b/chapter22/src/test/java/com/seaofnodes/simple/Chapter04Test.java
@@ -53,6 +53,34 @@ public class Chapter04Test {
     }
 
     @Test
+    public void testSub0() {
+        CodeGen code = new CodeGen("return arg-0;");
+        code.parse();
+        assertEquals("return arg;", code.print());
+    }
+
+    @Test
+    public void test0Sub() {
+        CodeGen code = new CodeGen("return 0-arg;");
+        code.parse();
+        assertEquals("return (-arg);", code.print());
+    }
+
+    @Test
+    public void testSubNeg() {
+        CodeGen code = new CodeGen("return 3--arg;");
+        code.parse();
+        assertEquals("return (arg+3);", code.print());
+    }
+
+    @Test
+    public void testNegSub() {
+        CodeGen code = new CodeGen("return -arg-3;");
+        code.parse();
+        assertEquals("return (-(arg+3));", code.print());
+    }
+
+    @Test
     public void testVarArg() {
         CodeGen code = new CodeGen("return arg; ");
         code.parse();
diff --git a/chapter22/src/test/java/com/seaofnodes/simple/Chapter12Test.java b/chapter22/src/test/java/com/seaofnodes/simple/Chapter12Test.java
index 21759b78..c50be559 100644
--- a/chapter22/src/test/java/com/seaofnodes/simple/Chapter12Test.java
+++ b/chapter22/src/test/java/com/seaofnodes/simple/Chapter12Test.java
@@ -7,6 +7,13 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 public class Chapter12Test {
+    @Test public void testSubZeroFloat() {
+        var code = new CodeGen("flt x = arg; return 0-x;").parse().opto().typeCheck();
+        // Compare strings so +0.0 and -0.0 remain distinct.
+        assertEquals("0.0", Eval2.eval(code,0));
+        assertEquals("-1.0", Eval2.eval(code,1));
+    }
+
     @Test public void testDeadNumericReturns() {
         for( String[] test : new String[][] {
             {"if(1) return 7; else return 2.5;", "7"},
diff --git a/chapter22/src/test/java/com/seaofnodes/simple/Chapter22Test.java b/chapter22/src/test/java/com/seaofnodes/simple/Chapter22Test.java
index 369e365e..8d0f4c65 100644
--- a/chapter22/src/test/java/com/seaofnodes/simple/Chapter22Test.java
+++ b/chapter22/src/test/java/com/seaofnodes/simple/Chapter22Test.java
@@ -13,6 +13,15 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 public class Chapter22Test {
+    @Test public void testSubZeroTypeError() {
+        try {
+            new CodeGen("return null-0;").parse().opto().typeCheck();
+            fail("Subtraction must reject null even when the other operand is zero");
+        } catch( Parser.ParseException e ) {
+            assertEquals("Cannot '-' null",e.getMessage());
+        }
+    }
+
     @Test public void testInfiniteReturn() {
         String src = "struct S { int i; }; S !s = new S; while(1) s.i++; return s.i;";
         testCPU(src,"x86_64_v2","SystemV",0,"return Top;");