jruby · Dec 9, 2014 · Dec 9, 2014
Showing with 13 additions and 5 deletions.

+11 −2 core/src/main/java/org/jruby/truffle/nodes/core/InterpolatedStringNode.java

+2 −2 core/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java

+0 −1 spec/truffle/tags/language/string_tags.txt
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/InterpolatedStringNode.java b/core/src/main/java/org/jruby/truffle/nodes/core/InterpolatedStringNode.java
@@ -14,9 +14,9 @@
 import com.oracle.truffle.api.frame.*;
 import com.oracle.truffle.api.nodes.*;
 import org.jruby.truffle.nodes.*;
-import org.jruby.truffle.nodes.dispatch.Dispatch;
 import org.jruby.truffle.nodes.dispatch.DispatchHeadNode;
 import org.jruby.truffle.runtime.*;
+import org.jruby.truffle.runtime.core.RubyBasicObject;
 import org.jruby.truffle.runtime.core.RubyString;
 import org.jruby.util.ByteList;
 
@@ -40,7 +40,16 @@ public Object execute(VirtualFrame frame) {
         final RubyString[] strings = new RubyString[children.length];
 
         for (int n = 0; n < children.length; n++) {
-            strings[n] = (RubyString) toS.call(frame, children[n].execute(frame), "to_s", null);
+            Object result = toS.call(frame, children[n].execute(frame), "to_s", null);
+
+            if (result instanceof RubyString) {
+                strings[n] = (RubyString) result;
+            } else if (result instanceof RubyBasicObject) {
+                strings[n] = KernelNodesFactory.ToSNodeFactory.create(getContext(), getSourceSection(), new RubyNode[]{}).toS((RubyBasicObject) result);
+            } else {
+                RubyBasicObject boxed = getContext().getCoreLibrary().getLogicalClass(result);
+                strings[n] = KernelNodesFactory.ToSNodeFactory.create(getContext(), getSourceSection(), new RubyNode[]{}).toS(boxed);
+            }
         }
 
         return concat(strings);

diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -496,7 +496,7 @@ public Object eval(RubyString source, @SuppressWarnings("unused") UndefinedPlace
             notDesignedForCompilation();
 
             RubyBinding defaultBinding = (RubyBinding) KernelNodesFactory.BindingNodeFactory.create(getContext(),
-                    getSourceSection(), null).binding();
+                    getSourceSection(), new RubyNode[]{}).binding();
 
             return eval(source, defaultBinding);
         }
@@ -513,7 +513,7 @@ public Object eval(VirtualFrame frame, RubyBasicObject object, @SuppressWarnings
             notDesignedForCompilation();
 
             RubyBinding defaultBinding = (RubyBinding) KernelNodesFactory.BindingNodeFactory.create(getContext(),
-                    getSourceSection(), null).binding();
+                    getSourceSection(), new RubyNode[]{}).binding();
 
             return eval(frame, object, defaultBinding);
         }

diff --git a/spec/truffle/tags/language/string_tags.txt b/spec/truffle/tags/language/string_tags.txt
@@ -7,4 +7,3 @@ fails:Ruby character strings Unicode escaping with US-ASCII source encoding prod
 fails:Ruby String interpolation creates a String having an Encoding compatible with all components
 fails:Ruby String interpolation creates a String having the Encoding of the components when all are the same Encoding
 fails:Ruby String interpolation raises an Encoding::CompatibilityError if the Encodings are not compatible
-fails:Ruby character strings uses an internal representation when #to_s doesn't return a String