StringIO#write takes multiple arguments. #4876

jruby · Mar 27, 2018 · be3bd17 · be3bd17
1 parent ab440ad
commit be3bd17
Showing 1 changed file with 19 additions and 5 deletions.
diff --git a/core/src/main/java/org/jruby/ext/stringio/StringIO.java b/core/src/main/java/org/jruby/ext/stringio/StringIO.java
@@ -1163,11 +1163,25 @@ public IRubyObject ungetbyte(ThreadContext context, IRubyObject arg) {
     }
 
     // MRI: strio_write
-    @JRubyMethod(name = {"write"}, required = 1)
+    @JRubyMethod(name = "write")
     public IRubyObject write(ThreadContext context, IRubyObject arg) {
-        checkWritable();
+        Ruby runtime = context.runtime;
+        return RubyFixnum.newFixnum(runtime, stringIOWrite(context, runtime, arg));
+    }
 
-        final Ruby runtime = context.runtime;
+    @JRubyMethod(name = "write", required = 1, rest = true)
+    public IRubyObject write(ThreadContext context, IRubyObject[] args) {
+        Ruby runtime = context.runtime;
+        long len = 0;
+        for (IRubyObject arg : args) {
+            len += stringIOWrite(context, runtime, arg);
+        }
+        return RubyFixnum.newFixnum(runtime, len);
+    }
+
+    // MRI: strio_write
+    private long stringIOWrite(ThreadContext context, Ruby runtime, IRubyObject arg) {
+        checkWritable();
 
         RubyString str = arg.asString();
         int len, olen;
@@ -1184,7 +1198,7 @@ public IRubyObject write(ThreadContext context, IRubyObject arg) {
                 str = EncodingUtils.strConvEnc(context, str, encStr, enc);
             }
             len = str.size();
-            if (len == 0) return RubyFixnum.zero(runtime);
+            if (len == 0) return 0;
             checkModifiable();
             olen = ptr.string.size();
             if ((ptr.flags & OpenFile.APPEND) != 0) {
@@ -1202,7 +1216,7 @@ public IRubyObject write(ThreadContext context, IRubyObject arg) {
             ptr.pos += len;
         }
 
-        return RubyFixnum.newFixnum(runtime, len);
+        return len;
     }
 
     @JRubyMethod