From aaec6f8136df6f7020bfc05f79ff5273adf73de1 Mon Sep 17 00:00:00 2001 From: Cliff Click Date: Wed, 7 Oct 2026 12:57:31 -0700 Subject: flt->int conversion --- .../java/com/seaofnodes/simple/Chapter12Test.java | 3 +-- .../com/seaofnodes/simple/Chapter14FloatTest.java | 24 +++++++++++++++++++--- .../com/seaofnodes/simple/evaluator/Evaluator.java | 2 ++ 3 files changed, 24 insertions(+), 5 deletions(-) (limited to 'chapter14/src/test') diff --git a/chapter14/src/test/java/com/seaofnodes/simple/Chapter12Test.java b/chapter14/src/test/java/com/seaofnodes/simple/Chapter12Test.java index e84da36a..9e7240d8 100644 --- a/chapter14/src/test/java/com/seaofnodes/simple/Chapter12Test.java +++ b/chapter14/src/test/java/com/seaofnodes/simple/Chapter12Test.java @@ -130,8 +130,7 @@ N n = new N; n.i = 3.14; return n.i; """); - try { parser.parse().iterate(); fail(); } - catch( Exception e ) { assertEquals("Cannot store 3.14 into field int i",e.getMessage()); } + assertEquals("3",com.seaofnodes.simple.evaluator.Evaluator.evaluate(parser.parse().iterate(),0).toString()); } @Test diff --git a/chapter14/src/test/java/com/seaofnodes/simple/Chapter14FloatTest.java b/chapter14/src/test/java/com/seaofnodes/simple/Chapter14FloatTest.java index f2b51da2..5438fb2b 100644 --- a/chapter14/src/test/java/com/seaofnodes/simple/Chapter14FloatTest.java +++ b/chapter14/src/test/java/com/seaofnodes/simple/Chapter14FloatTest.java @@ -8,6 +8,25 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; public class Chapter14FloatTest { + @Test public void testNumericAssignments() { + String[][] tests = { + {"int rounded=17.3/2.5; return rounded;", "6", "6"}, + {"int rounded=arg/2.5; return rounded;", "6", "-6"}, + {"int rounded=0; rounded=arg/2.5; return rounded;", "6", "-6"}, + {"i8 rounded=arg*16.0; return rounded;", "16", "-16"}, + {"int rounded=1e100; return rounded;", "9223372036854775807", "9223372036854775807"}, + {"int rounded=-1e100; return rounded;", "-9223372036854775808", "-9223372036854775808"}, + {"int rounded=1e300*1e300-1e300*1e300; return rounded;", "0", "0"}, + {"f32 rounded=arg+16777216.0; return rounded;", "1.6777232E7", "1.6777199E7"} + }; + for( String[] test : tests ) { + var stop = new Parser(test[0]).parse().iterate(); + assertEquals(test[0],test[1],Evaluator.evaluate(stop,17).toString()); + assertEquals(test[0],test[2],Evaluator.evaluate(stop,-17).toString()); + } + } + + @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. @@ -81,7 +100,7 @@ return x+1==x; assertEquals(0L, Evaluator.evaluate(stop, 1)); } @Test - public void testReferenceFieldRejectsFloat() { + public void testReferenceFieldConvertsFloat() { Parser parser = new Parser( """ struct N { N next; int i; } @@ -89,7 +108,6 @@ N n = new N; n.i = 3.14; return n.i; """); - try { parser.parse().iterate(); fail(); } - catch( Exception e ) { assertEquals("Cannot store 3.14 into field int i",e.getMessage()); } + assertEquals("3",com.seaofnodes.simple.evaluator.Evaluator.evaluate(parser.parse().iterate(),0).toString()); } } diff --git a/chapter14/src/test/java/com/seaofnodes/simple/evaluator/Evaluator.java b/chapter14/src/test/java/com/seaofnodes/simple/evaluator/Evaluator.java index afe4cfe3..afa35372 100644 --- a/chapter14/src/test/java/com/seaofnodes/simple/evaluator/Evaluator.java +++ b/chapter14/src/test/java/com/seaofnodes/simple/evaluator/Evaluator.java @@ -157,6 +157,8 @@ public class Evaluator { case OrNode or -> vall(or .in(1)) | vall(or .in(2)); case XorNode xor -> vall(xor.in(1)) ^ vall(xor.in(2)); case CastNode cast -> val(cast.in(1)); + case RoundF32Node rnd -> (double)(float)vald(rnd.in(1)); + case ToIntegerNode cvt -> (long)vald(cvt.in(1)); case ToFloatNode cast -> (double)vall(cast.in(1)); case LoadNode load -> load(load); case StoreNode store -> store(store); -- cgit v1.2.3