diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-27 02:52:49 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-27 02:52:49 +0000 |
commit | 05ebc662fb6e5fc95046714c6c638ffc0016023e (patch) | |
tree | 65e06886703ef32d52ffc89118105eed54168589 | |
parent | 77443b2882081392f63bffa2be0f65aac21c2a8d (diff) |
merge revision(s) 45562: [Backport #9727]
* array.c (ary_reject): may be turned into a shared array during
the given block. [ruby-dev:48101] [Bug #9727]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@46155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | array.c | 15 | ||||
-rw-r--r-- | test/ruby/test_array.rb | 16 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 23 insertions, 15 deletions
@@ -1,3 +1,8 @@ +Tue May 27 11:51:00 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * array.c (ary_reject): may be turned into a shared array during + the given block. [ruby-dev:48101] [Bug #9727] + Tue May 27 11:48:22 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (str_buf_cat): should round up the capacity by 4KiB, @@ -829,19 +829,6 @@ rb_ary_push(VALUE ary, VALUE item) return ary; } -static VALUE -rb_ary_push_1(VALUE ary, VALUE item) -{ - long idx = RARRAY_LEN(ary); - - if (idx >= ARY_CAPA(ary)) { - ary_double_capa(ary, idx); - } - RARRAY_PTR(ary)[idx] = item; - ARY_SET_LEN(ary, idx + 1); - return ary; -} - VALUE rb_ary_cat(VALUE ary, const VALUE *ptr, long len) { @@ -2931,7 +2918,7 @@ ary_reject(VALUE orig, VALUE result) for (i = 0; i < RARRAY_LEN(orig); i++) { VALUE v = RARRAY_PTR(orig)[i]; if (!RTEST(rb_yield(v))) { - rb_ary_push_1(result, v); + rb_ary_push(result, v); } } return result; diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 956938745f..2f03b93a4b 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -1925,6 +1925,22 @@ class TestArray < Test::Unit::TestCase assert_equal([1, 3], [0, 1, 2, 3].reject {|x| x % 2 == 0 }) end + def test_reject_with_callcc + respond_to?(:callcc, true) or require 'continuation' + bug9727 = '[ruby-dev:48101] [Bug #9727]' + cont = nil + a = [*1..10].reject do |i| + callcc {|c| cont = c} if !cont and i == 10 + false + end + if a.size < 1000 + a.unshift(:x) + cont.call + end + assert_equal(1000, a.size, bug9727) + assert_equal([:x, *1..10], a.uniq, bug9727) + end + def test_zip assert_equal([[1, :a, "a"], [2, :b, "b"], [3, nil, "c"]], [1, 2, 3].zip([:a, :b], ["a", "b", "c", "d"])) @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-05-27" -#define RUBY_PATCHLEVEL 484 +#define RUBY_PATCHLEVEL 485 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 5 |