1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

stringio.c: write multiple arguments

Browse Source 
* ext/stringio/stringio.c (strio_write_m): make StringIO#write
  accept multiple arguments, as well as IO#write.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60377 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-10-23 06:25:39 +00:00
parent 5682bc6ac5
commit aeaeb4b068
3 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -204,6 +204,9 @@ with all sufficient information, see the ChangeLog file or Redmine
* Add Set#=== as alias to #include? [Feature #13801] * Add Set#=== as alias to #include? [Feature #13801]
* Add Set#reset [Feature #6589] * Add Set#reset [Feature #6589]
* StringIO
* StringIO#write accepts multiple arguments
* WEBrick * WEBrick
* Add Server Name Indication (SNI) support [Feature #13729] * Add Server Name Indication (SNI) support [Feature #13729]

18
ext/stringio/stringio.c
View File

@ -35,6 +35,7 @@ struct StringIO {
static VALUE strio_init(int, VALUE *, struct StringIO *, VALUE); static VALUE strio_init(int, VALUE *, struct StringIO *, VALUE);
static VALUE strio_unget_bytes(struct StringIO *, const char *, long); static VALUE strio_unget_bytes(struct StringIO *, const char *, long);
static long strio_write(VALUE self, VALUE str);
#define IS_STRIO(obj) (rb_typeddata_is_kind_of((obj), &strio_data_type)) #define IS_STRIO(obj) (rb_typeddata_is_kind_of((obj), &strio_data_type))
#define error_inval(msg) (rb_syserr_fail(EINVAL, msg)) #define error_inval(msg) (rb_syserr_fail(EINVAL, msg))
@ -1256,6 +1257,17 @@ strio_readlines(int argc, VALUE *argv, VALUE self)
* Returns the number of bytes written. See IO#write. * Returns the number of bytes written. See IO#write.
*/ */
static VALUE static VALUE
strio_write_m(int argc, VALUE *argv, VALUE self)
{
long len = 0;
while (argc-- > 0) {
/* StringIO can't exceed long limit */
len += strio_write(self, *argv++);
}
return LONG2NUM(len);
}
static long
strio_write(VALUE self, VALUE str) strio_write(VALUE self, VALUE str)
{ {
struct StringIO *ptr = writable(self); struct StringIO *ptr = writable(self);
@ -1271,7 +1283,7 @@ strio_write(VALUE self, VALUE str)
str = rb_str_conv_enc(str, enc2, enc); str = rb_str_conv_enc(str, enc2, enc);
} }
len = RSTRING_LEN(str); len = RSTRING_LEN(str);
if (len == 0) return INT2FIX(0); if (len == 0) return 0;
check_modifiable(ptr); check_modifiable(ptr);
olen = RSTRING_LEN(ptr->string); olen = RSTRING_LEN(ptr->string);
if (ptr->flags & FMODE_APPEND) { if (ptr->flags & FMODE_APPEND) {
@ -1294,7 +1306,7 @@ strio_write(VALUE self, VALUE str)
OBJ_INFECT(ptr->string, self); OBJ_INFECT(ptr->string, self);
RB_GC_GUARD(str); RB_GC_GUARD(str);
ptr->pos += len; ptr->pos += len;
return LONG2NUM(len); return len;
} }
/* /*
@ -1668,7 +1680,7 @@ Init_stringio(void)
rb_define_method(StringIO, "readlines", strio_readlines, -1); rb_define_method(StringIO, "readlines", strio_readlines, -1);
rb_define_method(StringIO, "read", strio_read, -1); rb_define_method(StringIO, "read", strio_read, -1);
rb_define_method(StringIO, "write", strio_write, 1); rb_define_method(StringIO, "write", strio_write_m, -1);
rb_define_method(StringIO, "putc", strio_putc, 1); rb_define_method(StringIO, "putc", strio_putc, 1);
/* /*

10
test/stringio/test_stringio.rb
View File

@ -206,6 +206,16 @@ class TestStringIO < Test::Unit::TestCase
} }
end end
def test_write_with_multiple_arguments
s = ""
f = StringIO.new(s, "w")
f.write("foo", "bar")
f.close
assert_equal("foobar", s)
ensure
f.close unless f.closed?
end
def test_set_encoding def test_set_encoding
bug10285 = '[ruby-core:65240] [Bug #10285]' bug10285 = '[ruby-core:65240] [Bug #10285]'
f = StringIO.new() f = StringIO.new()