[truffle] Smart numify doubles

Raku · Jul 5, 2018 · ded1527 · ded1527
1 parent 527fe84
commit ded1527
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPCoerceNumToStrNode.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPCoerceNumToStrNode.java
@@ -14,9 +14,8 @@ public NQPCoerceNumToStrNode(NQPNode argNode) {
         this.argNode = argNode;
     }
 
-    @Override
-    public String executeStr(VirtualFrame frame) {
-        double in = argNode.executeNum(frame);
+
+    public static String coerce(double in) {
         if (in == (long)in) {
             if (in == 0 && Double.toString(in).equals("-0.0")) {
                 return "-0";
@@ -33,4 +32,10 @@ public String executeStr(VirtualFrame frame) {
             return Double.toString(in);
         }
     }
+
+    @Override
+    public String executeStr(VirtualFrame frame) {
+        double in = argNode.executeNum(frame);
+        return coerce(in);
+    }
 }
diff --git a/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPSmartStringifyNode.java b/src/vm/jvm/runtime/org/perl6/nqp/truffle/nodes/expression/NQPSmartStringifyNode.java
@@ -66,7 +66,10 @@ public String executeStr(VirtualFrame frame) {
             return (String) value;
         } else if (value instanceof Long) {
             return ((Long) value).toString();
+        } else if (value instanceof Double) {
+            return NQPCoerceNumToStrNode.coerce((double) value);
+        } else {
+            throw new RuntimeException("can't smart stringify: " + value.getClass().getCanonicalName());
         }
-        throw new RuntimeException("can't smart stringify: " + value.getClass().getCanonicalName());
     }
 }