[Truffle] Support for byte, short and float.

jruby · Dec 20, 2015 · 4bca4fd · 4bca4fd
1 parent 9016ea4
commit 4bca4fd
Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/RubyTypes.java b/truffle/src/main/java/org/jruby/truffle/nodes/RubyTypes.java
@@ -16,7 +16,22 @@
 public abstract class RubyTypes {
 
     @ImplicitCast
-    public static long int2long(int value) {
+    public static int promote(byte value) {
+        return value;
+    }
+
+    @ImplicitCast
+    public static int promote(short value) {
+        return value;
+    }
+
+    @ImplicitCast
+    public static long promote(int value) {
+        return value;
+    }
+
+    @ImplicitCast
+    public static double promote(float value) {
         return value;
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
@@ -787,10 +787,16 @@ public DynamicObject getMetaClass(Object object) {
             } else {
                 return falseClass;
             }
+        } else if (object instanceof Byte) {
+            return fixnumClass;
+        } else if (object instanceof Short) {
+            return fixnumClass;
         } else if (object instanceof Integer) {
             return fixnumClass;
         } else if (object instanceof Long) {
             return fixnumClass;
+        } else if (object instanceof Float) {
+            return floatClass;
         } else if (object instanceof Double) {
             return floatClass;
         } else if (object == null) {
@@ -810,10 +816,16 @@ public DynamicObject getLogicalClass(Object object) {
             } else {
                 return falseClass;
             }
+        } else if (object instanceof Byte) {
+            return fixnumClass;
+        } else if (object instanceof Short) {
+            return fixnumClass;
         } else if (object instanceof Integer) {
             return fixnumClass;
         } else if (object instanceof Long) {
             return fixnumClass;
+        } else if (object instanceof Float) {
+            return floatClass;
         } else if (object instanceof Double) {
             return floatClass;
         } else if (object == null) {