summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-02-14 12:36:11 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-02-14 12:36:11 +0000
commitab8d0ca8a1b8ac7213d83bb7b58109fbcc593a1c (patch)
treecc4f99d224dfd495d9bfc7e6d3af6a0f925f47f6
parentf1d1363c7ef0b8ebe2d7b717f6a5a3168c966475 (diff)
downloadruby-ab8d0ca8a1b8ac7213d83bb7b58109fbcc593a1c.tar.gz
ruby-ab8d0ca8a1b8ac7213d83bb7b58109fbcc593a1c.tar.xz
ruby-ab8d0ca8a1b8ac7213d83bb7b58109fbcc593a1c.zip
* enumerator.c (enumerator_each): return self if no block is
given. [yarv-dev:882] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--enumerator.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 530581fbd..ae1948f65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 14 20:26:00 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * enumerator.c (enumerator_each): return self if no block is
+ given. [yarv-dev:882]
+
Tue Feb 14 18:48:33 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (DMETHOD_P): accessing wrong frame. [ruby-dev:28181]
diff --git a/enumerator.c b/enumerator.c
index 3321e71db..018d1d986 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -314,10 +314,12 @@ rb_enumeratorize(VALUE obj, VALUE meth, int argc, VALUE *argv)
static VALUE
enumerator_each(VALUE obj)
{
- struct enumerator *e = enumerator_ptr(obj);
+ struct enumerator *e;
int argc = 0;
VALUE *argv = 0;
+ if (!rb_block_given_p()) return obj;
+ e = enumerator_ptr(obj);
if (e->args) {
argc = RARRAY(e->args)->len;
argv = RARRAY(e->args)->ptr;