summaryrefslogtreecommitdiff
path: root/enumerator.c
diff options
context:
space:
mode:
Diffstat (limited to 'enumerator.c')
-rw-r--r--enumerator.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/enumerator.c b/enumerator.c
index a83c0533d7..6f3de864a0 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -1007,19 +1007,19 @@ static VALUE
enumerator_size(VALUE obj)
{
struct enumerator *e = enumerator_ptr(obj);
+ int argc = 0;
+ const VALUE *argv = NULL;
+ VALUE size;
if (e->size_fn) {
return (*e->size_fn)(e->obj, e->args, obj);
}
- if (rb_respond_to(e->size, id_call)) {
- if (e->args) {
- int argc = (int)RARRAY_LEN(e->args);
- VALUE *argv = RARRAY_PTR(e->args);
- return rb_funcall2(e->size, id_call, argc, argv);
- } else {
- return rb_funcall(e->size, id_call, 0);
- }
+ if (e->args) {
+ argc = (int)RARRAY_LEN(e->args);
+ argv = RARRAY_RAWPTR(e->args);
}
+ size = rb_check_funcall(e->size, id_call, argc, argv);
+ if (size != Qundef) return size;
return e->size;
}