nobu	2008-08-20 22:24:51 +0900 (Wed, 20 Aug 2008)

  New Revision: 18727

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18727

  Log:
    * enum.c (enum_take): get rid of extraneous iteration.

  Modified files:
    trunk/ChangeLog
    trunk/enum.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18726)
+++ ChangeLog	(revision 18727)
@@ -1,3 +1,7 @@
+Wed Aug 20 22:24:48 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* enum.c (enum_take): get rid of extraneous iteration.
+
 Wed Aug 20 20:32:49 2008  Tanaka Akira  <akr@f...>
 
 	* io.c (rb_io_open_with_args): use rb_open_file instead of rb_io_open.
Index: enum.c
===================================================================
--- enum.c	(revision 18726)
+++ enum.c	(revision 18727)
@@ -1585,8 +1585,8 @@
 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 @@
 	rb_raise(rb_eArgError, "attempt to take negative size");
     }
 
+    if (len == 0) return rb_ary_new2(0);
+    args[0] = rb_ary_new();
     args[1] = len;
-    args[0] = rb_ary_new();
     rb_block_call(obj, id_each, 0, 0, take_i, (VALUE)args);
     return args[0];
 }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/