From f5f1a18ceb87cd8ffa065a57b95f6d716ed6902c Mon Sep 17 00:00:00 2001
From: knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 14 Apr 2008 09:19:52 +0000
Subject: * enum.c (enum_find, enum_reject): Return an enumerator if no   block
 is given.

* io.c (rb_io_each_line, rb_io_each_byte, rb_io_s_foreach,
  argf_each_line, argf_each_byte): Ditto.

* string.c (str_gsub): Ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16010 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 io.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'io.c')

diff --git a/io.c b/io.c
index 8523197f07..4fadfbb5a3 100644
--- a/io.c
+++ b/io.c
@@ -1964,6 +1964,7 @@ rb_io_each_line(argc, argv, io)
     VALUE str;
     VALUE rs;
 
+    RETURN_ENUMERATOR(io, argc, argv);
     if (argc == 0) {
 	rs = rb_rs;
     }
@@ -1999,6 +2000,7 @@ rb_io_each_byte(io)
     FILE *f;
     int c;
 
+    RETURN_ENUMERATOR(io, 0, 0);
     GetOpenFile(io, fptr);
 
     for (;;) {
@@ -5268,14 +5270,16 @@ io_s_foreach(arg)
  */     
 
 static VALUE
-rb_io_s_foreach(argc, argv)
+rb_io_s_foreach(argc, argv, self)
     int argc;
     VALUE *argv;
+    VALUE self;
 {
     VALUE fname;
     struct foreach_arg arg;
 
     rb_scan_args(argc, argv, "11", &fname, &arg.sep);
+    RETURN_ENUMERATOR(self, argc, argv);
     SafeStringValue(fname);
 
     if (argc == 1) {
@@ -5527,12 +5531,14 @@ argf_readchar()
 }
 
 static VALUE
-argf_each_line(argc, argv)
+argf_each_line(argc, argv, argf)
     int argc;
     VALUE *argv;
+    VALUE argf;
 {
     VALUE str;
 
+    RETURN_ENUMERATOR(argf, argc, argv);
     if (!next_argv()) return Qnil;
     if (TYPE(current_file) != T_FILE) {
 	for (;;) {
@@ -5548,10 +5554,12 @@ argf_each_line(argc, argv)
 }
 
 static VALUE
-argf_each_byte()
+argf_each_byte(argf)
+    VALUE argf;
 {
     VALUE byte;
 
+    RETURN_ENUMERATOR(argf, 0, 0);
     while (!NIL_P(byte = argf_getc())) {
 	rb_yield(byte);
     }
-- 
cgit v1.2.3