From 974d1ae2870ecea56b708a2d40baf265b9d7b20c Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23339 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 array.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'array.c')

diff --git a/array.c b/array.c
index fb92c0f0ba..bc342b5867 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);
-- 
cgit v1.2.3