matz	2009-06-15 18:54:36 +0900 (Mon, 15 Jun 2009)

  New Revision: 23694

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23694

  Log:
    * io.c (argf_each_line): should return self.  [ruby-core:23852]
    * io.c (argf_each_byte, argf_each_char): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 23693)
+++ ChangeLog	(revision 23694)
@@ -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: io.c
===================================================================
--- io.c	(revision 23693)
+++ io.c	(revision 23694)
@@ -8406,11 +8406,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
@@ -8418,7 +8417,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;
     }
@@ -8429,7 +8428,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;
     }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/