diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-02-14 12:36:11 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-02-14 12:36:11 +0000 |
commit | d4cecea858137cd4ca07388bf9cd977c45041b87 (patch) | |
tree | cc4f99d224dfd495d9bfc7e6d3af6a0f925f47f6 | |
parent | 76210570540cf5065992037cc496dcf1c066b479 (diff) | |
download | ruby-d4cecea858137cd4ca07388bf9cd977c45041b87.tar.gz |
* enumerator.c (enumerator_each): return self if no block is
given. [yarv-dev:882]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | enumerator.c | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -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 3321e71dbe..018d1d986e 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; |