X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Upper.xs;h=8814d9dd831bba9384865f2a38f35ca045cf8ea9;hb=8025876416295c1957f9ece5d2770dd00e4d65a5;hp=7e386a3be3250e63c55f71415eb039e62bd075cd;hpb=65980d1bb9eb9b7e32cf80df50a4b52f1924dc3b;p=perl%2Fmodules%2FScope-Upper.git

diff --git a/Upper.xs b/Upper.xs
index 7e386a3..8814d9d 100644
--- a/Upper.xs
+++ b/Upper.xs
@@ -10,6 +10,8 @@
 # define SU_DEBUG 0
 #endif
 
+/* --- Compatibility ------------------------------------------------------- */
+
 #ifndef STMT_START
 # define STMT_START do
 #endif
@@ -54,6 +56,107 @@
 
 #define SU_HAS_PERL(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S))))))
 
+/* --- Stack manipulations ------------------------------------------------- */
+
+#ifndef SvCANEXISTDELETE
+# define SvCANEXISTDELETE(sv) \
+  (!SvRMAGICAL(sv)            \
+   || ((mg = mg_find((SV *) sv, PERL_MAGIC_tied))            \
+       && (stash = SvSTASH(SvRV(SvTIED_obj((SV *) sv, mg)))) \
+       && gv_fetchmethod_autoload(stash, "EXISTS", TRUE)     \
+       && gv_fetchmethod_autoload(stash, "DELETE", TRUE)     \
+      )                       \
+   )
+#endif
+
+/* ... Saving array elements ............................................... */
+
+STATIC I32 su_av_preeminent(pTHX_ AV *av, I32 key) {
+#define su_av_preeminent(A, K) su_av_preeminent(aTHX_ (A), (K))
+ MAGIC *mg;
+ HV *stash;
+
+ if (!av)
+  return 0;
+ if (SvCANEXISTDELETE(av))
+  return av_exists(av, key);
+
+ return 1;
+}
+
+#ifndef SAVEADELETE
+
+typedef struct {
+ AV *av;
+ I32 key;
+} su_ud_adelete;
+
+STATIC void su_adelete(pTHX_ void *ud_) {
+ su_ud_adelete *ud = ud_;
+
+ av_delete(ud->av, ud->key, G_DISCARD);
+ SvREFCNT_dec(ud->av);
+
+ Safefree(ud);
+}
+
+STATIC void su_save_adelete(pTHX_ AV *av, I32 key) {
+#define su_save_adelete(A, K) su_save_adelete(aTHX_ (A), (K))
+ su_ud_adelete *ud;
+
+ Newx(ud, 1, su_ud_adelete);
+ ud->av  = av;
+ ud->key = key;
+ SvREFCNT_inc(av);
+
+ SAVEDESTRUCTOR_X(su_adelete, ud);
+}
+
+#define SAVEADELETE(A, K) su_save_adelete((A), (K))
+
+#endif /* SAVEADELETE */
+
+STATIC void su_save_aelem(pTHX_ AV *av, I32 key, SV **svp, I32 preeminent) {
+#define su_save_aelem(A, K, S, P) su_save_aelem(aTHX_ (A), (K), (S), (P))
+ if (preeminent)
+  save_aelem(av, key, svp);
+ else
+  SAVEADELETE(av, key);
+}
+
+/* ... Saving hash elements ................................................ */
+
+STATIC I32 su_hv_preeminent(pTHX_ HV *hv, SV *keysv) {
+#define su_hv_preeminent(H, K) su_hv_preeminent(aTHX_ (H), (K))
+ MAGIC *mg;
+ HV *stash;
+
+ if (!hv)
+  return 0;
+ if (SvCANEXISTDELETE(hv) || mg_find((SV *) hv, PERL_MAGIC_env))
+  return hv_exists_ent(hv, keysv, 0);
+
+ return 1;
+}
+
+STATIC void su_save_helem(pTHX_ HV *hv, SV *keysv, SV **svp, I32 preeminent) {
+#define su_save_helem(H, K, S, P) su_save_helem(aTHX_ (H), (K), (S), (P))
+ if (HvNAME_get(hv) && isGV(*svp)) {
+  save_gp((GV *) *svp, 0);
+  return;
+ }
+ if (preeminent)
+  save_helem(hv, keysv, svp);
+ else {
+  STRLEN keylen;
+  const char * const key = SvPV_const(keysv, keylen);
+  SAVEDELETE(hv, savepvn(key, keylen),
+                 SvUTF8(keysv) ? -(I32)keylen : (I32)keylen);
+ }
+}
+
+/* --- Actions ------------------------------------------------------------- */
+
 typedef struct {
  I32 depth;
  I32 *origin;
@@ -69,6 +172,8 @@ typedef struct {
  Safefree(U); \
 } while (0)
 
+/* ... Reap ................................................................ */
+
 typedef struct {
  su_ud_common ci;
  SV *cb;
@@ -112,7 +217,7 @@ STATIC void su_call(pTHX_ void *ud_) {
  PUTBACK;
 
  FREETMPS;
- LEAVE; 
+ LEAVE;
 
  SvREFCNT_dec(ud->cb);
  SU_UD_FREE(ud);
@@ -128,6 +233,8 @@ STATIC void su_reap(pTHX_ void *ud) {
                                          PL_scopestack[PL_scopestack_ix]));
 }
 
+/* ... Localize & localize array/hash element .............................. */
+
 typedef struct {
  su_ud_common ci;
  SV *sv;
@@ -135,41 +242,6 @@ typedef struct {
  SV *elem;
 } su_ud_localize;
 
-/* Those two functions are courtesy of pp_hot.c:pp_helem */
-
-STATIC I32 su_hv_preeminent(pTHX_ HV *hv, SV *keysv) {
-#define su_hv_preeminent(H, K) su_hv_preeminent(aTHX_ (H), (K))
- MAGIC *mg;
- HV *stash;
- return (!SvRMAGICAL(hv)
-         || mg_find((SV *) hv, PERL_MAGIC_env)
-         || ((mg = mg_find((SV *) hv, PERL_MAGIC_tied))
-                   /* Try to preserve the existenceness of a tied hash
-                    * element by using EXISTS and DELETE if possible.
-                    * Fallback to FETCH and STORE otherwise */
-             && (stash = SvSTASH(SvRV(SvTIED_obj((SV *) hv, mg))))
-             && gv_fetchmethod_autoload(stash, "EXISTS", TRUE)
-             && gv_fetchmethod_autoload(stash, "DELETE", TRUE)
-            )
-        ) ? hv_exists_ent(hv, keysv, 0) : 1;
-}
-
-STATIC void su_save_helem(pTHX_ HV *hv, SV *keysv, SV **svp, I32 preeminent) {
-#define su_save_helem(H, K, S, P) su_save_helem(aTHX_ (H), (K), (S), (P))
- if (HvNAME_get(hv) && isGV(*svp)) {
-  save_gp((GV *) *svp, 0);
-  return;
- }
- if (!preeminent) {
-  STRLEN keylen;
-  const char * const key = SvPV_const(keysv, keylen);
-  SAVEDELETE(hv, savepvn(key, keylen),
-                 SvUTF8(keysv) ? -(I32)keylen : (I32)keylen);
- } else {
-  save_helem(hv, keysv, svp);
- }
-}
-
 STATIC void su_localize(pTHX_ void *ud_) {
 #define su_localize(U) su_localize(aTHX_ (U))
  su_ud_localize *ud = (su_ud_localize *) ud_;
@@ -229,9 +301,10 @@ STATIC void su_localize(pTHX_ void *ud_) {
    if (elem) {
     I32 idx  = SvIV(elem);
     AV *av   = GvAV(gv);
+    I32 preeminent = su_av_preeminent(av, idx);
     SV **svp = av_fetch(av, idx, 1);
     if (!*svp || *svp == &PL_sv_undef) croak(PL_no_aelem, idx);
-    save_aelem(av, idx, svp);
+    su_save_aelem(av, idx, svp, preeminent);
     gv = (GV *) *svp;
     goto maybe_deref;
    } else
@@ -240,7 +313,7 @@ STATIC void su_localize(pTHX_ void *ud_) {
   case SVt_PVHV:
    if (elem) {
     HV *hv   = GvHV(gv);
-    I32 preeminent = hv ? su_hv_preeminent(hv, elem) : 0;
+    I32 preeminent = su_hv_preeminent(hv, elem);
     HE *he   = hv_fetch_ent(hv, elem, 1, 0);
     SV **svp = he ? &HeVAL(he) : NULL;
     if (!svp || *svp == &PL_sv_undef) croak("Modification of non-creatable hash value attempted, subscript \"%s\"", SvPV_nolen_const(*svp));
@@ -278,6 +351,8 @@ assign:
  SU_UD_FREE(ud);
 }
 
+/* --- Pop a context back -------------------------------------------------- */
+
 #if SU_DEBUG
 # ifdef DEBUGGING
 #  define SU_CXNAME PL_block_type[CxTYPE(&cxstack[cxstack_ix])]
@@ -321,6 +396,8 @@ 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) {
 #define su_init(L, U, S) su_init(aTHX_ (L), (U), (S))
  I32 i, depth = 0, *origin;