ruby-changes:12117
From: yugui <ko1@a...>
Date: Sun, 21 Jun 2009 18:15:58 +0900 (JST)
Subject: [ruby-changes:12117] Ruby:r23788 (ruby_1_9_1): merges r23694 from trunk into ruby_1_9_1.
yugui 2009-06-21 18:15:39 +0900 (Sun, 21 Jun 2009) New Revision: 23788 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23788 Log: 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. Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/io.c branches/ruby_1_9_1/version.h Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 23787) +++ ruby_1_9_1/ChangeLog (revision 23788) @@ -1,3 +1,9 @@ +Mon Jun 15 18:48:41 2009 Yukihiro Matsumoto <matz@r...> + + * 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 <matz@r...> * gc.c (os_obj_of): invoke garbage collection before iteration, to Index: ruby_1_9_1/io.c =================================================================== --- ruby_1_9_1/io.c (revision 23787) +++ ruby_1_9_1/io.c (revision 23788) @@ -8225,11 +8225,10 @@ { 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 @@ { 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 @@ { 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; } Index: ruby_1_9_1/version.h =================================================================== --- ruby_1_9_1/version.h (revision 23787) +++ ruby_1_9_1/version.h (revision 23788) @@ -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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/