summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-25 12:36:29 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-25 12:36:29 (GMT)
commit151087a834908676c9d1366f43df12af46540fc5 (patch)
treef4ec7948ded2bec21f056dc0bbf1fd8a4d3d3724
parentf815568fc64e521884c13b5df1bf4bff56131a05 (diff)
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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@24272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog10
-rw-r--r--enum.c14
-rw-r--r--version.h8
3 files changed, 23 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 7da14c9..59ff55f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat Jul 25 21:26:18 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * 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@ruby-lang.org>
* lib/cgi.rb (HTTP_STATUS): typo fixed. [ruby-dev:38538]
diff --git a/enum.c b/enum.c
index df35c2f..a4863ea 100644
--- a/enum.c
+++ b/enum.c
@@ -667,11 +667,11 @@ first_i(i, ary)
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 @@ enum_first(argc, argv, obj)
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 @@ take_i(i, arg)
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 @@ enum_take(obj, n)
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);
diff --git a/version.h b/version.h
index d9f8317..4700b53 100644
--- a/version.h
+++ b/version.h
@@ -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[];