Strip out type specializations, misc. cleanup

Author: danielperano

Lang/src/main/java/chipmunk/vm/tree/Node.java

@@ -20,28 +20,6 @@
 
 package chipmunk.vm.tree;
 
-import static chipmunk.vm.tree.Conversions.*;
-
 public interface Node {
     Object execute(Fiber ctx);
-
-    default boolean executeBoolean(Fiber ctx){
-        return toBoolean(execute(ctx));
-    }
-
-    default int executeInt(Fiber ctx){
-        return toInt(execute(ctx));
-    }
-
-    default float executeFloat(Fiber ctx){
-        return toFloat(execute(ctx));
-    }
-
-    default long executeLong(Fiber ctx){
-        return toLong(execute(ctx));
-    }
-
-    default double executeDouble(Fiber ctx){
-        return toDouble(execute(ctx));
-    }
 }

Lang/src/main/java/chipmunk/vm/tree/nodes/Add.java

@@ -23,14 +23,18 @@
 import chipmunk.vm.tree.Fiber;
 import chipmunk.vm.tree.Node;
 
+import java.math.BigDecimal;
+
 public final class Add implements Node {
     public Node l, r;
 
     @Override
     public Object execute(Fiber ctx) {
         // TODO - determine types & either hit runtime library definition
         // or resort to CObject.add()
-        return executeInt(ctx);
+        var a = (BigDecimal) l.execute(ctx);
+        var b = (BigDecimal) r.execute(ctx);
+        return a.add(b);
     }
 
 }

Lang/src/main/java/chipmunk/vm/tree/nodes/FDiv.java

@@ -23,16 +23,16 @@
 import chipmunk.vm.tree.Fiber;
 import chipmunk.vm.tree.Node;
 
+import java.math.BigDecimal;
+import java.math.MathContext;
+
 public final class FDiv implements Node {
     public Node l, r;
 
     @Override
     public Object execute(Fiber ctx) {
-        return executeFloat(ctx);
-    }
-
-    @Override
-    public float executeFloat(Fiber ctx){
-        return l.executeFloat(ctx) / r.executeFloat(ctx);
+        var a = (BigDecimal) l.execute(ctx);
+        var b = (BigDecimal) r.execute(ctx);
+        return a.divide(b, MathContext.DECIMAL64);
     }
 }

Lang/src/main/java/chipmunk/vm/tree/nodes/FSub.java

@@ -23,16 +23,15 @@
 import chipmunk.vm.tree.Fiber;
 import chipmunk.vm.tree.Node;
 
+import java.math.BigDecimal;
+
 public class FSub implements Node {
     public Node l, r;
 
     @Override
     public Object execute(Fiber ctx) {
-        return executeFloat(ctx);
-    }
-
-    @Override
-    public float executeFloat(Fiber ctx){
-        return l.executeFloat(ctx) - r.executeFloat(ctx);
+        var a = (BigDecimal) l.execute(ctx);
+        var b = (BigDecimal) r.execute(ctx);
+        return a.subtract(b);
     }
 }

Lang/src/main/java/chipmunk/vm/tree/nodes/For.java

@@ -23,8 +23,6 @@
 import chipmunk.vm.tree.Fiber;
 import chipmunk.vm.tree.Node;
 
-import static chipmunk.vm.tree.Conversions.*;
-
 public class For implements Node {
     public Node pre;
     public Node test;
@@ -42,22 +40,22 @@ public Object doPre(Fiber ctx) {
             try {
                 pre.execute(ctx);
             } catch (Exception e) {
-                ctx.suspendStateless(e, (c, s) -> doTest(c));
+                ctx.suspendStateless(e, this::doTest);
             }
         }
         return null;
     }
 
-    public boolean doTest(Fiber ctx) {
+    public Boolean doTest(Fiber ctx) {
         try {
-            return test.executeBoolean(ctx);
+            return (Boolean) test.execute(ctx);
         } catch (Exception e) {
-            ctx.suspendStateless(e, (c, s) -> doBody(c, toBoolean(s)));
+            ctx.suspendStateless(e, (c, s) -> doBody(c, (Boolean) s));
         }
         return false; // suspend() will rethrow so this will never be reached
     }
 
-    public Object doBody(Fiber ctx, boolean test) {
+    public Object doBody(Fiber ctx, Boolean test) {
         var t = test;
         while (t && !ctx.checkInterrupt()) {
             try {
@@ -66,18 +64,18 @@ public Object doBody(Fiber ctx, boolean test) {
                 ctx.suspendStateless(e, this::doPost);
             }
 
-            doPost(ctx, 0);
+            doPost(ctx);
             t = doTest(ctx);
         }
         return 0;
     }
 
-    public Object doPost(Fiber ctx, Object prior) {
+    public Object doPost(Fiber ctx) {
         if (post != null) {
             try {
                 post.execute(ctx);
             } catch (Exception e) {
-                ctx.suspendStateless(e, (c, s) -> doTest(c));
+                ctx.suspendStateless(e, this::doTest);
             }
         }
         return null;

Lang/src/main/java/chipmunk/vm/tree/nodes/I2F.java

@@ -23,6 +23,8 @@
 import chipmunk.vm.tree.Fiber;
 import chipmunk.vm.tree.Node;
 
+import java.math.BigDecimal;
+
 public class If implements Node {
     public Node test;
     public Node _if;
@@ -32,7 +34,7 @@ public class If implements Node {
     public Object execute(Fiber ctx) {
         boolean t;
         try {
-            t = test.executeBoolean(ctx);
+            t = (Boolean) test.execute(ctx);
         } catch (Exception e) {
             throw e;
         }
@@ -45,6 +47,6 @@ public Object execute(Fiber ctx) {
         } else if (_else != null) {
             return _else.execute(ctx);
         }
-        return 0;
+        return new BigDecimal(0);
     }
 }

Lang/src/main/java/chipmunk/vm/tree/nodes/If.java

@@ -27,20 +27,21 @@ public class Iflt implements Node {
     public Node l, r;
 
     @Override
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public Object execute(Fiber ctx) {
-        int a;
+        Object a;
         try {
-            a = l.executeInt(ctx);
+            a = l.execute(ctx);
         } catch (Exception e) {
             throw e;
         }
 
-        int b;
+        Object b;
         try {
-            b = r.executeInt(ctx);
+            b = r.execute(ctx);
         } catch (Exception e) {
             throw e;
         }
-        return a < b ? 1 : 0;
+        return ((Comparable)a).compareTo(b) < 0;
     }
 }

Lang/src/main/java/chipmunk/vm/tree/nodes/Iflt.java

@@ -23,16 +23,16 @@
 import chipmunk.vm.tree.Fiber;
 import chipmunk.vm.tree.Node;
 
+import java.math.BigDecimal;
+
 public class Mul implements Node {
     public Node l, r;
 
     @Override
     public Object execute(Fiber ctx) {
-        return executeInt(ctx);
+        var a = (BigDecimal) l.execute(ctx);
+        var b = (BigDecimal) r.execute(ctx);
+        return a.multiply(b);
     }
 
-    @Override
-    public int executeInt(Fiber ctx) {
-        return l.executeInt(ctx) * r.executeInt(ctx);
-    }
 }

Lang/src/main/java/chipmunk/vm/tree/nodes/Mul.java

@@ -23,16 +23,15 @@
 import chipmunk.vm.tree.Fiber;
 import chipmunk.vm.tree.Node;
 
+import java.math.BigDecimal;
+
 public final class Sub implements Node {
     public Node l, r;
 
     @Override
     public Object execute(Fiber ctx) {
-        return executeInt(ctx);
-    }
-
-    @Override
-    public int executeInt(Fiber ctx) {
-        return l.executeInt(ctx) - r.executeInt(ctx);
+        var a = (BigDecimal) l.execute(ctx);
+        var b = (BigDecimal) r.execute(ctx);
+        return a.subtract(b);
     }
 }