mirrors/ruby
0
0 Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-10-28 16:36:20 +08:00
Code Activity

Replace Array#flatten{,!} internal ident hash with set

Browse Source 
This used a hash with all true values, with is simple to convert
to a set to save on memory when flattening array with a large
number of nested elements.
This commit is contained in:
Jeremy Evans committed 2026-08-25 07:03:04 -07:00
1 parent 85220035ca
commit 17026737cc
1 file changed
+11 -9
Notes: git 2026-08-25 14:03:40 +00:00 
Merged: https://github.com/ruby/ruby/pull/18488
Download Patch File Download Diff File Expand all files Collapse all files
array.c
+11 -9
View File
@@ -6750,6 +6750,8 @@ rb_ary_count(int argc, VALUE *argv, VALUE ary)
return LONG2NUM(n);
}
VALUE rb_ident_set_new(void);
static VALUE
flatten(VALUE ary, int level)
{
@@ -6777,9 +6779,9 @@ flatten(VALUE ary, int level)
rb_ary_push(stack, LONG2NUM(i + 1));
if (level < 0) {
memo = rb_obj_hide(rb_ident_hash_new());
rb_hash_aset(memo, ary, Qtrue);
rb_hash_aset(memo, tmp, Qtrue);
memo = rb_obj_hide(rb_ident_set_new());
rb_set_add(memo, ary);
rb_set_add(memo, tmp);
}
ary = tmp;
@@ -6795,7 +6797,7 @@ flatten(VALUE ary, int level)
tmp = rb_check_array_type(elt);
if (RBASIC(result)->klass) {
if (RTEST(memo)) {
rb_hash_clear(memo);
rb_set_clear(memo);
}
rb_raise(rb_eRuntimeError, "flatten reentered");
}
@@ -6804,11 +6806,11 @@ flatten(VALUE ary, int level)
}
else {
if (memo) {
if (rb_hash_aref(memo, tmp) == Qtrue) {
rb_hash_clear(memo);
if (rb_set_lookup(memo, tmp)) {
rb_set_clear(memo);
rb_raise(rb_eArgError, "tried to flatten recursive array");
}
rb_hash_aset(memo, tmp, Qtrue);
rb_set_add(memo, tmp);
}
rb_ary_push(stack, ary);
rb_ary_push(stack, LONG2NUM(i));
@@ -6820,7 +6822,7 @@ flatten(VALUE ary, int level)
break;
}
if (memo) {
rb_hash_delete(memo, ary);
rb_set_delete(memo, ary);
}
tmp = rb_ary_pop(stack);
i = NUM2LONG(tmp);
@@ -6828,7 +6830,7 @@ flatten(VALUE ary, int level)
}
if (memo) {
rb_hash_clear(memo);
rb_set_clear(memo);
}
RBASIC_SET_CLASS(result, rb_cArray);