diff options
author | marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-06 17:10:35 +0000 |
---|---|---|
committer | marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-06 17:10:35 +0000 |
commit | 57d596cdb4a0de82288e3f526126ddf23fff0c41 (patch) | |
tree | fa14ff350832f2904ae798bc0163c8cb5b74c796 /enumerator.c | |
parent | acfd34a6a9e6462ed05f74e07f204b98d93126ff (diff) |
* enumerator.c: Support #size for enumerators created from enumerators
[Feature #6636]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enumerator.c')
-rw-r--r-- | enumerator.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/enumerator.c b/enumerator.c index 36e70fd084..a5eb999d8d 100644 --- a/enumerator.c +++ b/enumerator.c @@ -489,6 +489,9 @@ enumerator_with_index_i(VALUE val, VALUE m, int argc, VALUE *argv) return rb_yield_values(2, rb_ary_new4(argc, argv), idx); } +static VALUE +enumerator_size(VALUE obj); + /* * call-seq: * e.with_index(offset = 0) {|(*args), idx| ... } @@ -507,7 +510,7 @@ enumerator_with_index(int argc, VALUE *argv, VALUE obj) VALUE memo; rb_scan_args(argc, argv, "01", &memo); - RETURN_ENUMERATOR(obj, argc, argv); + RETURN_SIZED_ENUMERATOR(obj, argc, argv, enumerator_size); memo = NIL_P(memo) ? 0 : (VALUE)NUM2LONG(memo); return enumerator_block_call(obj, enumerator_with_index_i, (VALUE)&memo); } @@ -567,7 +570,7 @@ enumerator_with_object_i(VALUE val, VALUE memo, int argc, VALUE *argv) static VALUE enumerator_with_object(VALUE obj, VALUE memo) { - RETURN_ENUMERATOR(obj, 1, &memo); + RETURN_SIZED_ENUMERATOR(obj, 1, &memo, enumerator_size); enumerator_block_call(obj, enumerator_with_object_i, memo); return memo; |