diff options
Diffstat (limited to 'array.c')
| -rw-r--r-- | array.c | 22 |
1 files changed, 10 insertions, 12 deletions
@@ -17,7 +17,6 @@ #include "ruby/encoding.h" #include "internal.h" #include "probes.h" -#include "node.h" #include "id.h" #ifndef ARRAY_DEBUG @@ -3033,11 +3032,11 @@ rb_ary_delete_if(VALUE ary) } static VALUE -take_i(VALUE i, VALUE args, int argc, VALUE *argv) +take_i(VALUE val, VALUE *args, int argc, VALUE *argv) { - NODE *memo = RNODE(args); - rb_ary_push(memo->u1.value, rb_enum_values_pack(argc, argv)); - if (--memo->u3.cnt == 0) rb_iter_break(); + if (args[1]-- == 0) rb_iter_break(); + if (argc > 1) val = rb_ary_new4(argc, argv); + rb_ary_push(args[0], val); return Qnil; } @@ -3045,19 +3044,18 @@ static VALUE take_items(VALUE obj, long n) { VALUE result = rb_check_array_type(obj); - NODE *memo; + VALUE args[2]; if (!NIL_P(result)) return rb_ary_subseq(result, 0, n); - if (!rb_respond_to(obj, idEach)) { - rb_raise(rb_eTypeError, "wrong argument type %s (must respond to :each)", - rb_obj_classname(obj)); - } result = rb_ary_new2(n); - memo = NEW_MEMO(result, 0, n); - rb_block_call(obj, idEach, 0, 0, take_i, (VALUE)memo); + args[0] = result; args[1] = (VALUE)n; + if (rb_check_block_call(obj, idEach, 0, 0, take_i, (VALUE)args) == Qundef) + rb_raise(rb_eTypeError, "wrong argument type %s (must respond to :each)", + rb_obj_classname(obj)); return result; } + /* * call-seq: * ary.zip(arg, ...) -> new_ary |