X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Upper.xs;h=550340125987df59e0482a42b16ba63c0842bebf;hb=ca164d41378dca4c016f1b7f1a92bf0730ee3572;hp=2ce8527fe2b7f8d3232a44b087418f567b6a9f76;hpb=f4167ba5f8779b2ae9174431fed29d3e0cd6411e;p=perl%2Fmodules%2FScope-Upper.git

diff --git a/Upper.xs b/Upper.xs
index 2ce8527..5503401 100644
--- a/Upper.xs
+++ b/Upper.xs
@@ -17,10 +17,7 @@
 /* --- Compatibility ------------------------------------------------------- */
 
 /* perl 5.23.8 onwards has a revamped context system */
-#if XSH_HAS_PERL(5, 23, 8)
-# define SU_HAS_NEW_CXT
-#endif
-
+#define SU_HAS_NEW_CXT XSH_HAS_PERL(5, 23, 8)
 
 #ifndef dVAR
 # define dVAR dNOOP
@@ -203,24 +200,6 @@ static U8 su_op_gimme_reverse(U8 gimme) {
 # define NEGATIVE_INDICES_VAR "NEGATIVE_INDICES"
 #endif
 
-/* CX_ARGARRAY(cx): the AV at pad[0] of the CV associated with CXt_SUB
- * context cx */
-
-#if XSH_HAS_PERL(5, 23, 8)
-# define CX_ARGARRAY(cx) \
-    ((AV*)(AvARRAY(MUTABLE_AV(                     \
-        PadlistARRAY(CvPADLIST(cx->blk_sub.cv))[   \
-            CvDEPTH(cx->blk_sub.cv)]))[0]))
-# define CX_ARGARRAY_set(cx,ary) \
-    (AvARRAY(MUTABLE_AV(                     \
-        PadlistARRAY(CvPADLIST(cx->blk_sub.cv))[   \
-            CvDEPTH(cx->blk_sub.cv)]))[0] = (SV*)(ary))
-#else
-# define CX_ARGARRAY(cx)         (cx->blk_sub.argarray)
-# define CX_ARGARRAY_set(cx,ary) (cx->blk_sub.argarray = (ary))
-#endif
-
-
 /* --- Error messages ------------------------------------------------------ */
 
 static const char su_stack_smash[]    = "Cannot target a scope outside of the current stack";
@@ -374,10 +353,10 @@ typedef struct {
  CV            *callback;
  CV            *renamed;
 
-#ifdef SU_HAS_NEW_CXT
- U8            *cxtypes; /* array of saved context types */
- I32           gap;      /* how many contexts have temporarily CXt_NULLed out */
- AV*           argarray; /* the PL_curpad[0] of the uplevel sub */
+#if SU_HAS_NEW_CXT
+ U8             *cxtypes; /* array of saved context types */
+ I32            gap;      /* how many contexts have temporarily CXt_NULLed out*/
+ AV*            argarray; /* the PL_curpad[0] of the uplevel sub */
 #else
  I32            target_depth;
  CV            *target;
@@ -396,7 +375,7 @@ typedef struct {
 #endif
 } su_uplevel_ud;
 
-#ifdef SU_HAS_NEW_CXT
+#if SU_HAS_NEW_CXT
 /* used to flag a context stack entry whose type has been temporarily
  * set to CXt_NULL. It relies on perl not using this value for real
  * CXt_NULL entries.
@@ -416,7 +395,7 @@ static su_uplevel_ud *su_uplevel_ud_new(pTHX) {
  sud->tmp_uid_storage.used  = 0;
  sud->tmp_uid_storage.alloc = 0;
 
- #ifndef SU_HAS_NEW_CXT
+#if !SU_HAS_NEW_CXT
  Newx(si, 1, PERL_SI);
  si->si_stack   = newAV();
  AvREAL_off(si->si_stack);
@@ -432,7 +411,7 @@ static su_uplevel_ud *su_uplevel_ud_new(pTHX) {
 static void su_uplevel_ud_delete(pTHX_ su_uplevel_ud *sud) {
 #define su_uplevel_ud_delete(S) su_uplevel_ud_delete(aTHX_ (S))
 
-#ifndef SU_HAS_NEW_CXT
+#if !SU_HAS_NEW_CXT
  PERL_SI *si = sud->si;
 
  Safefree(si->si_cxstack);
@@ -550,7 +529,6 @@ static void xsh_user_clone(pTHX_ const xsh_user_cxt_t *old_cxt, xsh_user_cxt_t *
 # define SU_SAVE_HELEM_OR_HDELETE_SIZE SU_SAVE_HELEM_SIZE
 #endif
 
-
 #ifndef SvCANEXISTDELETE
 # define SvCANEXISTDELETE(sv) \
   (!SvRMAGICAL(sv)            \
@@ -731,19 +709,18 @@ static void su_save_gvcv(pTHX_ GV *gv) {
 /* --- Actions ------------------------------------------------------------- */
 
 typedef struct {
- I32  orig_ix; /* original savestack_ix */
- I32  offset;  /* how much we bumped this savestack index */
+ I32 orig_ix; /* original savestack_ix */
+ I32 offset;  /* how much we bumped this savestack index */
 } su_ud_origin_elem;
 
 typedef struct {
- U8   type;
- U8   private;
+ U8                 type;
+ U8                 private;
  /* spare */
- I32  depth;
+ I32                depth;
  su_ud_origin_elem *origin;
 } su_ud_common;
 
-
 #define SU_UD_TYPE(U)    (((su_ud_common *) (U))->type)
 #define SU_UD_PRIVATE(U) (((su_ud_common *) (U))->private)
 #define SU_UD_DEPTH(U)   (((su_ud_common *) (U))->depth)
@@ -923,24 +900,26 @@ static void su_localize(pTHX_ void *ud_) {
  if (SvTYPE(sv) >= SVt_PVGV) {
   gv = (GV *) sv;
  } else {
-
 /* new perl context implementation frees savestack *before* restoring
  * PL_curcop. Temporarily restore it prematurely to make gv_fetch*
  * looks up unqualified var names in the caller's package */
-#ifdef SU_HAS_NEW_CXT
+#if SU_HAS_NEW_CXT
   COP *old_cop = PL_curcop;
-  PL_curcop = CX_CUR()->blk_oldcop;
+  PL_curcop    = CX_CUR()->blk_oldcop;
 #endif
 
 #ifdef gv_fetchsv
   gv = gv_fetchsv(sv, GV_ADDMULTI, t);
 #else
-  STRLEN len;
-  const char *name = SvPV_const(sv, len);
-  gv = gv_fetchpvn_flags(name, len, GV_ADDMULTI, t);
+  {
+   STRLEN len;
+   const char *name = SvPV_const(sv, len);
+   gv = gv_fetchpvn_flags(name, len, GV_ADDMULTI, t);
+  }
 #endif
-#ifdef SU_HAS_NEW_CXT
-  CX_CUR()->blk_oldcop = PL_curcop;
+
+#if SU_HAS_NEW_CXT
+  CX_CUR()->blk_oldcop = old_cop;
 #endif
  }
 
@@ -1071,6 +1050,8 @@ static const char *su_block_type[] = {
 
 #define SU_CXNAME(C) SU_CX_TYPENAME(CxTYPE(C))
 
+#if XSH_DEBUG
+
 /* for debugging. These indicate how many ENTERs each context type
  * does before the PUSHBLOCK */
 
@@ -1090,11 +1071,12 @@ static const int su_cxt_enter_count[] = {
 # endif
 };
 
-
+#endif /* XSH_DEBUG */
 
 /* push at least 'size' slots worth of padding onto the savestack */
 
 static void su_ss_push_padding(pTHX_ void *ud, I32 size) {
+#define su_ss_push_padding(U, S) su_ss_push_padding(aTHX_ (U), (S))
  if (size <= 0)
   return;
  if (size < SU_SAVE_ALLOC_SIZE + 1) /* minimum possible SAVEt_ALLOC */
@@ -1105,20 +1087,17 @@ static void su_ss_push_padding(pTHX_ void *ud, I32 size) {
  save_alloc((size - SU_SAVE_ALLOC_SIZE)*sizeof(*PL_savestack), 0);
 }
 
-
 static void su_pop(pTHX_ void *ud);
 
-
-
 /* push an su_pop destructor onto the savestack with suitable padding.
  * first indicates that this is the first push of a destructor */
 
 static void su_ss_push_destructor(pTHX_ void *ud, I32 depth, bool first) {
+#define su_ss_push_destructor(U, D, F) su_ss_push_destructor(aTHX_ (U), (D), (F))
  su_ud_origin_elem *origin = SU_UD_ORIGIN(ud);
- I32 pad;
 
  assert(first || origin[depth+1].orig_ix == PL_savestack_ix);
- su_ss_push_padding(aTHX_ ud,
+ su_ss_push_padding(ud,
     (origin[depth].orig_ix + origin[depth].offset) - PL_savestack_ix);
  XSH_D(su_debug_log(
         "%p:     push destructor at save_ix=%d depth=%d scope_ix=%d\n",
@@ -1128,7 +1107,6 @@ static void su_ss_push_destructor(pTHX_ void *ud, I32 depth, bool first) {
         PL_savestack_ix <= origin[depth+1].orig_ix +  origin[depth+1].offset);
 }
 
-
 /* this is called during each leave_scope() via SAVEDESTRUCTOR_X */
 
 static void su_pop(pTHX_ void *ud) {
@@ -1157,7 +1135,7 @@ static void su_pop(pTHX_ void *ud) {
  SU_UD_DEPTH(ud) = depth;
 
  if (depth > 0) {
-  su_ss_push_destructor(aTHX_ ud, depth-1, 0);
+  su_ss_push_destructor(ud, depth-1, 0);
  } else {
   I32 offset = origin[0].offset; /* grab value before origin is freed */
   switch (SU_UD_TYPE(ud)) {
@@ -1181,7 +1159,7 @@ static void su_pop(pTHX_ void *ud) {
   if (PL_savestack_ix < base + offset) {
    I32 gap = (base + offset) - PL_savestack_ix;
    assert(gap >= SU_SAVE_ALLOC_SIZE + 1);
-   su_ss_push_padding(aTHX_ ud, gap);
+   su_ss_push_padding(ud, gap);
   }
   assert(PL_savestack_ix == base + offset);
  }
@@ -1189,12 +1167,11 @@ static void su_pop(pTHX_ void *ud) {
  XSH_D(su_debug_log("%p:     end pop: ss_ix=%d\n", ud, PL_savestack_ix));
 }
 
-
 /* --- Initialize the stack and the action userdata ------------------------ */
 
 static void su_init(pTHX_ void *ud, I32 cxix, I32 size) {
 #define su_init(U, C, S) su_init(aTHX_ (U), (C), (S))
- I32 i, depth, base;
+ I32 i, depth;
  su_ud_origin_elem *origin;
  I32 cur_cx_ix;
  I32 cur_scope_ix;
@@ -1202,7 +1179,7 @@ static void su_init(pTHX_ void *ud, I32 cxix, I32 size) {
  XSH_D(su_debug_log("%p: ### su_init(cxix=%d, size=%d)\n", ud, cxix, size));
 
  depth = PL_scopestack_ix - cxstack[cxix].blk_oldscopesp;
-#ifdef SU_HAS_NEW_CXT
+#if SU_HAS_NEW_CXT
  depth += (cxstack_ix - cxix); /* each context frame holds 1 scope */
 #endif
  XSH_D(su_debug_log(
@@ -1247,14 +1224,14 @@ static void su_init(pTHX_ void *ud, I32 cxix, I32 size) {
   *
   * The passed cxix argument represents the scope we wish to inject into;
   * we have to adjust all the savestack frame boundaries above (but not
-  * including) that context. 
+  * including) that context.
   */
 
  Newx(origin, depth, su_ud_origin_elem);
 
  cur_cx_ix  = cxix;
  cur_scope_ix = cxstack[cxix].blk_oldscopesp;
-#ifdef SU_HAS_NEW_CXT
+#if SU_HAS_NEW_CXT
  XSH_D(su_debug_log("%p:     cx=%-2d %-11s\n",
       ud, cur_cx_ix, SU_CXNAME(cxstack+cur_cx_ix)));
  cur_cx_ix++;
@@ -1264,7 +1241,7 @@ static void su_init(pTHX_ void *ud, I32 cxix, I32 size) {
   I32 *ixp;
   I32 offset;
 
-#ifdef SU_HAS_NEW_CXT
+#if SU_HAS_NEW_CXT
 
   if (   cur_cx_ix <= cxstack_ix
       && cur_scope_ix == cxstack[cur_cx_ix].blk_oldscopesp
@@ -1322,7 +1299,7 @@ static void su_init(pTHX_ void *ud, I32 cxix, I32 size) {
   origin[i].orig_ix = *ixp;
   *ixp += offset;
 
-#ifdef SU_HAS_NEW_CXT
+#if SU_HAS_NEW_CXT
   XSH_D({
    if (ixp == &PL_scopestack[cur_scope_ix-1])
     su_debug_log(
@@ -1347,10 +1324,9 @@ static void su_init(pTHX_ void *ud, I32 cxix, I32 size) {
  SU_UD_DEPTH(ud)  = depth;
  SU_UD_ORIGIN(ud) = origin;
 
- su_ss_push_destructor(aTHX_ ud, depth-1, 1);
+ su_ss_push_destructor(ud, depth-1, 1);
 }
 
-
 /* --- Unwind stack -------------------------------------------------------- */
 
 static void su_unwind(pTHX_ void *ud_) {
@@ -1670,7 +1646,7 @@ static int su_uplevel_goto_static(const OP *o) {
  return 0;
 }
 
-#if !defined(SU_HAS_NEW_CXT) && SU_UPLEVEL_HIJACKS_RUNOPS
+#if !SU_HAS_NEW_CXT && SU_UPLEVEL_HIJACKS_RUNOPS
 
 static int su_uplevel_goto_runops(pTHX) {
 #define su_uplevel_goto_runops() su_uplevel_goto_runops(aTHX)
@@ -1689,7 +1665,7 @@ static int su_uplevel_goto_runops(pTHX) {
     switch (CxTYPE(cx)) {
      case CXt_SUB:
       if (CxHASARGS(cx)) {
-       argarray = CX_ARGARRAY(cx);
+       argarray = cx->blk_sub.argarray;
        goto done;
       }
       break;
@@ -1732,7 +1708,7 @@ done:
 
 #define su_at_underscore(C) PadARRAY(PadlistARRAY(CvPADLIST(C))[CvDEPTH(C)])[0]
 
-#ifdef SU_HAS_NEW_CXT
+#if SU_HAS_NEW_CXT
 
 static void su_uplevel_restore_new(pTHX_ void *sus_) {
  su_uplevel_ud *sud = sus_;
@@ -1810,8 +1786,8 @@ static void su_uplevel_restore_old(pTHX_ void *sus_) {
    * reached without a goto() happening, and the old argarray member is
    * actually our fake argarray. Destroy it properly in that case. */
   if (cx->blk_sub.cv == sud->renamed) {
-   SvREFCNT_dec(CX_ARGARRAY(cx));
-   CX_ARGARRAY_set(cx, argarray);
+   SvREFCNT_dec(cx->blk_sub.argarray);
+   cx->blk_sub.argarray = argarray;
   }
 
   CvDEPTH(sud->callback)--;
@@ -2003,9 +1979,7 @@ static CV *su_cv_clone(pTHX_ CV *proto, GV *gv) {
  return cv;
 }
 
-
-
-#ifdef SU_HAS_NEW_CXT
+#if SU_HAS_NEW_CXT
 
 /* this one-shot runops "loop" is designed to be called just before
  * execution of the first op following an uplevel()'s entersub. It gets a
@@ -2047,9 +2021,8 @@ static int su_uplevel_runops_hook_entersub(pTHX) {
  return 0;
 }
 
-
-
 static I32 su_uplevel_new(pTHX_ CV *callback, I32 cxix, I32 args) {
+#define su_uplevel_new(CB, CX, A) su_uplevel_new(aTHX_ (CB), (CX), (A))
  su_uplevel_ud *sud;
  U8 *saved_cxtypes;
  I32 i, ret;
@@ -2078,7 +2051,6 @@ static I32 su_uplevel_new(pTHX_ CV *callback, I32 cxix, I32 args) {
  sud->gap      = cxstack_ix - cxix + 1;
  sud->argarray = NULL;
 
-
  Newx(saved_cxtypes, sud->gap, U8);
  sud->cxtypes = saved_cxtypes;
 
@@ -2100,7 +2072,6 @@ static I32 su_uplevel_new(pTHX_ CV *callback, I32 cxix, I32 args) {
  sud->renamed = su_cv_clone(callback, CvGV(base_cv));
  sud->old_runops = PL_runops;
 
-
  if (!CvISXSUB(sud->renamed) && CxHASARGS(&cxstack[cxix])) {
   sud->argarray = (AV*)su_at_underscore(base_cv);
   assert(PL_runops != su_uplevel_runops_hook_entersub);
@@ -2121,6 +2092,7 @@ static I32 su_uplevel_new(pTHX_ CV *callback, I32 cxix, I32 args) {
 #else
 
 static I32 su_uplevel_old(pTHX_ CV *callback, I32 cxix, I32 args) {
+#define su_uplevel_old(CB, CX, A) su_uplevel_old(aTHX_ (CB), (CX), (A))
  su_uplevel_ud *sud;
  const PERL_CONTEXT *cx = cxstack + cxix;
  PERL_SI *si;
@@ -2233,7 +2205,7 @@ static I32 su_uplevel_old(pTHX_ CV *callback, I32 cxix, I32 args) {
 
  if ((PL_op = PL_ppaddr[OP_ENTERSUB](aTHX))) {
   PERL_CONTEXT *sub_cx = cxstack + cxstack_ix;
-  AV *argarray = CX_ARGARRAY(cx);
+  AV *argarray = cx->blk_sub.argarray;
 
   /* If pp_entersub() returns a non-null OP, it means that the callback is not
    * an XSUB. */
@@ -2253,9 +2225,9 @@ static I32 su_uplevel_old(pTHX_ CV *callback, I32 cxix, I32 args) {
    av_extend(av, AvMAX(argarray));
    AvFILLp(av) = AvFILLp(argarray);
    Copy(AvARRAY(argarray), AvARRAY(av), AvFILLp(av) + 1, SV *);
-   CX_ARGARRAY_set(sub_cx, av);
+   sub_cx->blk_sub.argarray = av;
   } else {
-   SvREFCNT_inc_simple_void(CX_ARGARRAY(sub_cx));
+   SvREFCNT_inc_simple_void(sub_cx->blk_sub.argarray);
   }
 
   if (su_uplevel_goto_static(CvROOT(renamed))) {
@@ -2466,8 +2438,7 @@ static I32 su_context_skip_db(pTHX_ I32 cxix) {
  return cxix;
 }
 
-
-#ifdef SU_HAS_NEW_CXT
+#if SU_HAS_NEW_CXT
 
 /* convert a physical context stack index into the logical equivalent:
  * one that ignores all the context frames hidden by uplevel().
@@ -2517,7 +2488,6 @@ static I32 su_context_logical2real(pTHX_ I32 cxix) {
 # define su_context_logical2real(C) (C)
 #endif
 
-
 static I32 su_context_normalize_up(pTHX_ I32 cxix) {
 #define su_context_normalize_up(C) su_context_normalize_up(aTHX_ (C))
  PERL_CONTEXT *cx;
@@ -3280,10 +3250,10 @@ PPCODE:
      args = items - 2;
     }
     /* su_uplevel() takes care of extending the stack if needed. */
-#ifdef SU_HAS_NEW_CXT
-    ret = su_uplevel_new(aTHX_ (CV *) code, cxix, args);
+#if SU_HAS_NEW_CXT
+    ret = su_uplevel_new((CV *) code, cxix, args);
 #else
-    ret = su_uplevel_old(aTHX_ (CV *) code, cxix, args);
+    ret = su_uplevel_old((CV *) code, cxix, args);
 #endif
     XSRETURN(ret);
    default: