X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Upper.xs;h=afb1275492c19352f46c44c3ee64c1d735d1fcc9;hb=cd6c4556ac24d07bb96ec65c3c3d5cdfa1850219;hp=a0f11598100be1373f21847723074466ae90fe9c;hpb=a6ac26123e497d8ec66e795ed675cfe57b6e249a;p=perl%2Fmodules%2FScope-Upper.git diff --git a/Upper.xs b/Upper.xs index a0f1159..afb1275 100644 --- a/Upper.xs +++ b/Upper.xs @@ -137,7 +137,6 @@ STATIC I32 su_av_key2idx(pTHX_ AV *av, I32 key) { if (SvRMAGICAL(av)) { const MAGIC * const tied_magic = mg_find((SV *) av, PERL_MAGIC_tied); if (tied_magic) { - int adjust_index = 1; SV * const * const negative_indices_glob = hv_fetch(SvSTASH(SvRV(SvTIED_obj((SV *) (av), tied_magic))), NEGATIVE_INDICES_VAR, 16, 0); @@ -248,7 +247,7 @@ STATIC void su_save_helem(pTHX_ HV *hv, SV *keysv, SV *val) { if (val) { /* local $x{$keysv} = $val; */ SvSetMagicSV(*svp, val); } else { /* local $x{$keysv}; delete $x{$keysv}; */ - hv_delete_ent(hv, keysv, G_DISCARD, HeHASH(he)); + (void)hv_delete_ent(hv, keysv, G_DISCARD, HeHASH(he)); } } @@ -296,11 +295,12 @@ STATIC void su_call(pTHX_ void *ud_) { * when the new sub scope will be created in call_sv. */ #if SU_HAS_PERL(5, 10, 0) - if (dieing) + if (dieing) { if (cxstack_ix < cxstack_max) ++cxstack_ix; else cxstack_ix = Perl_cxinc(aTHX); + } #endif call_sv(ud->cb, G_VOID); @@ -351,11 +351,9 @@ STATIC void su_localize(pTHX_ void *ud_) { if (SvTYPE(sv) >= SVt_PVGV) { gv = (GV *) sv; - if (!val) { /* local *x; */ + if (!val || !SvROK(val)) { /* local *x; or local *x = $val; */ t = SVt_PVGV; - } else if (!SvROK(val)) { /* local *x = $val; */ - goto assign; - } else { /* local *x = \$val; */ + } else { /* local *x = \$val; */ t = SvTYPE(SvRV(val)); deref = 1; } @@ -421,7 +419,6 @@ STATIC void su_localize(pTHX_ void *ud_) { break; default: gv = (GV *) save_scalar(gv); -maybe_deref: if (deref) /* val != NULL */ val = SvRV(val); break; @@ -431,7 +428,6 @@ maybe_deref: ud, PL_savestack_ix, PL_scopestack[PL_scopestack_ix])); -assign: if (val) SvSetMagicSV((SV *) gv, val); @@ -489,22 +485,21 @@ STATIC void su_pop(pTHX_ void *ud) { /* --- Initialize the stack and the action userdata ------------------------ */ -STATIC I32 su_init(pTHX_ I32 level, void *ud, I32 size) { +STATIC I32 su_init(pTHX_ I32 cxix, void *ud, I32 size) { #define su_init(L, U, S) su_init(aTHX_ (L), (U), (S)) I32 i, depth = 0, *origin; - I32 cur, last, step; LEAVE; - if (level <= 0) { + if (cxix >= cxstack_ix) { SU_UD_HANDLER(ud)(aTHX_ ud); goto done; } - SU_D(PerlIO_printf(Perl_debug_log, "%p: ### init for level %d\n", ud, level)); + SU_D(PerlIO_printf(Perl_debug_log, "%p: ### init for cx %d\n", ud, cxix)); - for (i = 0; i < level; ++i) { - PERL_CONTEXT *cx = &cxstack[cxstack_ix - i]; + 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: @@ -581,6 +576,8 @@ STATIC void su_unwind(pTHX_ void *ud_) { SV **savesp = MY_CXT.savesp; I32 mark; + PERL_UNUSED_VAR(ud_); + if (savesp) PL_stack_sp = savesp; @@ -612,43 +609,61 @@ STATIC void su_unwind(pTHX_ void *ud_) { /* --- XS ------------------------------------------------------------------ */ -#define SU_GET_LEVEL(A) \ - STMT_START { \ - if (items > A) { \ - SV *lsv = ST(A); \ - if (SvOK(lsv)) \ - level = SvIV(lsv); \ - if (level < 0) \ - XSRETURN(0); \ - } \ - if (level > cxstack_ix) \ - level = cxstack_ix; \ +#if SU_HAS_PERL(5, 8, 9) +# define SU_SKIP_DB_MAX 2 +#else +# define SU_SKIP_DB_MAX 3 +#endif + +/* Skip context sequences of 1 to SU_SKIP_DB_MAX (included) block contexts + * followed by a DB sub */ + +#define SU_SKIP_DB(C) \ + STMT_START { \ + I32 i = 1; \ + PERL_CONTEXT *cx = cxstack + (C); \ + do { \ + if (CxTYPE(cx) == CXt_BLOCK && (C) >= i) { \ + --cx; \ + if (CxTYPE(cx) == CXt_SUB && cx->blk_sub.cv == GvCV(PL_DBsub)) { \ + (C) -= i + 1; \ + break; \ + } \ + } else \ + break; \ + } while (++i <= SU_SKIP_DB_MAX); \ } STMT_END -#define SU_GET_CONTEXT(A, B) \ - STMT_START { \ - if (items > A) { \ - SV *lsv = ST(B); \ - if (SvOK(lsv)) \ - level = SvIV(lsv); \ - if (level < 0) \ - level = 0; \ - else if (level > cxix) \ - level = cxix; \ - } \ +#define SU_GET_CONTEXT(A, B) \ + STMT_START { \ + if (items > A) { \ + SV *csv = ST(B); \ + if (!SvOK(csv)) \ + goto default_cx; \ + cxix = SvIV(csv); \ + if (cxix < 0) \ + cxix = 0; \ + else if (cxix > cxstack_ix) \ + cxix = cxstack_ix; \ + } else { \ +default_cx: \ + cxix = cxstack_ix; \ + if (PL_DBsub) \ + SU_SKIP_DB(cxix); \ + } \ } STMT_END -#define SU_DOPOPTOCX(t) \ - STMT_START { \ - I32 i, cxix = cxstack_ix, level = 0; \ - SU_GET_CONTEXT(0, 0); \ - for (i = cxix - level; i >= 0; --i) { \ - if (CxTYPE(&cxstack[i]) == t) { \ - ST(0) = sv_2mortal(newSViv(cxix - i)); \ - XSRETURN(1); \ - } \ - } \ - XSRETURN_UNDEF; \ +#define SU_GET_LEVEL(A, B) \ + STMT_START { \ + level = 0; \ + if (items > 0) { \ + SV *lsv = ST(B); \ + if (SvOK(lsv)) { \ + level = SvIV(lsv); \ + if (level < 0) \ + level = 0; \ + } \ + } \ } STMT_END XS(XS_Scope__Upper_unwind); /* prototype to pass -Wmissing-prototypes */ @@ -660,17 +675,18 @@ XS(XS_Scope__Upper_unwind) { dXSARGS; #endif dMY_CXT; - I32 cxix = cxstack_ix, level = 0; + I32 cxix; PERL_UNUSED_VAR(cv); /* -W */ PERL_UNUSED_VAR(ax); /* -Wall */ SU_GET_CONTEXT(0, items - 1); - cxix -= level; do { PERL_CONTEXT *cx = cxstack + cxix; switch (CxTYPE(cx)) { case CXt_SUB: + if (PL_DBsub && cx->blk_sub.cv == GvCV(PL_DBsub)) + continue; case CXt_EVAL: case CXt_FORMAT: MY_CXT.cxix = cxix; @@ -702,104 +718,145 @@ BOOT: HV *stash; MY_CXT_INIT; stash = gv_stashpv(__PACKAGE__, 1); - newCONSTSUB(stash, "HERE", newSViv(0)); + newCONSTSUB(stash, "TOP", newSViv(0)); newXSproto("Scope::Upper::unwind", XS_Scope__Upper_unwind, file, NULL); } +#if SU_THREADSAFE + void CLONE(...) PROTOTYPE: DISABLE CODE: -#if SU_THREADSAFE - MY_CXT_CLONE; + PERL_UNUSED_VAR(items); + { + MY_CXT_CLONE; + } + #endif /* SU_THREADSAFE */ SV * -TOP() +HERE() PROTOTYPE: -CODE: - RETVAL = newSViv(cxstack_ix); -OUTPUT: - RETVAL - -SV * -UP(...) -PROTOTYPE: ;$ PREINIT: - I32 i = 0; I32 cxix = cxstack_ix; CODE: - if (items) - i = SvIV(ST(0)); - if (++i > cxix) - i = cxix; - RETVAL = newSViv(i); + if (PL_DBsub) + SU_SKIP_DB(cxix); + RETVAL = newSViv(cxix); OUTPUT: RETVAL SV * -DOWN(...) +UP(...) PROTOTYPE: ;$ PREINIT: - I32 i = 0; + I32 cxix; CODE: - if (items) - i = SvIV(ST(0)); - if (--i < 0) - i = 0; - RETVAL = newSViv(i); + SU_GET_CONTEXT(0, 0); + if (--cxix < 0) + cxix = 0; + if (PL_DBsub) + SU_SKIP_DB(cxix); + RETVAL = newSViv(cxix); OUTPUT: RETVAL void SUB(...) PROTOTYPE: ;$ +PREINIT: + I32 cxix; PPCODE: - SU_DOPOPTOCX(CXt_SUB); + SU_GET_CONTEXT(0, 0); + for (; cxix >= 0; --cxix) { + PERL_CONTEXT *cx = cxstack + cxix; + switch (CxTYPE(cx)) { + default: + continue; + case CXt_SUB: + if (PL_DBsub && cx->blk_sub.cv == GvCV(PL_DBsub)) + continue; + ST(0) = sv_2mortal(newSViv(cxix)); + XSRETURN(1); + } + } + XSRETURN_UNDEF; void EVAL(...) PROTOTYPE: ;$ +PREINIT: + I32 cxix; PPCODE: - SU_DOPOPTOCX(CXt_EVAL); + SU_GET_CONTEXT(0, 0); + for (; cxix >= 0; --cxix) { + PERL_CONTEXT *cx = cxstack + cxix; + switch (CxTYPE(cx)) { + default: + continue; + case CXt_EVAL: + ST(0) = sv_2mortal(newSViv(cxix)); + XSRETURN(1); + } + } + XSRETURN_UNDEF; void -CALLER(...) +SCOPE(...) PROTOTYPE: ;$ PREINIT: - I32 cxix = cxstack_ix, caller = 0, level = 0; + I32 cxix, level; PPCODE: - if (items) { - SV *csv = ST(0); - if (SvOK(csv)) - caller = SvIV(csv); - } + SU_GET_LEVEL(0, 0); cxix = cxstack_ix; - while (cxix > 0) { - PERL_CONTEXT *cx = cxstack + cxix--; + if (PL_DBsub) { + SU_SKIP_DB(cxix); + while (cxix > 0) { + if (--level < 0) + break; + --cxix; + SU_SKIP_DB(cxix); + } + } else { + cxix -= level; + if (cxix < 0) + cxix = 0; + } + ST(0) = sv_2mortal(newSViv(cxix)); + XSRETURN(1); + +void +CALLER(...) +PROTOTYPE: ;$ +PREINIT: + I32 cxix, level; +PPCODE: + SU_GET_LEVEL(0, 0); + for (cxix = cxstack_ix; cxix > 0; --cxix) { + PERL_CONTEXT *cx = cxstack + cxix; switch (CxTYPE(cx)) { case CXt_SUB: + if (PL_DBsub && cx->blk_sub.cv == GvCV(PL_DBsub)) + continue; case CXt_EVAL: case CXt_FORMAT: - --caller; - if (caller < 0) + if (--level < 0) goto done; break; } - ++level; } done: - ST(0) = sv_2mortal(newSViv(level)); + ST(0) = sv_2mortal(newSViv(cxix)); XSRETURN(1); void want_at(...) PROTOTYPE: ;$ PREINIT: - I32 cxix = cxstack_ix, level = 0; + I32 cxix; PPCODE: SU_GET_CONTEXT(0, 0); - cxix -= level; while (cxix > 0) { PERL_CONTEXT *cx = cxstack + cxix--; switch (CxTYPE(cx)) { @@ -822,24 +879,24 @@ void reap(SV *hook, ...) PROTOTYPE: &;$ PREINIT: - I32 level = 0; + I32 cxix; su_ud_reap *ud; CODE: - SU_GET_LEVEL(1); + SU_GET_CONTEXT(1, 1); Newx(ud, 1, su_ud_reap); SU_UD_ORIGIN(ud) = NULL; SU_UD_HANDLER(ud) = su_reap; ud->cb = newSVsv(hook); - su_init(level, ud, 3); + su_init(cxix, ud, 3); void localize(SV *sv, SV *val, ...) PROTOTYPE: $$;$ PREINIT: - I32 level = 0; + I32 cxix; su_ud_localize *ud; CODE: - SU_GET_LEVEL(2); + SU_GET_CONTEXT(2, 2); Newx(ud, 1, su_ud_localize); SU_UD_ORIGIN(ud) = NULL; SU_UD_HANDLER(ud) = su_localize; @@ -847,16 +904,16 @@ CODE: ud->sv = sv; ud->val = newSVsv(val); ud->elem = NULL; - su_init(level, ud, 3); + su_init(cxix, ud, 3); void localize_elem(SV *sv, SV *elem, SV *val, ...) PROTOTYPE: $$$;$ PREINIT: - I32 level = 0; + I32 cxix; su_ud_localize *ud; CODE: - SU_GET_LEVEL(3); + SU_GET_CONTEXT(3, 3); Newx(ud, 1, su_ud_localize); SU_UD_ORIGIN(ud) = NULL; SU_UD_HANDLER(ud) = su_localize; @@ -865,16 +922,16 @@ CODE: ud->val = newSVsv(val); SvREFCNT_inc(elem); ud->elem = elem; - su_init(level, ud, 4); + su_init(cxix, ud, 4); void localize_delete(SV *sv, SV *elem, ...) PROTOTYPE: $$;$ PREINIT: - I32 level = 0; + I32 cxix; su_ud_localize *ud; CODE: - SU_GET_LEVEL(2); + SU_GET_CONTEXT(2, 2); Newx(ud, 1, su_ud_localize); SU_UD_ORIGIN(ud) = NULL; SU_UD_HANDLER(ud) = su_localize; @@ -883,4 +940,4 @@ CODE: ud->val = NULL; SvREFCNT_inc(elem); ud->elem = elem; - su_init(level, ud, 4); + su_init(cxix, ud, 4);