diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-23 08:39:55 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-23 08:39:55 +0000 |
commit | 04c9bdb19098678e245fa2a0d4173cc6f2d4ca59 (patch) | |
tree | dbd1a6e6ce89f61cea296bbab8bf9eb12786b503 /array.c | |
parent | 1a56e716b1c555e7ab717e3f8ab3a552391065a2 (diff) | |
download | ruby-04c9bdb19098678e245fa2a0d4173cc6f2d4ca59.tar.gz |
vm_eval.c: preserve passed_block
* vm_eval.c (check_funcall_respond_to): preserve passed_block, which
is modified in vm_call0_body() via vm_call0(), and caused a bug of
rb_check_funcall() by false negative result of rb_block_given_p().
re-fix [ruby-core:53650] [Bug #8153].
[ruby-core:53653] [Bug #8154]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
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 |