[Truffle] All Encoding.{default_interal, default_internal=} specs now…

… pass.
jruby · Feb 6, 2015 · 53665ec · eregon · Feb 6, 2015 · nirvdrum
1 parent 0a7f712
commit 53665ec
Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/spec/truffle/tags/core/encoding/default_internal_tags.txt b/spec/truffle/tags/core/encoding/default_internal_tags.txt
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
@@ -13,6 +13,7 @@
 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.frame.VirtualFrame;
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.utilities.ConditionProfile;
 import org.jcodings.Encoding;
@@ -23,6 +24,7 @@
 import org.jcodings.util.Hash;
 import org.jruby.runtime.encoding.EncodingService;
 import org.jruby.truffle.nodes.RubyNode;
+import org.jruby.truffle.nodes.coerce.ToStrNode;
 import org.jruby.truffle.nodes.coerce.ToStrNodeFactory;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.core.RubyArray;
@@ -199,6 +201,8 @@ public RubyEncoding defaultExternal(RubyEncoding encoding) {
     @CoreMethod(names = "default_internal=", onSingleton = true, required = 1)
     public abstract static class SetDefaultInternalNode extends CoreMethodNode {
 
+        @Child private ToStrNode toStrNode;
+
         public SetDefaultInternalNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
@@ -208,7 +212,7 @@ public SetDefaultInternalNode(SetDefaultInternalNode prev) {
         }
 
         @Specialization
-        public RubyEncoding defaultExternal(RubyEncoding encoding) {
+        public RubyEncoding defaultInternal(RubyEncoding encoding) {
             notDesignedForCompilation();
 
             getContext().getRuntime().setDefaultInternalEncoding(encoding.getEncoding());
@@ -217,14 +221,29 @@ public RubyEncoding defaultExternal(RubyEncoding encoding) {
         }
 
         @Specialization
-        public RubyNilClass defaultExternal(RubyNilClass encoding) {
+        public RubyNilClass defaultInternal(RubyNilClass encoding) {
             notDesignedForCompilation();
 
-            getContext().getRuntime().setDefaultInternalEncoding(ASCIIEncoding.INSTANCE);
+            getContext().getRuntime().setDefaultInternalEncoding(null);
 
             return encoding;
         }
 
+        @Specialization
+        public RubyString defaultInternal(VirtualFrame frame, Object encoding) {
+            notDesignedForCompilation();
+
+            if (toStrNode == null) {
+                CompilerDirectives.transferToInterpreter();
+                toStrNode = insert(ToStrNodeFactory.create(getContext(), getSourceSection(), null));
+            }
+
+            final RubyString encodingName = toStrNode.executeRubyString(frame, encoding);
+            getContext().getRuntime().setDefaultInternalEncoding(RubyEncoding.getEncoding(encodingName.toString()).getEncoding());
+
+            return encodingName;
+        }
+
     }
 
     @CoreMethod(names = "find", onSingleton = true, required = 1)