From 1af390b1ea11acd00558e8d86d23d17d328e580d Mon Sep 17 00:00:00 2001 From: marcandre Date: Thu, 24 Jan 2013 07:05:42 +0000 Subject: * enumerator.c: Optimize Lazy#zip when passed only arrays [Bug #7706] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enumerator.c | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) (limited to 'enumerator.c') diff --git a/enumerator.c b/enumerator.c index 1e4e8cdfe1..62dbf57070 100644 --- a/enumerator.c +++ b/enumerator.c @@ -1601,6 +1601,26 @@ next_stopped(VALUE obj) return Qnil; } +static VALUE +lazy_zip_arrays_func(VALUE val, VALUE arrays, int argc, VALUE *argv) +{ + VALUE yielder, ary, memo; + long i, count; + + yielder = argv[0]; + memo = rb_ivar_get(yielder, id_memo); + count = NIL_P(memo) ? 0 : NUM2LONG(memo); + + ary = rb_ary_new2(RARRAY_LEN(arrays) + 1); + rb_ary_push(ary, argv[1]); + for (i = 0; i < RARRAY_LEN(arrays); i++) { + rb_ary_push(ary, rb_ary_entry(RARRAY_PTR(arrays)[i], count)); + } + rb_funcall(yielder, id_yield, 1, ary); + rb_ivar_set(yielder, id_memo, LONG2NUM(++count)); + return Qnil; +} + static VALUE lazy_zip_func(VALUE val, VALUE zip_args, int argc, VALUE *argv) { @@ -1631,15 +1651,27 @@ lazy_zip_func(VALUE val, VALUE zip_args, int argc, VALUE *argv) static VALUE lazy_zip(int argc, VALUE *argv, VALUE obj) { - VALUE ary; + VALUE ary, v; + long i; + rb_block_call_func *func = lazy_zip_arrays_func; if (rb_block_given_p()) { return rb_call_super(argc, argv); } - ary = rb_ary_new4(argc, argv); + + ary = rb_ary_new2(argc); + for (i = 0; i < argc; i++) { + v = rb_check_array_type(argv[i]); + if (NIL_P(v)) { + ary = rb_ary_new4(argc, argv); + func = lazy_zip_func; + break; + } + rb_ary_push(ary, v); + } return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj, - lazy_zip_func, ary), + func, ary), ary, lazy_receiver_size); } -- cgit v1.2.3