[Truffle] Fix formatting of Bignum

jruby · May 16, 2015 · 5c1ee15 · 5c1ee15
1 parent eb3c9bd
commit 5c1ee15
Showing 2 changed files with 49 additions and 0 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/pack/nodes/format/FormatIntegerNode.java b/truffle/src/main/java/org/jruby/truffle/pack/nodes/format/FormatIntegerNode.java
@@ -13,12 +13,16 @@
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
+import org.jruby.truffle.nodes.core.BignumNodes;
 import org.jruby.truffle.pack.nodes.PackNode;
 import org.jruby.truffle.pack.parser.FormatDirective;
 import org.jruby.truffle.runtime.RubyContext;
+import org.jruby.truffle.runtime.core.RubyBasicObject;
 import org.jruby.util.ByteList;
 
+import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
+import java.util.Locale;
 
 @NodeChildren({
         @NodeChild(value = "value", type = PackNode.class),
@@ -46,6 +50,43 @@ public ByteList format(long value) {
         return doFormat(value);
     }
 
+    @CompilerDirectives.TruffleBoundary
+    @Specialization(guards = "isRubyBignum(value)")
+    public ByteList format(RubyBasicObject value) {
+        final BigInteger bigInteger = BignumNodes.getBigIntegerValue(value);
+
+        String formatted;
+
+        switch (format) {
+            case 'd':
+            case 'i':
+            case 'u':
+                formatted = bigInteger.toString();
+                break;
+
+            case 'x':
+                formatted = bigInteger.toString(16).toLowerCase(Locale.ENGLISH);
+                break;
+
+            case 'X':
+                formatted = bigInteger.toString(16).toUpperCase(Locale.ENGLISH);
+                break;
+
+            default:
+                throw new UnsupportedOperationException();
+        }
+
+        while (formatted.length() < spacePadding) {
+            formatted = " " + formatted;
+        }
+
+        while (formatted.length() < zeroPadding) {
+            formatted = "0" + formatted;
+        }
+
+        return new ByteList(formatted.getBytes(StandardCharsets.US_ASCII));
+    }
+
     @CompilerDirectives.TruffleBoundary
     protected ByteList doFormat(Object value) {
         // TODO CS 3-May-15 write this without building a string and formatting

diff --git a/truffle/src/main/java/org/jruby/truffle/pack/nodes/type/ToIntegerNode.java b/truffle/src/main/java/org/jruby/truffle/pack/nodes/type/ToIntegerNode.java
@@ -15,6 +15,9 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import org.jruby.truffle.pack.nodes.PackNode;
 import org.jruby.truffle.runtime.RubyContext;
+import org.jruby.truffle.runtime.core.RubyBasicObject;
+
+import java.math.BigInteger;
 
 @NodeChildren({
         @NodeChild(value = "value", type = PackNode.class),
@@ -37,6 +40,11 @@ public long toInteger(VirtualFrame frame, long value) {
         return value;
     }
 
+    @Specialization(guards = "isRubyBignum(value)")
+    public RubyBasicObject toInteger(VirtualFrame frame, RubyBasicObject value) {
+        return value;
+    }
+
     @Specialization
     public long toInteger(VirtualFrame frame, double value) {
         return (long) value;