From 52fe0d4fb3d7b5b77b82d3a2e439aab134524b82 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 29 Jun 2008 08:22:39 +0000 Subject: 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 --- ChangeLog | 5 +++++ ext/stringio/stringio.c | 2 -- version.h | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01b3d116f3..0f6347f522 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 29 17:22:09 2008 Nobuyoshi Nakada + + * 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 * 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; } diff --git a/version.h b/version.h index 414c85d8fd..1bcb071a94 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3