19991029

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 12 insertions, 12 deletions

diff --git a/enum.c b/enum.c
index dc7e2112a..05194c1f5 100644
--- a/enum.c
+++ b/enum.c
@@ -153,18 +153,6 @@ collect_i(i, tmp)
 }
 
 static VALUE
-enum_collect(obj)
-    VALUE obj;
-{
-    VALUE tmp;
-
-    tmp = rb_ary_new();
-    rb_iterate(rb_each, obj, collect_i, tmp);
-
-    return tmp;
-}
-
-static VALUE
 enum_all(i, ary)
     VALUE i, ary;
 {
@@ -185,6 +173,18 @@ enum_to_a(obj)
 }
 
 static VALUE
+enum_collect(obj)
+    VALUE obj;
+{
+    VALUE tmp;
+
+    tmp = rb_ary_new();
+    rb_iterate(rb_each, obj, rb_iterator_p() ? collect_i : enum_all, tmp);
+
+    return tmp;
+}
+
+static VALUE
 enum_sort(obj)
     VALUE obj;
 {