jruby · Jan 25, 2016 · Jan 25, 2016 · Jan 25, 2016
Showing with 27 additions and 3 deletions.

+8 −0 truffle/src/main/java/org/jruby/truffle/nodes/RubyGuards.java

+17 −1 truffle/src/main/java/org/jruby/truffle/nodes/core/TruffleInteropNodes.java

+2 −2 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/IOPrimitiveNodes.java
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/RubyGuards.java b/truffle/src/main/java/org/jruby/truffle/nodes/RubyGuards.java
@@ -35,6 +35,10 @@ public static boolean isDouble(Object value) {
         return value instanceof Double;
     }
 
+    public static boolean isJavaCharSequence(Object value) {
+        return value instanceof CharSequence;
+    }
+
     // Ruby types
 
     public static boolean isRubyBasicObject(Object object) {
@@ -223,6 +227,10 @@ public static boolean isThreadLocal(Object value) {
         return value instanceof ThreadLocalObject;
     }
 
+    public static boolean isTruffleObject(Object object) {
+        return object instanceof TruffleObject;
+    }
+
     public static boolean isForeignObject(Object object) {
         return object instanceof TruffleObject && !isRubyBasicObject(object);
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/TruffleInteropNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/TruffleInteropNodes.java
@@ -113,11 +113,21 @@ public IsBoxedPrimitiveNode(RubyContext context, SourceSection sourceSection) {
             this.node = Message.IS_BOXED.createNode();
         }
 
+        @Specialization
+        public boolean isBoxedPrimitive(VirtualFrame frame, CharSequence receiver) {
+            return true;
+        }
+
         @Specialization
         public boolean isBoxedPrimitive(VirtualFrame frame, TruffleObject receiver) {
             return (boolean) ForeignAccess.execute(node, frame, receiver);
         }
 
+        @Specialization(guards = {"!isTruffleObject(receiver)", "!isJavaCharSequence(receiver)"})
+        public boolean isBoxedPrimitive(VirtualFrame frame, Object receiver) {
+            return false;
+        }
+
     }
 
     @CoreMethod(names = "null?", isModuleFunction = true, needsSelf = false, required = 1)
@@ -267,6 +277,13 @@ public UnboxValueNode(RubyContext context, SourceSection sourceSection) {
             this.node = Message.UNBOX.createNode();
         }
 
+        @Specialization
+        public DynamicObject executeForeign(VirtualFrame frame, CharSequence receiver) {
+            // TODO CS-21-Dec-15 this shouldn't be needed - we need to convert j.l.String to Ruby's String automatically
+
+            return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), ByteList.create(receiver), StringSupport.CR_UNKNOWN, null);
+        }
+
         @Specialization
         public Object executeForeign(VirtualFrame frame, TruffleObject receiver) {
             return ForeignAccess.execute(node, frame, receiver);
@@ -337,7 +354,6 @@ protected static String rubyStringToString(DynamicObject rubyString) {
     @CoreMethod(names = "import", isModuleFunction = true, needsSelf = false, required = 1)
     public abstract static class ImportNode extends CoreMethodArrayArgumentsNode {
 
-
         public ImportNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/IOPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/IOPrimitiveNodes.java
@@ -241,7 +241,7 @@ public DynamicObject ensureOpen(VirtualFrame frame, DynamicObject file) {
 
     }
 
-    @RubiniusPrimitive(name = "io_read_if_available")
+    @RubiniusPrimitive(name = "io_read_if_available", lowerFixnumParameters = 0)
     public static abstract class IOReadIfAvailableNode extends RubiniusPrimitiveNode {
 
         private static final FDSetFactory fdSetFactory = FDSetFactoryFactory.create();
@@ -564,7 +564,7 @@ public DynamicObject sysread(VirtualFrame frame, DynamicObject file, int length)
 
     }
 
-    @RubiniusPrimitive(name = "io_select", needsSelf = false)
+    @RubiniusPrimitive(name = "io_select", needsSelf = false, lowerFixnumParameters = 3)
     public static abstract class IOSelectPrimitiveNode extends RubiniusPrimitiveNode {
 
         private static final FDSetFactory fdSetFactory = FDSetFactoryFactory.create();