1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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_6@17662 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2008-06-29 08:21:46 +00:00
parent 04c232c95c
commit df1b7c729f
3 changed files with 6 additions and 3 deletions

View file

@ -1,3 +1,8 @@
Sun Jun 29 17:21:08 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:18:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/stringio/stringio.c (strio_readline, strio_each)

View file

@ -969,7 +969,6 @@ strio_each(argc, argv, self)
VALUE line;
while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) {
rb_lastline_set(line);
rb_yield(line);
}
return self;
@ -992,7 +991,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;
}

View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-29"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20080629
#define RUBY_PATCHLEVEL 243
#define RUBY_PATCHLEVEL 244
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8