From 2bad96cedb1c7ef0cc994efefcc5e206c641b088 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 21 Jun 2009 09:15:39 +0000 Subject: merges r23694 from trunk into ruby_1_9_1. -- * io.c (argf_each_line): should return self. [ruby-core:23852] * io.c (argf_each_byte, argf_each_char): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23788 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ io.c | 7 +++---- version.h | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index af447f81f..c82e77760 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jun 15 18:48:41 2009 Yukihiro Matsumoto + + * io.c (argf_each_line): should return self. [ruby-core:23852] + + * io.c (argf_each_byte, argf_each_char): ditto. + Mon Jun 15 17:48:42 2009 Yukihiro Matsumoto * gc.c (os_obj_of): invoke garbage collection before iteration, to diff --git a/io.c b/io.c index 1d7b6eea8..477d1168e 100644 --- a/io.c +++ b/io.c @@ -8225,11 +8225,10 @@ argf_each_line(int argc, VALUE *argv, VALUE argf) { RETURN_ENUMERATOR(argf, argc, argv); for (;;) { - if (!next_argv()) return Qnil; + if (!next_argv()) return argf; rb_block_call(ARGF.current_file, rb_intern("each_line"), argc, argv, rb_yield, 0); ARGF.next_p = 1; } - return argf; } static VALUE @@ -8237,7 +8236,7 @@ argf_each_byte(VALUE argf) { RETURN_ENUMERATOR(argf, 0, 0); for (;;) { - if (!next_argv()) return Qnil; + if (!next_argv()) return argf; rb_block_call(ARGF.current_file, rb_intern("each_byte"), 0, 0, rb_yield, 0); ARGF.next_p = 1; } @@ -8248,7 +8247,7 @@ argf_each_char(VALUE argf) { RETURN_ENUMERATOR(argf, 0, 0); for (;;) { - if (!next_argv()) return Qnil; + if (!next_argv()) return argf; rb_block_call(ARGF.current_file, rb_intern("each_char"), 0, 0, rb_yield, 0); ARGF.next_p = 1; } diff --git a/version.h b/version.h index cd53f1347..4f760c134 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2009-05-22" -#define RUBY_PATCHLEVEL 178 +#define RUBY_PATCHLEVEL 179 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit