shyouhei	2009-07-25 21:36:29 +0900 (Sat, 25 Jul 2009)

  New Revision: 24272

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

  Log:
    merge revision(s) 23624:
    * enum.c (first_i): Enumerator#first should consume only what is
      needed.   a patch from Marc-Andre Lafortune.  [ruby-core:23661]
    * enum.c (take_i): ditto.
    * enum.c (enum_first): call to_int once for an argument.  a patch
      from Marc-Andre Lafortune.

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/enum.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 24271)
+++ ruby_1_8_7/ChangeLog	(revision 24272)
@@ -1,3 +1,13 @@
+Sat Jul 25 21:26:18 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* enum.c (first_i): Enumerator#first should consume only what is
+	  needed.   a patch from Marc-Andre Lafortune.  [ruby-core:23661]
+
+	* enum.c (take_i): ditto.
+
+	* enum.c (enum_first): call to_int once for an argument.  a patch
+	  from Marc-Andre Lafortune.
+
 Fri Jul 24 17:19:40 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* lib/cgi.rb (HTTP_STATUS): typo fixed.   [ruby-dev:38538]
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 24271)
+++ ruby_1_8_7/version.h	(revision 24272)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-07-24"
+#define RUBY_RELEASE_DATE "2009-07-25"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090724
-#define RUBY_PATCHLEVEL 189
+#define RUBY_RELEASE_CODE 20090725
+#define RUBY_PATCHLEVEL 190
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 24
+#define RUBY_RELEASE_DAY 25
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_7/enum.c
===================================================================
--- ruby_1_8_7/enum.c	(revision 24271)
+++ ruby_1_8_7/enum.c	(revision 24272)
@@ -667,11 +667,11 @@
     else {
 	long n = NUM2LONG(ary[0]);
 
+	rb_ary_push(ary[1], i);
+	n--;
 	if (n <= 0) {
 	    rb_iter_break();
 	}
-	rb_ary_push(ary[1], i);
-	n--;
 	ary[0] = INT2NUM(n);
     }
     return Qnil;
@@ -700,9 +700,12 @@
 	ary[0] = ary[1] = Qnil;
     }
     else {
+	long len;
 	rb_scan_args(argc, argv, "01", &n);
-	ary[0] = n;
-	ary[1] = rb_ary_new2(NUM2LONG(n));
+	len = NUM2LONG(n);
+	if (len == 0) return rb_ary_new2(0);
+	ary[0] = INT2NUM(len);
+	ary[1] = rb_ary_new2(len);
     }
     rb_block_call(obj, id_each, 0, 0, first_i, (VALUE)ary);
 
@@ -1609,8 +1612,8 @@
     VALUE i;
     VALUE *arg;
 {
-    if (arg[1]-- == 0) rb_iter_break();
     rb_ary_push(arg[0], i);
+    if (--arg[1] == 0) rb_iter_break();
     return Qnil;
 }
 
@@ -1637,6 +1640,7 @@
 	rb_raise(rb_eArgError, "attempt to take negative size");
     }
 
+    if (len == 0) return rb_ary_new2(0);
     args[1] = len;
     args[0] = rb_ary_new();
     rb_block_call(obj, id_each, 0, 0, take_i, (VALUE)args);

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