diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-19 21:47:48 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-19 21:47:48 +0000 |
commit | cab67c31977e8c5b466f38dcb8800cbe6b32b60e (patch) | |
tree | 52b386db09c7aaa1c95a210a9411d7423f1c4170 /enum.c | |
parent | 13313688b243882aff7815598ddd9fcbae69bc17 (diff) | |
download | ruby-cab67c31977e8c5b466f38dcb8800cbe6b32b60e.tar.gz |
* array.c (take_items), enum.c (enum_zip): tries to convert to
array first. [ruby-core:21442]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21678 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; |