From a68cc24a9e8ad3c1ce2b9ce4b13d2b5849ec1fd9 Mon Sep 17 00:00:00 2001 From: marcandre Date: Wed, 7 Nov 2012 19:46:16 +0000 Subject: * include/ruby/intern.h: Restore rb_enumeratorize as it was before r37497 and introduce rb_enumeratorize_with_size instead. [#7302] * enumerator.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37543 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enumerator.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'enumerator.c') diff --git a/enumerator.c b/enumerator.c index 0d7d45a36e..8f6ac76abf 100644 --- a/enumerator.c +++ b/enumerator.c @@ -224,7 +224,7 @@ obj_to_enum(int argc, VALUE *argv, VALUE obj) --argc; meth = *argv++; } - enumerator = rb_enumeratorize(obj, meth, argc, argv, 0); + enumerator = rb_enumeratorize_with_size(obj, meth, argc, argv, 0); if (rb_block_given_p()) { enumerator_ptr(enumerator)->size = rb_block_proc(); } @@ -426,8 +426,17 @@ enumerator_init_copy(VALUE obj, VALUE orig) return obj; } +/* + * For backwards compatibility; use rb_enumeratorize_with_size + */ +VALUE +rb_enumeratorize(VALUE obj, VALUE meth, int argc, VALUE *argv) +{ + return rb_enumeratorize_with_size(obj, meth, argc, argv, 0); +} + VALUE -rb_enumeratorize(VALUE obj, VALUE meth, int argc, VALUE *argv, VALUE (*size_fn)(ANYARGS)) +rb_enumeratorize_with_size(VALUE obj, VALUE meth, int argc, VALUE *argv, VALUE (*size_fn)(ANYARGS)) { return enumerator_init(enumerator_allocate(rb_cEnumerator), obj, meth, argc, argv, size_fn, Qnil); } -- cgit v1.2.3