diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-29 08:22:39 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-29 08:22:39 +0000 |
commit | 52fe0d4fb3d7b5b77b82d3a2e439aab134524b82 (patch) | |
tree | d5ca6685f81f03b43ac856e63c0aaf0d4d76ff11 | |
parent | 40303dfb0557c210a7a21940fee86de9cf7424a5 (diff) |
merge revision(s) 17366:
* ext/stringio/stringio.c (strio_each, strio_readlines): IO#each and
IO#readlines do not affect $_. [ruby-core:17277]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@17664 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/stringio/stringio.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 6 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sun Jun 29 17:22:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/stringio/stringio.c (strio_each, strio_readlines): IO#each and + IO#readlines do not affect $_. [ruby-core:17277] + Sun Jun 29 17:19:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/stringio/stringio.c (strio_readline, strio_each) diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index 1a6502ed4d..537fc19a4e 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -1014,7 +1014,6 @@ strio_each(argc, argv, self) RETURN_ENUMERATOR(self, argc, argv); while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) { - rb_lastline_set(line); rb_yield(line); } return self; @@ -1037,7 +1036,6 @@ strio_readlines(argc, argv, self) while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) { rb_ary_push(ary, line); } - rb_lastline_set(Qnil); return ary; } @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-29" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20080629 -#define RUBY_PATCHLEVEL 26 +#define RUBY_PATCHLEVEL 27 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |