diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-21 14:47:11 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-21 14:47:11 +0000 |
commit | 0d8d0d9bd447df371555c3dcd933566f7bef264d (patch) | |
tree | 5deddc1f57b83e5fa7c089d9c179a0093cf90676 /test | |
parent | 08fc80ffe54d749c3657457eee7f23e0bbc471bc (diff) | |
download | ruby-0d8d0d9bd447df371555c3dcd933566f7bef264d.tar.gz ruby-0d8d0d9bd447df371555c3dcd933566f7bef264d.tar.xz ruby-0d8d0d9bd447df371555c3dcd933566f7bef264d.zip |
merges r23361 from trunk into ruby_1_9_1.
--
* array.c (rb_ary_flatten_bang): returns nil if nothing changed.
a patch from Marc-Andre Lafortune in [ruby-core:23382].
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/ruby/test_array.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 384ce239f..372e72738 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -736,11 +736,14 @@ class TestArray < Test::Unit::TestCase a5 = @cls[ a1, @cls[], a3 ] assert_equal(@cls[1, 2, 3, 4, 5, 6], a5.flatten!) + assert_nil(a5.flatten!(0), '[ruby-core:23382]') assert_equal(@cls[1, 2, 3, 4, 5, 6], a5) assert_equal(@cls[], @cls[].flatten) assert_equal(@cls[], @cls[@cls[@cls[@cls[],@cls[]],@cls[@cls[]],@cls[]],@cls[@cls[@cls[]]]].flatten) + + assert_nil(@cls[].flatten!(0), '[ruby-core:23382]') end def test_flatten_with_callcc |