summaryrefslogtreecommitdiff
path: root/array.c
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-22 16:07:42 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-22 16:07:42 +0000
commit280f8df3706176fac38ef42e3fc79d30ac6e1e16 (patch)
tree1ce1d4b2303f30d79aee7f43b3972be69942f753 /array.c
parentab3d450a54ad9407548a36f01cb3775a6533c3d7 (diff)
Merge from ruby_1_8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r--array.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/array.c b/array.c
index e3d92ba..a0b608c 100644
--- a/array.c
+++ b/array.c
@@ -3107,8 +3107,8 @@ flatten(ary, level, modified)
st_table *memo;
st_data_t id;
- stack = rb_ary_new();
- result = ary_new(rb_class_of(ary), RARRAY_LEN(ary));
+ stack = ary_new(0, ARY_DEFAULT_SIZE);
+ result = ary_new(0, RARRAY_LEN(ary));
memo = st_init_numtable();
st_insert(memo, (st_data_t)ary, (st_data_t)Qtrue);
*modified = 0;
@@ -3117,6 +3117,9 @@ flatten(ary, level, modified)
while (i < RARRAY(ary)->len) {
elt = RARRAY(ary)->ptr[i++];
tmp = rb_check_array_type(elt);
+ if (RBASIC(result)->klass) {
+ rb_raise(rb_eRuntimeError, "flatten reentered");
+ }
if (NIL_P(tmp) || (level >= 0 && RARRAY(stack)->len / 2 >= level)) {
rb_ary_push(result, elt);
}
@@ -3146,6 +3149,7 @@ flatten(ary, level, modified)
st_free_table(memo);
+ RBASIC(result)->klass = rb_class_of(ary);
return result;
}