From 3d7439d56829f38226d4fcd3cacb402297488fa4 Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 31 May 2007 16:59:12 +0000 Subject: * enum.c (each_with_index_i): should work well with continuation. a patch from sheepman . [ruby-dev:30846] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12419 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ enum.c | 4 ++-- version.h | 8 ++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0904b6d2a..38cd715238 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Jun 1 01:58:33 2007 Yukihiro Matsumoto + + * enum.c (each_with_index_i): should work well with continuation. + a patch from sheepman . + [ruby-dev:30846] + Thu May 31 17:27:53 2007 Nobuyoshi Nakada * lib/benchmark.rb (Benchmark::Job::item): avoid modifying the diff --git a/enum.c b/enum.c index 441ee9e8b7..f4c649550a 100644 --- a/enum.c +++ b/enum.c @@ -1167,11 +1167,11 @@ static VALUE each_with_index_i(VALUE val, VALUE memo) { long n; + VALUE idx = RARRAY_PTR(memo)[1]; RARRAY_PTR(memo)[0] = val; rb_yield(memo); - val = RARRAY_PTR(memo)[1]; - n = NUM2LONG(val); + n = NUM2LONG(idx); n++; RARRAY_PTR(memo)[1] = INT2NUM(n); return Qnil; diff --git a/version.h b/version.h index 90d0eb27ab..dc64e990b4 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-05-31" +#define RUBY_RELEASE_DATE "2007-06-01" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20070531 +#define RUBY_RELEASE_CODE 20070601 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 -#define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 31 +#define RUBY_RELEASE_MONTH 6 +#define RUBY_RELEASE_DAY 1 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3