archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 09:33:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

* array.c (take_items), enum.c (enum_zip): tries to convert to

Browse source 
array first.  [ruby-core:21442]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21678 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-01-19 21:47:48 +00:00
parent 13313688b2
commit cab67c3197
5 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
enum.c
View file

@ -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;