diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | array.c | 2 | ||||
| -rw-r--r-- | test/ruby/test_array.rb | 18 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 26 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Sat Oct 1 00:53:28 2016 Kazuki Tsujimoto <kazuki@callcc.net> + + * array.c (flatten): use rb_obj_class instead of rb_class_of + because rb_class_of may return a singleton class. + [ruby-dev:49781] [Bug #12738] + Sat Oct 1 00:52:34 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * man/irb.1: remove useless -width option. @@ -4383,7 +4383,7 @@ flatten(VALUE ary, int level, int *modified) st_free_table(memo); - RBASIC_SET_CLASS(result, rb_class_of(ary)); + RBASIC_SET_CLASS(result, rb_obj_class(ary)); return result; } diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 8c8b63c4e2..32080bb756 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -784,6 +784,15 @@ class TestArray < Test::Unit::TestCase assert_not_same(a8, a9) end + def test_flattern_singleton_class + bug12738 = '[ruby-dev:49781] [Bug #12738]' + a = [[0]] + class << a + def m; end + end + assert_raise(NoMethodError, bug12738) { a.flatten.m } + end + def test_flatten! a1 = @cls[ 1, 2, 3] a2 = @cls[ 5, 6 ] @@ -804,6 +813,15 @@ class TestArray < Test::Unit::TestCase assert_nil(@cls[].flatten!(0), '[ruby-core:23382]') end + def test_flattern_singleton_class! + bug12738 = '[ruby-dev:49781] [Bug #12738]' + a = [[0]] + class << a + def m; end + end + assert_nothing_raised(NameError, bug12738) { a.flatten!.m } + end + def test_flatten_with_callcc need_continuation o = Object.new @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.6" #define RUBY_RELEASE_DATE "2016-10-01" -#define RUBY_PATCHLEVEL 374 +#define RUBY_PATCHLEVEL 375 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 10 |