diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-28 09:20:03 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-28 09:20:03 +0000 |
commit | 1d14bf2a75d05361566002ead897c996d6cfe71b (patch) | |
tree | b05880a19cf90ba3fe5790f9cd9e5d4b55059013 /enum.c | |
parent | 369284d33c84e4325e46e745ccda0ec22265ff2f (diff) | |
download | ruby-1d14bf2a75d05361566002ead897c996d6cfe71b.tar.gz ruby-1d14bf2a75d05361566002ead897c996d6cfe71b.tar.xz ruby-1d14bf2a75d05361566002ead897c996d6cfe71b.zip |
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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21814 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enum.c')
-rw-r--r-- | enum.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -1558,13 +1558,17 @@ enum_zip(int argc, VALUE *argv, VALUE obj) ID conv; NODE *memo; VALUE result = Qnil; + VALUE args = rb_ary_new4(argc, argv); int allary = Qtrue; + argv = RARRAY_PTR(args); for (i=0; i<argc; i++) { - if (TYPE(argv[i]) != T_ARRAY) { + VALUE ary = rb_check_array_type(argv[i]); + if (NIL_P(ary)) { allary = Qfalse; break; } + argv[i] = ary; } if (!allary) { CONST_ID(conv, "to_enum"); @@ -1576,7 +1580,7 @@ enum_zip(int argc, VALUE *argv, VALUE obj) result = rb_ary_new(); } /* use NODE_DOT2 as memo(v, v, -) */ - memo = rb_node_newnode(NODE_DOT2, result, rb_ary_new4(argc, argv), 0); + memo = rb_node_newnode(NODE_DOT2, result, args, 0); rb_block_call(obj, id_each, 0, 0, allary ? zip_ary : zip_i, (VALUE)memo); return result; |