From c032557a66a6d37670850a8352768de8e4199e9f Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 20 Aug 2008 13:24:51 +0000 Subject: * enum.c (enum_take): get rid of extraneous iteration. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enum.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'enum.c') diff --git a/enum.c b/enum.c index 9a77f34bd..a16f9e95d 100644 --- a/enum.c +++ b/enum.c @@ -1585,8 +1585,8 @@ enum_zip(int argc, VALUE *argv, VALUE obj) static VALUE take_i(VALUE i, VALUE *arg, int argc, VALUE *argv) { - if (arg[1]-- == 0) rb_iter_break(); rb_ary_push(arg[0], enum_values_pack(argc, argv)); + if (--arg[1] == 0) rb_iter_break(); return Qnil; } @@ -1611,8 +1611,9 @@ enum_take(VALUE obj, VALUE n) rb_raise(rb_eArgError, "attempt to take negative size"); } - args[1] = len; + if (len == 0) return rb_ary_new2(0); args[0] = rb_ary_new(); + args[1] = len; rb_block_call(obj, id_each, 0, 0, take_i, (VALUE)args); return args[0]; } -- cgit