yugui	2009-06-21 18:13:10 +0900 (Sun, 21 Jun 2009)

  New Revision: 23776

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

  Log:
    merges r23622 from trunk into ruby_1_9_1.
    --
    * enum.c (first_i): Enumerator#first should consume only what is
      needed.   a patch from Marc-Andre Lafortune.  [ruby-core:23661]
    * enum.c (enum_first): call to_int once for an argument.  based on
      a patch from Marc-Andre Lafortune.

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

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23775)
+++ ruby_1_9_1/ChangeLog	(revision 23776)
@@ -1,3 +1,11 @@
+Tue Jun  2 17:32:40 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 (enum_first): call to_int once for an argument.  based on
+	  a patch from Marc-Andre Lafortune.
+
 Tue Jun  2 13:27:21 2009  Kazuhiro NISHIYAMA  <zn@m...>
 
 	* test/ripper/test_filter.rb: add tests. see [ruby-dev:37856]
Index: ruby_1_9_1/enum.c
===================================================================
--- ruby_1_9_1/enum.c	(revision 23775)
+++ ruby_1_9_1/enum.c	(revision 23776)
@@ -616,14 +616,14 @@
 	rb_iter_break();
     }
     else {
-	long n = NUM2LONG(ary[0]);
+	long n = 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);
+	ary[0] = n;
     }
     return Qnil;
 }
@@ -648,9 +648,13 @@
 	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] = len;
+	ary[1] = rb_ary_new2(len);
     }
     rb_block_call(obj, id_each, 0, 0, first_i, (VALUE)ary);
 
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 23775)
+++ ruby_1_9_1/version.h	(revision 23776)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-22"
-#define RUBY_PATCHLEVEL 166
+#define RUBY_PATCHLEVEL 167
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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