[Truffle] Implement String.new encoding argument

jruby · Dec 8, 2016 · e8cbcd7 · nirvdrum · Dec 8, 2016 · eregon
1 parent 1cc597d
commit e8cbcd7
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 7 deletions.
diff --git a/spec/truffle/tags/core/string/new_tags.txt b/spec/truffle/tags/core/string/new_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java b/truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java
@@ -1271,41 +1271,66 @@ public int hash(DynamicObject string) {
 
     }
 
-    @CoreMethod(names = "initialize", optional = 1, taintFrom = 1)
+    @CoreMethod(names = "initialize_internal", optional = 2, taintFrom = 1)
     public abstract static class InitializeNode extends CoreMethodArrayArgumentsNode {
 
         @Child private IsFrozenNode isFrozenNode;
         @Child private ToStrNode toStrNode;
+        @Child private CallDispatchHeadNode forceEncodingNode;
 
         @Specialization
-        public DynamicObject initialize(DynamicObject self, NotProvided from) {
+        public DynamicObject initialize(DynamicObject self, NotProvided from, NotProvided encoding) {
             return self;
         }
 
         @Specialization
-        public DynamicObject initializeJavaString(DynamicObject self, String from) {
+        public DynamicObject initializeJavaString(DynamicObject self, String from, NotProvided encoding) {
             raiseIfFrozen(self);
             StringOperations.setRope(self, StringOperations.encodeRope(from, ASCIIEncoding.INSTANCE));
             return self;
         }
 
         @Specialization(guards = "isRubyString(from)")
-        public DynamicObject initialize(DynamicObject self, DynamicObject from) {
+        public DynamicObject initialize(DynamicObject self, DynamicObject from, NotProvided encoding) {
             raiseIfFrozen(self);
 
             StringOperations.setRope(self, rope(from));
 
             return self;
         }
 
+        @Specialization(guards = {"isRubyString(from)"})
+        public DynamicObject initialize(VirtualFrame frame, DynamicObject self, DynamicObject from, DynamicObject encoding) {
+            raiseIfFrozen(self);
+
+            StringOperations.setRope(self, rope(from));
+
+            if (forceEncodingNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                forceEncodingNode = insert(DispatchHeadNodeFactory.createMethodCall(getContext()));
+            }
+
+            return (DynamicObject) forceEncodingNode.call(frame, self, "force_encoding", encoding);
+        }
+
+        @Specialization(guards = { "!isRubyString(from)", "!isString(from)", "wasProvided(from)" })
+        public DynamicObject initialize(VirtualFrame frame, DynamicObject self, Object from, NotProvided encoding) {
+            if (toStrNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                toStrNode = insert(ToStrNodeGen.create(getContext(), null, null));
+            }
+
+            return initialize(self, toStrNode.executeToStr(frame, from), NotProvided.INSTANCE);
+        }
+
         @Specialization(guards = { "!isRubyString(from)", "!isString(from)", "wasProvided(from)" })
-        public DynamicObject initialize(VirtualFrame frame, DynamicObject self, Object from) {
+        public DynamicObject initialize(VirtualFrame frame, DynamicObject self, Object from, DynamicObject encoding) {
             if (toStrNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 toStrNode = insert(ToStrNodeGen.create(getContext(), null, null));
             }
 
-            return initialize(self, toStrNode.executeToStr(frame, from));
+            return initialize(frame, self, toStrNode.executeToStr(frame, from), encoding);
         }
 
         protected void raiseIfFrozen(Object object) {

diff --git a/truffle/src/main/ruby/core/string.rb b/truffle/src/main/ruby/core/string.rb
@@ -1555,6 +1555,18 @@ def index(str, start=undefined)
     m.character_index str, start
   end
 
+  def initialize(other = undefined, encoding: undefined)
+    if !undefined.equal?(other) && !undefined.equal?(encoding)
+      return self.initialize_internal(other, encoding)
+    elsif !undefined.equal?(other)
+      return self.initialize_internal(other)
+    elsif !undefined.equal?(encoding)
+      return self.initialize_internal("", encoding)
+    end
+
+    self.initialize_internal
+  end
+
   def rindex(sub, finish=undefined)
     if undefined.equal?(finish)
       finish = size