From 1011775a395e901aa897301dc5fecb9270fc1646 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 28 Jan 2009 09:20:03 +0000 Subject: introduces r21693 again and merges r21713 * array.c (take_items), enum.c (enum_zip): tries to convert to array first. [ruby-core:21442] -- * array.c (take_items): to_ary() raises ArgumentError if cannot to convert to Array. [ruby-dev:37797] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21814 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- array.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'array.c') diff --git a/array.c b/array.c index 3ba450cbe9..3994ce6e0d 100644 --- a/array.c +++ b/array.c @@ -2209,9 +2209,11 @@ take_i(VALUE val, VALUE *args, int argc, VALUE *argv) static VALUE take_items(VALUE obj, long n) { - VALUE result = rb_ary_new2(n); + VALUE result = rb_check_array_type(obj); VALUE args[2]; + if (!NIL_P(result)) return rb_ary_subseq(result, 0, n); + result = rb_ary_new2(n); args[0] = result; args[1] = (VALUE)n; rb_block_call(obj, rb_intern("each"), 0, 0, take_i, (VALUE)args); return result; -- cgit v1.2.3