From: Vincent Pit Date: Fri, 24 Jul 2015 19:22:21 +0000 (-0300) Subject: Greatly simplify the depth computation in su_init() X-Git-Tag: rt104751~7 X-Git-Url: http://git.vpit.fr/?a=commitdiff_plain;h=0fa298f68579e3e7c832504a7b9cfa367b024217;p=perl%2Fmodules%2FScope-Upper.git Greatly simplify the depth computation in su_init() In order to count how many scopes we will have to pop, it is enough to take the difference between the current scope (PL_scopestack_ix) and the one just below the target context (cxstack[cxix].blk_oldscopesp). --- diff --git a/Upper.xs b/Upper.xs index e3713ae..1d4094d 100644 --- a/Upper.xs +++ b/Upper.xs @@ -1096,7 +1096,7 @@ static void su_pop(pTHX_ void *ud) { static I32 su_init(pTHX_ void *ud, I32 cxix, I32 size) { #define su_init(U, C, S) su_init(aTHX_ (U), (C), (S)) - I32 i, depth = 1, pad, offset, base, *origin; + I32 i, depth, pad, offset, base, *origin; SU_D(PerlIO_printf(Perl_debug_log, "%p: ### init for cx %d\n", ud, cxix)); @@ -1113,26 +1113,7 @@ static I32 su_init(pTHX_ void *ud, I32 cxix, I32 size) { SU_D(PerlIO_printf(Perl_debug_log, "%p: size=%d pad=%d offset=%d\n", ud, size, pad, offset)); - for (i = cxstack_ix; i > cxix; --i) { - PERL_CONTEXT *cx = cxstack + i; - switch (CxTYPE(cx)) { -#if SU_HAS_PERL(5, 11, 0) - case CXt_LOOP_FOR: - case CXt_LOOP_PLAIN: - case CXt_LOOP_LAZYSV: - case CXt_LOOP_LAZYIV: -#else - case CXt_LOOP: -#endif - SU_D(PerlIO_printf(Perl_debug_log, "%p: cx %d is loop\n", ud, i)); - depth += 2; - break; - default: - SU_D(PerlIO_printf(Perl_debug_log, "%p: cx %d is other\n", ud, i)); - depth++; - break; - } - } + depth = PL_scopestack_ix - cxstack[cxix].blk_oldscopesp; SU_D(PerlIO_printf(Perl_debug_log, "%p: going down to depth %d\n", ud, depth)); Newx(origin, depth + 1, I32);