diff options
| author | Cliff Click <cliffc@acm.org> | 2026-09-25 15:28:21 -0700 |
|---|---|---|
| committer | Cliff Click <cliffc@acm.org> | 2026-09-25 15:28:21 -0700 |
| commit | 29e0127170dce8964d7f85d808d1ec07426d2789 (patch) | |
| tree | f9174685beaf274f3324a08c68f2b0a7137309c2 /chapter12 | |
| parent | 12bde12b2e18c8b82b1510ac4305de66d1205e1a (diff) | |
| download | Simple-29e0127170dce8964d7f85d808d1ec07426d2789.tar.gz Simple-29e0127170dce8964d7f85d808d1ec07426d2789.zip | |
Restrict subtraction zero peepholes to integer operandspr254-fixes
Require resolved integer mode in chapter 25 so zero subtraction preserves floating-point signed zero. Keep nonnumeric operands in the graph for subtraction diagnostics.
Add signed-zero coverage from chapter 12 and null-subtraction diagnostics from chapter 22. Confirmed the regressions fail on the original PR. Full Make suites pass in chapters 4-25 (5462 tests), including fresh chapter 25 sys.o compilation.
Diffstat (limited to 'chapter12')
| -rw-r--r-- | chapter12/src/main/java/com/seaofnodes/simple/node/SubNode.java | 10 | ||||
| -rw-r--r-- | chapter12/src/test/java/com/seaofnodes/simple/Chapter12Test.java | 7 |
2 files changed, 12 insertions, 5 deletions
diff --git a/chapter12/src/main/java/com/seaofnodes/simple/node/SubNode.java b/chapter12/src/main/java/com/seaofnodes/simple/node/SubNode.java index d55cbb4e..4ae302f0 100644 --- a/chapter12/src/main/java/com/seaofnodes/simple/node/SubNode.java +++ b/chapter12/src/main/java/com/seaofnodes/simple/node/SubNode.java @@ -44,11 +44,11 @@ public class SubNode extends Node { Type t1 = lhs._type; Type t2 = rhs._type; - if( t2.isConstant() && t2 instanceof TypeInteger i && i.value()==0 ) - return lhs; - - if( t1.isConstant() && t1 instanceof TypeInteger i && i.value()==0 ) - return new MinusNode(rhs); + // Keep invalid operands for type checking. + if( t1 instanceof TypeInteger x && t2 instanceof TypeInteger y ) { + if( y.isConstant() && y.value()==0 ) return lhs; + if( x.isConstant() && x.value()==0 ) return new MinusNode(rhs); + } // x - (-y) is x+y if( rhs instanceof MinusNode minus ) diff --git a/chapter12/src/test/java/com/seaofnodes/simple/Chapter12Test.java b/chapter12/src/test/java/com/seaofnodes/simple/Chapter12Test.java index d862df95..9da4a4b8 100644 --- a/chapter12/src/test/java/com/seaofnodes/simple/Chapter12Test.java +++ b/chapter12/src/test/java/com/seaofnodes/simple/Chapter12Test.java @@ -9,6 +9,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; public class Chapter12Test { + @Test public void testSubZeroFloat() { + var stop = new Parser("flt x = arg; return 0-x;").parse().iterate(); + // Compare strings so +0.0 and -0.0 remain distinct. + assertEquals("0.0", Evaluator.evaluate(stop,0).toString()); + assertEquals("-1.0", Evaluator.evaluate(stop,1).toString()); + } + @Test public void testDeadNumericReturns() { for( String[] test : new String[][] { {"if(1) return 7; else return 2.5;", "7"}, |
