[Truffle] Handle String coercion in Encoding.find.

jruby · Feb 6, 2015 · 0a7f712 · 0a7f712 · chrisseaton · Feb 6, 2015
1 parent a005832
commit 0a7f712
Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/spec/truffle/tags/core/encoding/find_tags.txt b/spec/truffle/tags/core/encoding/find_tags.txt
@@ -1,6 +1,5 @@
 fails:Encoding.find returns the corresponding Encoding object if given a valid alias name
 fails:Encoding.find returns the passed Encoding object
-fails:Encoding.find accepts any object as encoding name, if it responds to #to_str
 fails:Encoding.find raises an ArgumentError if the given encoding does not exist
 fails:Encoding.find supports the 'locale' encoding alias
 fails:Encoding.find returns default external encoding for the 'external' encoding alias

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/EncodingNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/EncodingNodes.java
@@ -10,6 +10,8 @@
 package org.jruby.truffle.nodes.core;
 
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.CreateCast;
+import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.utilities.ConditionProfile;
@@ -20,6 +22,8 @@
 import org.jcodings.util.CaseInsensitiveBytesHash;
 import org.jcodings.util.Hash;
 import org.jruby.runtime.encoding.EncodingService;
+import org.jruby.truffle.nodes.RubyNode;
+import org.jruby.truffle.nodes.coerce.ToStrNodeFactory;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.core.RubyArray;
 import org.jruby.truffle.runtime.core.RubyEncoding;
@@ -224,7 +228,8 @@ public RubyNilClass defaultExternal(RubyNilClass encoding) {
     }
 
     @CoreMethod(names = "find", onSingleton = true, required = 1)
-    public abstract static class FindNode extends CoreMethodNode {
+    @NodeChild(value = "name")
+    public abstract static class FindNode extends RubyNode {
 
         public FindNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
@@ -234,6 +239,10 @@ public FindNode(FindNode prev) {
             super(prev);
         }
 
+        @CreateCast("name") public RubyNode coerceNameToString(RubyNode name) {
+            return ToStrNodeFactory.create(getContext(), getSourceSection(), name);
+        }
+
         @Specialization
         public RubyEncoding find(RubyString name) {
             notDesignedForCompilation();