ruby-changes:13360
From: naruse <ko1@a...>
Date: Mon, 28 Sep 2009 10:08:39 +0900 (JST)
Subject: [ruby-changes:13360] Ruby:r25127 (trunk): * stringio/stringio.c (strio_read): set ASCII-8BIT encoding
naruse 2009-09-28 10:08:24 +0900 (Mon, 28 Sep 2009) New Revision: 25127 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25127 Log: * stringio/stringio.c (strio_read): set ASCII-8BIT encoding when length argument is given. Modified files: trunk/ChangeLog trunk/ext/stringio/stringio.c trunk/test/stringio/test_stringio.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 25126) +++ ChangeLog (revision 25127) @@ -1,3 +1,8 @@ +Mon Sep 28 10:06:38 2009 NARUSE, Yui <naruse@r...> + + * stringio/stringio.c (strio_read): set ASCII-8BIT encoding + when length argument is given. + Mon Sep 28 01:28:17 2009 Yutaka Kanemoto <kanemoto@r...> * Makefile.in (miniruby): suppress duplication warning on AIX. Index: ext/stringio/stringio.c =================================================================== --- ext/stringio/stringio.c (revision 25126) +++ ext/stringio/stringio.c (revision 25127) @@ -1168,7 +1168,7 @@ { struct StringIO *ptr = readable(StringIO(self)); VALUE str = Qnil; - long len, olen; + long len; switch (argc) { case 2: @@ -1177,7 +1177,7 @@ rb_str_modify(str); case 1: if (!NIL_P(argv[0])) { - len = olen = NUM2LONG(argv[0]); + len = NUM2LONG(argv[0]); if (len < 0) { rb_raise(rb_eArgError, "negative length %ld given", len); } @@ -1189,7 +1189,6 @@ } /* fall through */ case 0: - olen = -1; len = RSTRING_LEN(ptr->string); if (len <= ptr->pos) { if (NIL_P(str)) { @@ -1209,6 +1208,7 @@ } if (NIL_P(str)) { str = strio_substr(ptr, ptr->pos, len); + if (argc > 0) rb_enc_associate(str, rb_ascii8bit_encoding()); } else { long rest = RSTRING_LEN(ptr->string) - ptr->pos; Index: test/stringio/test_stringio.rb =================================================================== --- test/stringio/test_stringio.rb (revision 25126) +++ test/stringio/test_stringio.rb (revision 25127) @@ -382,9 +382,12 @@ end def test_read - f = StringIO.new("1234") + f = StringIO.new("\u3042\u3044") assert_raise(ArgumentError) { f.read(-1) } assert_raise(ArgumentError) { f.read(1, 2, 3) } + assert_equal("\u3042\u3044", f.read) + f.rewind + assert_equal("\u3042\u3044".force_encoding(Encoding::ASCII_8BIT), f.read(f.size)) end def test_size -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/