From aa436bdca6068a3e94dbc0a4a46a242a56355e2c Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 25 Jan 2015 03:04:10 +0000 Subject: array.c: reduce to_ary call * array.c (flatten): no need to call to_ary method on elements beyond the given level. [ruby-core:67637] [Bug #10748] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49400 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- array.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'array.c') diff --git a/array.c b/array.c index e63778e80d..c02ee57132 100644 --- a/array.c +++ b/array.c @@ -4387,11 +4387,15 @@ flatten(VALUE ary, int level, int *modified) while (1) { while (i < RARRAY_LEN(ary)) { elt = RARRAY_AREF(ary, i++); + if (level >= 0 && RARRAY_LEN(stack) / 2 >= level) { + rb_ary_push(result, elt); + continue; + } tmp = rb_check_array_type(elt); if (RBASIC(result)->klass) { rb_raise(rb_eRuntimeError, "flatten reentered"); } - if (NIL_P(tmp) || (level >= 0 && RARRAY_LEN(stack) / 2 >= level)) { + if (NIL_P(tmp)) { rb_ary_push(result, elt); } else { -- cgit v1.2.3