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