From cb1ecbfddfdad3c3f0be899d4d8f7ee2f174a58b Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 4 May 2009 12:30:55 +0000 Subject: merges r23191 from trunk into ruby_1_9_1. -- * array.c (rb_ary_flatten): flatten(0) works as Array#dup. [ruby-core:23168] * test/ruby/test_array.rb: add a test for above. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23339 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ array.c | 8 +++++++- test/ruby/test_array.rb | 5 +++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c62d2458d..4f0f2d348 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Apr 15 20:24:49 2009 Yusuke Endoh + + * array.c (rb_ary_flatten): flatten(0) works as Array#dup. + [ruby-core:23168] + + * test/ruby/test_array.rb: add a test for above. + Fri Apr 17 00:45:09 2009 Yusuke Endoh * dir.c (bracket): fix escape handling for range character in bracket diff --git a/array.c b/array.c index fb92c0f0b..bc342b586 100644 --- a/array.c +++ b/array.c @@ -630,6 +630,12 @@ ary_make_partial(VALUE ary, VALUE klass, long offset, long len) } } +static VALUE +ary_make_shared_copy(VALUE ary) +{ + return ary_make_partial(ary, rb_obj_class(ary), 0, RARRAY_LEN(ary)); +} + enum ary_take_pos_flags { ARY_TAKE_FIRST = 0, @@ -3219,7 +3225,7 @@ rb_ary_flatten(int argc, VALUE *argv, VALUE ary) rb_scan_args(argc, argv, "01", &lv); if (!NIL_P(lv)) level = NUM2INT(lv); - if (level == 0) return ary; + if (level == 0) return ary_make_shared_copy(ary); result = flatten(ary, level, &mod); OBJ_INFECT(result, ary); diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 1cd018be8..36abe0996 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -719,6 +719,11 @@ class TestArray < Test::Unit::TestCase a7 = a6.flatten assert_equal(true, a7.tainted?) assert_equal(true, a7.untrusted?) + + a8 = @cls[[1, 2], 3] + a9 = a8.flatten(0) + assert_equal(a8, a9) + assert_not_same(a8, a9) end def test_flatten! -- cgit