X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Upper.xs;h=76496ac34e683671fa7192cd49a099e5a7cedee5;hb=95dcbf868547141c0b022c55cf8e79498edf12d9;hp=1970261f3191c636523d82064aae34525ae1c83d;hpb=1700cf753646d7d8f1076277bbfe70c18e047ac4;p=perl%2Fmodules%2FScope-Upper.git diff --git a/Upper.xs b/Upper.xs index 1970261..76496ac 100644 --- a/Upper.xs +++ b/Upper.xs @@ -116,6 +116,11 @@ STATIC SV *su_newSV_type(pTHX_ svtype t) { # define CvISXSUB(C) CvXSUB(C) #endif +#ifndef PadlistARRAY +# define PadlistARRAY(P) AvARRAY(P) +# define PadARRAY(P) AvARRAY(P) +#endif + #ifndef CxHASARGS # define CxHASARGS(C) ((C)->blk_sub.hasargs) #endif @@ -324,7 +329,7 @@ typedef struct { typedef struct { void *next; - su_uid_storage new_uid_storage; + su_uid_storage tmp_uid_storage; su_uid_storage old_uid_storage; I32 cxix; @@ -358,9 +363,9 @@ STATIC su_uplevel_ud *su_uplevel_ud_new(pTHX) { Newx(sud, 1, su_uplevel_ud); sud->next = NULL; - sud->new_uid_storage.map = NULL; - sud->new_uid_storage.used = 0; - sud->new_uid_storage.alloc = 0; + sud->tmp_uid_storage.map = NULL; + sud->tmp_uid_storage.used = 0; + sud->tmp_uid_storage.alloc = 0; Newx(si, 1, PERL_SI); si->si_stack = newAV(); @@ -381,9 +386,9 @@ STATIC void su_uplevel_ud_delete(pTHX_ su_uplevel_ud *sud) { SvREFCNT_dec(si->si_stack); Safefree(si); - if (sud->new_uid_storage.map) { - su_uid **map = sud->new_uid_storage.map; - STRLEN alloc = sud->new_uid_storage.alloc; + if (sud->tmp_uid_storage.map) { + su_uid **map = sud->tmp_uid_storage.map; + STRLEN alloc = sud->tmp_uid_storage.alloc; STRLEN i; for (i = 0; i < alloc; ++i) @@ -660,6 +665,8 @@ typedef struct { /* ... Reap ................................................................ */ +#define SU_SAVE_LAST_CX (!SU_HAS_PERL(5, 8, 4) || (SU_HAS_PERL(5, 9, 5) && !SU_HAS_PERL(5, 14, 0)) || SU_HAS_PERL(5, 15, 0)) + typedef struct { su_ud_common ci; SV *cb; @@ -667,10 +674,10 @@ typedef struct { STATIC void su_call(pTHX_ void *ud_) { su_ud_reap *ud = (su_ud_reap *) ud_; -#if SU_HAS_PERL(5, 9, 5) - PERL_CONTEXT saved_cx; +#if SU_SAVE_LAST_CX I32 cxix; -#endif + PERL_CONTEXT saved_cx; +#endif /* SU_SAVE_LAST_CX */ dSP; @@ -686,22 +693,18 @@ STATIC void su_call(pTHX_ void *ud_) { PUSHMARK(SP); PUTBACK; +#if SU_SAVE_LAST_CX /* If the recently popped context isn't saved there, it will be overwritten by * the sub scope from call_sv, although it's still needed in our caller. */ - -#if SU_HAS_PERL(5, 9, 5) - if (cxstack_ix < cxstack_max) - cxix = cxstack_ix + 1; - else - cxix = Perl_cxinc(aTHX); + cxix = (cxstack_ix < cxstack_max) ? (cxstack_ix + 1) : Perl_cxinc(aTHX); saved_cx = cxstack[cxix]; -#endif +#endif /* SU_SAVE_LAST_CX */ call_sv(ud->cb, G_VOID); -#if SU_HAS_PERL(5, 9, 5) +#if SU_SAVE_LAST_CX cxstack[cxix] = saved_cx; -#endif +#endif /* SU_SAVE_LAST_CX */ PUTBACK; @@ -890,9 +893,9 @@ done: #if SU_DEBUG # ifdef DEBUGGING -# define SU_CXNAME PL_block_type[CxTYPE(&cxstack[cxstack_ix])] +# define SU_CXNAME(C) PL_block_type[CxTYPE(C)] # else -# define SU_CXNAME "XXX" +# define SU_CXNAME(C) "XXX" # endif #endif @@ -905,7 +908,7 @@ STATIC void su_pop(pTHX_ void *ud) { PerlIO_printf(Perl_debug_log, "%p: --- pop a %s\n" "%p: leave scope at depth=%2d scope_ix=%2d cur_top=%2d cur_base=%2d\n", - ud, SU_CXNAME, + ud, SU_CXNAME(cxstack + cxstack_ix), ud, depth, PL_scopestack_ix,PL_savestack_ix,PL_scopestack[PL_scopestack_ix]) ); @@ -1134,9 +1137,9 @@ STATIC su_uplevel_ud *su_uplevel_storage_new(pTHX_ I32 cxix) { MY_CXT.uplevel_storage.top = sud; depth = su_uid_depth(cxix); - su_uid_storage_dup(&sud->new_uid_storage, &MY_CXT.uid_storage, depth); + su_uid_storage_dup(&sud->tmp_uid_storage, &MY_CXT.uid_storage, depth); sud->old_uid_storage = MY_CXT.uid_storage; - MY_CXT.uid_storage = sud->new_uid_storage; + MY_CXT.uid_storage = sud->tmp_uid_storage; return sud; } @@ -1145,13 +1148,13 @@ STATIC void su_uplevel_storage_delete(pTHX_ su_uplevel_ud *sud) { #define su_uplevel_storage_delete(S) su_uplevel_storage_delete(aTHX_ (S)) dMY_CXT; - sud->new_uid_storage = MY_CXT.uid_storage; + sud->tmp_uid_storage = MY_CXT.uid_storage; MY_CXT.uid_storage = sud->old_uid_storage; { su_uid **map; UV i, alloc; - map = sud->new_uid_storage.map; - alloc = sud->new_uid_storage.alloc; + map = sud->tmp_uid_storage.map; + alloc = sud->tmp_uid_storage.alloc; for (i = 0; i < alloc; ++i) { if (map[i]) map[i]->flags &= SU_UID_ACTIVE; @@ -1251,7 +1254,7 @@ done: #endif /* SU_UPLEVEL_HIJACKS_RUNOPS */ -#define su_at_underscore(C) AvARRAY(AvARRAY(CvPADLIST(C))[CvDEPTH(C)])[0] +#define su_at_underscore(C) PadARRAY(PadlistARRAY(CvPADLIST(C))[CvDEPTH(C)])[0] STATIC void su_uplevel_restore(pTHX_ void *sus_) { su_uplevel_ud *sud = sus_; @@ -1400,7 +1403,7 @@ found_it: { dMY_CXT; - sud->new_uid_storage = MY_CXT.uid_storage; + sud->tmp_uid_storage = MY_CXT.uid_storage; MY_CXT.uid_storage = sud->old_uid_storage; MY_CXT.uplevel_storage.top = sud->next;