summaryrefslogtreecommitdiff
path: root/array.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-04 12:30:55 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-04 12:30:55 +0000
commit974d1ae2870ecea56b708a2d40baf265b9d7b20c (patch)
tree8f4956b87933f58279f64b0b2e919cfa372d7e1b /array.c
parent90c2b67432ef8380b8a0b238be508f9ad1dbd0ed (diff)
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
Diffstat (limited to 'array.c')
-rw-r--r--array.c8
1 files changed, 7 insertions, 1 deletions
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);