* 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

5 files changed, 38 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 711b4ba8be..aee7dc2299 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Apr 14 18:14:19 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* 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.
+
 Mon Apr 14 18:10:05 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* enum.c (find_index_i, find_index_iter_i): add prototype for VC.
diff --git a/NEWS b/NEWS
index e92ec21c8d..59f8908d72 100644
--- a/NEWS
+++ b/NEWS
@@ -68,8 +68,10 @@ with all sufficient information, see the ChangeLog file.
 
     New methods.
 
+  * Enumerable#find
   * Enumerable#find_all
   * Enumerable#partition
+  * Enumerable#reject
   * Enumerable#select
   * Enumerable#sort_by
 
@@ -105,6 +107,16 @@ with all sufficient information, see the ChangeLog file.
 
     Return an enumerator if no block is given.
 
+  * IO#each
+  * IO#each_line
+  * IO#each_byte
+  * IO.foreach
+  * ARGF.each
+  * ARGF.each_line
+  * ARGF.each_byte
+
+    Return an enumerator if no block is given.
+
   * Numeric#step
 
     Return an enumerator if no block is given.
@@ -137,6 +149,7 @@ with all sufficient information, see the ChangeLog file.
   * String#each_byte
   * String#each
   * String#each_lines
+  * String#gsub(pattern)
 
     Return an enumerator if no block is given.
 
diff --git a/enum.c b/enum.c
index 7134a6aa84..91da8d758f 100644
--- a/enum.c
+++ b/enum.c
@@ -219,6 +219,7 @@ enum_find(argc, argv, obj)
     VALUE if_none;
 
     rb_scan_args(argc, argv, "01", &if_none);
+    RETURN_ENUMERATOR(obj, argc, argv);
     rb_iterate(rb_each, obj, find_i, (VALUE)&memo);
     if (memo != Qundef) {
 	return memo;
@@ -366,6 +367,7 @@ enum_reject(obj)
 {
     VALUE ary = rb_ary_new();
     
+    RETURN_ENUMERATOR(obj, 0, 0);
     rb_iterate(rb_each, obj, reject_i, ary);
 
     return ary;
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);
     }
diff --git a/string.c b/string.c
index bb3ba22ba7..403d595527 100644
--- a/string.c
+++ b/string.c
@@ -2096,7 +2096,8 @@ str_gsub(argc, argv, str, bang)
     char *buf, *bp, *sp, *cp;
     int tainted = 0;
 
-    if (argc == 1 && rb_block_given_p()) {
+    if (argc == 1) {
+        RETURN_ENUMERATOR(str, argc, argv);
 	iter = 1;
     }
     else if (argc == 2) {