1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* array.c (rb_ary_zip): performance improvement by avoiding

Browse Source 
array creation if rb_block_arity() > 1.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
glass 2013-08-02 14:56:39 +00:00
parent 54c3b1ba19
commit 5339293fb8
2 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Aug 2 23:54:11 2013 Masaki Matsushita <glass.saga@gmail.com>
* array.c (rb_ary_zip): performance improvement by avoiding
array creation if rb_block_arity() > 1.
Fri Aug 2 23:50:53 2013 Tanaka Akira <akr@fsij.org> Fri Aug 2 23:50:53 2013 Tanaka Akira <akr@fsij.org>
* bignum.c (power_cache_get_power): Appry bigtrunc to the result of * bignum.c (power_cache_get_power): Appry bigtrunc to the result of

44
array.c
View File

@ -3146,7 +3146,7 @@ take_items(VALUE obj, long n)
static VALUE static VALUE
rb_ary_zip(int argc, VALUE *argv, VALUE ary) rb_ary_zip(int argc, VALUE *argv, VALUE ary)
{ {
int i, j; int i, j, block_given, arity = 0;
long len; long len;
VALUE result = Qnil; VALUE result = Qnil;
@ -3154,24 +3154,40 @@ rb_ary_zip(int argc, VALUE *argv, VALUE ary)
for (i=0; i<argc; i++) { for (i=0; i<argc; i++) {
argv[i] = take_items(argv[i], len); argv[i] = take_items(argv[i], len);
} }
if (!rb_block_given_p()) {
block_given = rb_block_given_p();
if (block_given)
arity = rb_block_arity();
else
result = rb_ary_new2(len); result = rb_ary_new2(len);
}
for (i=0; i<RARRAY_LEN(ary); i++) { if (block_given && arity > 1) {
VALUE tmp = rb_ary_new2(argc+1); int yield_argc = argc + 1;
VALUE *yield_argv = ALLOC_N(VALUE, yield_argc);
rb_ary_push(tmp, rb_ary_elt(ary, i)); for (i=0; i<RARRAY_LEN(ary); i++) {
for (j=0; j<argc; j++) { yield_argv[0] = RARRAY_AREF(ary, i);
rb_ary_push(tmp, rb_ary_elt(argv[j], i)); for (j=0; j<argc; j++) {
} yield_argv[j+1] = rb_ary_elt(argv[j], i);
if (NIL_P(result)) { }
rb_yield(tmp); rb_yield_values2(yield_argc, yield_argv);
}
else {
rb_ary_push(result, tmp);
} }
} }
else {
for (i=0; i<RARRAY_LEN(ary); i++) {
VALUE tmp = rb_ary_new2(argc+1);
rb_ary_push(tmp, RARRAY_AREF(ary, i));
for (j=0; j<argc; j++) {
rb_ary_push(tmp, rb_ary_elt(argv[j], i));
}
if (block_given)
rb_yield(tmp);
else
rb_ary_push(result, tmp);
}
}
return result; return result;
} }