X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Magic.xs;h=2cd4e7cdd34a48c41b08491d8e7ed36e8a255002;hb=91aec4cfae75e61ff8eeb79448501a8739b0d240;hp=87139f6841c1f21d98204c635bc66a39c69ef287;hpb=6f35a291f0c453d34b617ee9eb03d2a68c410614;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/Magic.xs b/Magic.xs
index 87139f6..2cd4e7c 100644
--- a/Magic.xs
+++ b/Magic.xs
@@ -1,6 +1,8 @@
 /* This file is part of the Variable::Magic Perl module.
  * See http://search.cpan.org/dist/Variable-Magic/ */
 
+#include <stdarg.h> /* <va_list>, va_{start,arg,end}, ... */
+
 #include <stdio.h>  /* sprintf() */
 
 #define PERL_NO_GET_CONTEXT
@@ -12,10 +14,22 @@
 
 #define R(S) fprintf(stderr, "R(" #S ") = %d\n", SvREFCNT(S))
 
+#define PERL_VERSION_GE(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S))))))
+
 #define PERL_VERSION_LE(R, V, S) (PERL_REVISION < (R) || (PERL_REVISION == (R) && (PERL_VERSION < (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION <= (S))))))
 
 #define PERL_API_VERSION_GE(R, V, S) (PERL_API_REVISION > (R) || (PERL_API_REVISION == (R) && (PERL_API_VERSION > (V) || (PERL_API_VERSION == (V) && (PERL_API_SUBVERSION >= (S))))))
 
+#define PERL_API_VERSION_LE(R, V, S) (PERL_API_REVISION < (R) || (PERL_API_REVISION == (R) && (PERL_API_VERSION < (V) || (PERL_API_VERSION == (V) && (PERL_API_SUBVERSION <= (S))))))
+
+#ifndef VMG_PERL_PATCHLEVEL
+# ifdef PERL_PATCHNUM
+#  define VMG_PERL_PATCHLEVEL PERL_PATCHNUM
+# else
+#  define VMG_PERL_PATCHLEVEL 0
+# endif
+#endif
+
 /* --- Compatibility ------------------------------------------------------- */
 
 #ifndef Newx
@@ -39,15 +53,67 @@
 
 #ifndef MGf_COPY
 # define MGf_COPY 0
-#endif /* !MGf_COPY */
+#endif
 
 #ifndef MGf_DUP
 # define MGf_DUP 0
-#endif /* !MGf_DUP */
+#endif
 
 #ifndef MGf_LOCAL
 # define MGf_LOCAL 0
-#endif /* !MGf_LOCAL */
+#endif
+
+#if PERL_API_VERSION_GE(5, 10, 0)
+# define VMG_UVAR 1
+#else
+# define VMG_UVAR 0
+#endif
+
+#if (VMG_PERL_PATCHLEVEL >= 25854) || (!VMG_PERL_PATCHLEVEL && PERL_VERSION_GE(5, 9, 3))
+# define VMG_COMPAT_ARRAY_PUSH_NOLEN 1
+#else
+# define VMG_COMPAT_ARRAY_PUSH_NOLEN 0
+#endif
+
+/* since 5.9.5 - see #43357 */
+#if (VMG_PERL_PATCHLEVEL >= 31473) || (!VMG_PERL_PATCHLEVEL && PERL_VERSION_GE(5, 9, 5))
+# define VMG_COMPAT_ARRAY_UNDEF_CLEAR 1
+#else
+# define VMG_COMPAT_ARRAY_UNDEF_CLEAR 0
+#endif
+
+#if (VMG_PERL_PATCHLEVEL >= 32969) || (!VMG_PERL_PATCHLEVEL && PERL_VERSION_GE(5, 11, 0))
+# define VMG_COMPAT_SCALAR_LENGTH_NOLEN 1
+#else
+# define VMG_COMPAT_SCALAR_LENGTH_NOLEN 0
+#endif
+
+#if VMG_UVAR
+
+/* Bug-free mg_magical - see http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2008-01/msg00036.html */
+STATIC void vmg_mg_magical(pTHX_ SV *sv) {
+#define vmg_mg_magical(S) vmg_mg_magical(aTHX_ (S))
+ const MAGIC* mg;
+ PERL_UNUSED_CONTEXT;
+ if ((mg = SvMAGIC(sv))) {
+  SvRMAGICAL_off(sv);
+  do {
+   const MGVTBL* const vtbl = mg->mg_virtual;
+   if (vtbl) {
+    if (vtbl->svt_get && !(mg->mg_flags & MGf_GSKIP))
+     SvGMAGICAL_on(sv);
+    if (vtbl->svt_set)
+     SvSMAGICAL_on(sv);
+    if (vtbl->svt_clear)
+     SvRMAGICAL_on(sv);
+   }
+  } while ((mg = mg->mg_moremagic));
+  if (!(SvFLAGS(sv) & (SVs_GMG|SVs_SMG)))
+   SvRMAGICAL_on(sv);
+ }
+}
+
+#endif /* VMG_UVAR */
 
 /* --- Context-safe global data -------------------------------------------- */
 
@@ -63,9 +129,9 @@ START_MY_CXT
 /* --- Signatures ---------------------------------------------------------- */
 
 #define SIG_MIN ((U16) (1u << 8))
-#define SIG_MAX ((U16) (1u << 16 - 1))
+#define SIG_MAX ((U16) ((1u << 16) - 1))
 #define SIG_NBR (SIG_MAX - SIG_MIN + 1)
-#define SIG_WIZ ((U16) (1u << 8 - 1))
+#define SIG_WIZ ((U16) ((1u << 8) - 1))
 
 /* ... Generate signatures ................................................. */
 
@@ -87,7 +153,7 @@ STATIC U16 vmg_gensig(pTHX) {
 typedef struct {
  MGVTBL *vtbl;
  U16 sig;
- int uvar;
+ U16 uvar;
  SV *cb_data;
  SV *cb_get, *cb_set, *cb_len, *cb_clear, *cb_free;
 #if MGf_COPY
@@ -99,7 +165,9 @@ typedef struct {
 #if MGf_LOCAL
  SV *cb_local;
 #endif /* MGf_LOCAL */
+#if VMG_UVAR
  SV *cb_fetch, *cb_store, *cb_exists, *cb_delete;
+#endif /* VMG_UVAR */
 } MGWIZ;
 
 #define MGWIZ2SV(W) (newSVuv(PTR2UV(W)))
@@ -147,7 +215,6 @@ STATIC SV *vmg_data_new(pTHX_ SV *ctor, SV *sv, AV *args) {
 
 STATIC SV *vmg_data_get(SV *sv, U16 sig) {
  MAGIC *mg, *moremagic;
- MGWIZ *w;
 
  if (SvTYPE(sv) >= SVt_PVMG) {
   for (mg = SvMAGIC(sv); mg; mg = moremagic) {
@@ -162,36 +229,39 @@ STATIC SV *vmg_data_get(SV *sv, U16 sig) {
 
 /* ... Magic cast/dispell .................................................. */
 
-STATIC I32 vmg_uf_val(pTHX_ IV idx, SV *sv);
+#if VMG_UVAR
+STATIC I32 vmg_svt_val(pTHX_ IV, SV *);
+
+STATIC void vmg_uvar_del(SV *sv, MAGIC *prevmagic, MAGIC *mg, MAGIC *moremagic) {
+ if (prevmagic) {
+  prevmagic->mg_moremagic = moremagic;
+ } else {
+  SvMAGIC_set(sv, moremagic);
+ }
+ mg->mg_moremagic = NULL;
+ Safefree(mg->mg_ptr);
+ Safefree(mg);
+}
+#endif /* VMG_UVAR */
 
 STATIC UV vmg_cast(pTHX_ SV *sv, SV *wiz, AV *args) {
 #define vmg_cast(S, W, A) vmg_cast(aTHX_ (S), (W), (A))
- int has_uvar = 0;
  MAGIC *mg = NULL, *moremagic = NULL;
  MGWIZ *w;
  SV *data;
 
  w = SV2MGWIZ(wiz);
 
- if ((SvTYPE(sv) >= SVt_PVMG) && (mg = SvMAGIC(sv))) {
-  if (mg->mg_type == PERL_MAGIC_uvar) { has_uvar = 1; }
-  do {
-   if ((mg->mg_type == PERL_MAGIC_ext) && (mg->mg_private == w->sig)) { break;}
-   mg = mg->mg_moremagic;
-  } while (mg);
+ if (SvTYPE(sv) >= SVt_PVMG) {
+  for (mg = SvMAGIC(sv); mg; mg = moremagic) {
+   moremagic = mg->mg_moremagic;
+   if ((mg->mg_type == PERL_MAGIC_ext) && (mg->mg_private == w->sig)) { break; }
+  }
   if (mg) { return 1; }
  }
 
- if (w->uvar && (SvTYPE(sv) >= SVt_PVHV) && !has_uvar) {
-  struct ufuncs uf;
-  uf.uf_val   = vmg_uf_val;
-  uf.uf_set   = NULL;
-  uf.uf_index = 0;
-  sv_magicext(sv, NULL, PERL_MAGIC_uvar, &PL_vtbl_uvar, (char *) &uf, sizeof(uf));
- }
-
  data = (w->cb_data) ? vmg_data_new(w->cb_data, sv, args) : NULL;
- mg = sv_magicext(sv, data, PERL_MAGIC_ext, w->vtbl, (char *) wiz, HEf_SVKEY);
+ mg = sv_magicext(sv, data, PERL_MAGIC_ext, w->vtbl, (const char *) wiz, HEf_SVKEY);
  mg->mg_private = w->sig;
  mg->mg_flags   = mg->mg_flags
 #if MGf_COPY
@@ -203,21 +273,77 @@ STATIC UV vmg_cast(pTHX_ SV *sv, SV *wiz, AV *args) {
 #if MGf_LOCAL
                 | MGf_LOCAL
 #endif /* MGf_LOCAL */
- ;
+                ;
+
+#if VMG_UVAR
+ if (w->uvar && SvTYPE(sv) >= SVt_PVHV) {
+  MAGIC *prevmagic;
+  int add_uvar = 1;
+  struct ufuncs uf[2];
+
+  uf[0].uf_val   = vmg_svt_val;
+  uf[0].uf_set   = NULL;
+  uf[0].uf_index = 0;
+  uf[1].uf_val   = NULL;
+  uf[1].uf_set   = NULL;
+  uf[1].uf_index = 0;
+
+  /* One uvar magic in the chain is enough. */
+  for (prevmagic = NULL, mg = SvMAGIC(sv); mg; prevmagic = mg, mg = moremagic) {
+   moremagic = mg->mg_moremagic;
+   if (mg->mg_type == PERL_MAGIC_uvar) { break; }
+  }
+
+  if (mg) { /* Found another uvar magic. */
+   struct ufuncs *olduf = (struct ufuncs *) mg->mg_ptr;
+   if (olduf->uf_val == vmg_svt_val) {
+    /* It's our uvar magic, nothing to do. */
+    add_uvar = 0;
+   } else {
+    /* It's another uvar magic, backup it and replace it by ours. */
+    uf[1] = *olduf;
+    vmg_uvar_del(sv, prevmagic, mg, moremagic);
+   }
+  }
+
+  if (add_uvar) {
+   sv_magic(sv, NULL, PERL_MAGIC_uvar, (const char *) &uf, sizeof(uf));
+   vmg_mg_magical(sv);
+  }
+
+ }
+#endif /* VMG_UVAR */
 
  return 1;
 }
 
 STATIC UV vmg_dispell(pTHX_ SV *sv, U16 sig) {
 #define vmg_dispell(S, Z) vmg_dispell(aTHX_ (S), (Z))
+#if VMG_UVAR
+ U32 uvars = 0;
+#endif /* VMG_UVAR */
  MAGIC *mg, *prevmagic, *moremagic = NULL;
- MGWIZ *w;
 
  if (SvTYPE(sv) < SVt_PVMG) { return 0; }
 
  for (prevmagic = NULL, mg = SvMAGIC(sv); mg; prevmagic = mg, mg = moremagic) {
   moremagic = mg->mg_moremagic;
-  if ((mg->mg_type == PERL_MAGIC_ext) && (mg->mg_private == sig)) { break; }
+  if (mg->mg_type == PERL_MAGIC_ext) {
+   if (mg->mg_private == sig) {
+#if VMG_UVAR
+    /* If the current has no uvar, short-circuit uvar deletion. */
+    uvars = (SV2MGWIZ(mg->mg_ptr)->uvar) ? (uvars + 1) : 0;
+#endif /* VMG_UVAR */
+    break;
+#if VMG_UVAR
+   } else if ((mg->mg_private >= SIG_MIN) &&
+              (mg->mg_private <= SIG_MAX) &&
+               SV2MGWIZ(mg->mg_ptr)->uvar) {
+    ++uvars;
+    /* We can't break here since we need to find the ext magic to delete. */
+#endif /* VMG_UVAR */
+   }
+  }
  }
  if (!mg) { return 0; }
 
@@ -232,14 +358,53 @@ STATIC UV vmg_dispell(pTHX_ SV *sv, U16 sig) {
  SvREFCNT_dec((SV *) mg->mg_ptr); /* Unreference the wizard */
  Safefree(mg);
 
+#if VMG_UVAR
+ if (uvars == 1 && SvTYPE(sv) >= SVt_PVHV) {
+  /* mg was the first ext magic in the chain that had uvar */
+
+  for (mg = moremagic; mg; mg = mg->mg_moremagic) {
+   if ((mg->mg_type == PERL_MAGIC_ext) &&
+       (mg->mg_private >= SIG_MIN) &&
+       (mg->mg_private <= SIG_MAX) &&
+        SV2MGWIZ(mg->mg_ptr)->uvar) {
+    ++uvars;
+    break;
+   }
+  }
+
+  if (uvars == 1) {
+   struct ufuncs *uf;
+   for (prevmagic = NULL, mg = SvMAGIC(sv); mg; prevmagic = mg, mg = moremagic){
+    moremagic = mg->mg_moremagic;
+    if (mg->mg_type == PERL_MAGIC_uvar) { break; }
+   }
+   /* assert(mg); */
+   uf = (struct ufuncs *) mg->mg_ptr;
+   /* assert(uf->uf_val == vmg_svt_val); */
+   if (uf[1].uf_val || uf[1].uf_set) {
+    /* Revert the original uvar magic. */
+    uf[0] = uf[1];
+    Renew(uf, 1, struct ufuncs);
+    mg->mg_ptr = (char *) uf;
+    mg->mg_len = sizeof(struct ufuncs);
+   } else {
+    /* Remove the uvar magic. */
+    vmg_uvar_del(sv, prevmagic, mg, moremagic);
+   }
+  }
+ }
+#endif /* VMG_UVAR */
+
  return 1;
 }
 
 /* ... svt callbacks ....................................................... */
 
-STATIC int vmg_cb_call(pTHX_ SV *cb, SV *sv, SV *data) {
-#define vmg_cb_call(I, S, D) vmg_cb_call(aTHX_ (I), (S), (D))
+STATIC int vmg_cb_call(pTHX_ SV *cb, SV *sv, SV *data, unsigned int args, ...) {
+ va_list ap;
+ SV *svr;
  int ret;
+ unsigned int i;
 
  dSP;
  int count;
@@ -248,8 +413,15 @@ STATIC int vmg_cb_call(pTHX_ SV *cb, SV *sv, SV *data) {
  SAVETMPS;
 
  PUSHMARK(SP);
- XPUSHs(sv_2mortal(newRV_inc(sv)));
- if (data) { XPUSHs(data); }
+ EXTEND(SP, args + 2);
+ PUSHs(sv_2mortal(newRV_inc(sv)));
+ PUSHs(data ? data : &PL_sv_undef);
+ va_start(ap, args);
+ for (i = 0; i < args; ++i) {
+  SV *sv = va_arg(ap, SV *);
+  PUSHs(sv ? sv : &PL_sv_undef);
+ }
+ va_end(ap);
  PUTBACK;
 
  count = call_sv(cb, G_SCALAR);
@@ -257,7 +429,8 @@ STATIC int vmg_cb_call(pTHX_ SV *cb, SV *sv, SV *data) {
  SPAGAIN;
 
  if (count != 1) { croak("Callback needs to return 1 scalar\n"); }
- ret = POPi;
+ svr = POPs;
+ ret = SvOK(svr) ? SvIV(svr) : 0;
 
  PUTBACK;
 
@@ -267,46 +440,21 @@ STATIC int vmg_cb_call(pTHX_ SV *cb, SV *sv, SV *data) {
  return ret;
 }
 
-STATIC int vmg_cb_call2(pTHX_ SV *cb, SV *sv, SV *data, SV *extra) {
-#define vmg_cb_call2(I, S, D, E) vmg_cb_call2(aTHX_ (I), (S), (D), (E))
- int ret;
-
- dSP;
- int count;
-
- ENTER;
- SAVETMPS;
-
- PUSHMARK(SP);
- XPUSHs(sv_2mortal(newRV_inc(sv)));
- XPUSHs(data ? data : &PL_sv_undef);
- if (extra) { XPUSHs(extra); }
- PUTBACK;
-
- count = call_sv(cb, G_SCALAR);
-
- SPAGAIN;
-
- if (count != 1) { croak("Callback needs to return 1 scalar\n"); }
- ret = POPi;
-
- PUTBACK;
-
- FREETMPS;
- LEAVE;
-
- return ret;
-}
+#define vmg_cb_call1(I, S, D)         vmg_cb_call(aTHX_ (I), (S), (D), 0)
+#define vmg_cb_call2(I, S, D, S2)     vmg_cb_call(aTHX_ (I), (S), (D), 1, (S2))
+#define vmg_cb_call3(I, S, D, S2, S3) vmg_cb_call(aTHX_ (I), (S), (D), 2, (S2), (S3))
 
 STATIC int vmg_svt_get(pTHX_ SV *sv, MAGIC *mg) {
- return vmg_cb_call(SV2MGWIZ(mg->mg_ptr)->cb_get, sv, mg->mg_obj);
+ return vmg_cb_call1(SV2MGWIZ(mg->mg_ptr)->cb_get, sv, mg->mg_obj);
 }
 
 STATIC int vmg_svt_set(pTHX_ SV *sv, MAGIC *mg) {
- return vmg_cb_call(SV2MGWIZ(mg->mg_ptr)->cb_set, sv, mg->mg_obj);
+ return vmg_cb_call1(SV2MGWIZ(mg->mg_ptr)->cb_set, sv, mg->mg_obj);
 }
 
 STATIC U32 vmg_svt_len(pTHX_ SV *sv, MAGIC *mg) {
+ SV *svr;
+ I32 len;
  U32 ret;
 
  dSP;
@@ -316,10 +464,14 @@ STATIC U32 vmg_svt_len(pTHX_ SV *sv, MAGIC *mg) {
  SAVETMPS;
 
  PUSHMARK(SP);
- XPUSHs(sv_2mortal(newRV_inc(sv)));
- XPUSHs((mg->mg_obj) ? (mg->mg_obj) : &PL_sv_undef);
+ EXTEND(SP, 3);
+ PUSHs(sv_2mortal(newRV_inc(sv)));
+ PUSHs(mg->mg_obj ? mg->mg_obj : &PL_sv_undef);
  if (SvTYPE(sv) == SVt_PVAV) {
-  XPUSHs(sv_2mortal(newSViv(av_len((AV *) sv) + 1)));
+  len = av_len((AV *) sv) + 1;
+  PUSHs(sv_2mortal(newSViv(len)));
+ } else {
+  PUSHs(&PL_sv_undef);
  }
  PUTBACK;
 
@@ -328,7 +480,9 @@ STATIC U32 vmg_svt_len(pTHX_ SV *sv, MAGIC *mg) {
  SPAGAIN;
 
  if (count != 1) { croak("Callback needs to return 1 scalar\n"); }
- ret = POPi;
+ svr = POPs;
+ ret = SvOK(svr) ? SvUV(svr)
+                 : ((SvTYPE(sv) == SVt_PVAV) ? len : 1);
 
  PUTBACK;
 
@@ -339,7 +493,7 @@ STATIC U32 vmg_svt_len(pTHX_ SV *sv, MAGIC *mg) {
 }
 
 STATIC int vmg_svt_clear(pTHX_ SV *sv, MAGIC *mg) {
- return vmg_cb_call(SV2MGWIZ(mg->mg_ptr)->cb_clear, sv, mg->mg_obj);
+ return vmg_cb_call1(SV2MGWIZ(mg->mg_ptr)->cb_clear, sv, mg->mg_obj);
 }
 
 STATIC int vmg_svt_free(pTHX_ SV *sv, MAGIC *mg) {
@@ -347,59 +501,91 @@ STATIC int vmg_svt_free(pTHX_ SV *sv, MAGIC *mg) {
  SvREFCNT_inc(sv);
  /* Perl_mg_free will get rid of the magic and decrement mg->mg_obj and
   * mg->mg_ptr reference count */
- return vmg_cb_call(SV2MGWIZ(mg->mg_ptr)->cb_free, sv, mg->mg_obj);
+ return vmg_cb_call1(SV2MGWIZ(mg->mg_ptr)->cb_free, sv, mg->mg_obj);
 }
 
 #if MGf_COPY
-STATIC int vmg_svt_copy(pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, int namelen) {
- return vmg_cb_call2(SV2MGWIZ(mg->mg_ptr)->cb_copy, sv, mg->mg_obj, nsv);
+STATIC int vmg_svt_copy(pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *key,
+# if (VMG_PERL_PATCHLEVEL >= 33256) || (!VMG_PERL_PATCHLEVEL && PERL_API_VERSION_GE(5, 11, 0))
+  I32 keylen
+# else
+  int keylen
+# endif
+ ) {
+ SV *keysv;
+ int ret;
+
+ if (keylen == HEf_SVKEY) {
+  keysv = (SV *) key;
+ } else {
+  keysv = newSVpvn(key, keylen);
+ }
+
+ ret = vmg_cb_call3(SV2MGWIZ(mg->mg_ptr)->cb_copy, sv, mg->mg_obj, keysv, nsv);
+
+ if (keylen != HEf_SVKEY) {
+  SvREFCNT_dec(keysv);
+ }
+
+ return ret;
 }
 #endif /* MGf_COPY */
 
-#if MGf_DUP
-STATIC int vmg_svt_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *p) {
+#if 0 /*  MGf_DUP */
+STATIC int vmg_svt_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *param) {
  return 0;
 }
 #endif /* MGf_DUP */
 
 #if MGf_LOCAL
 STATIC int vmg_svt_local(pTHX_ SV *nsv, MAGIC *mg) {
- return vmg_cb_call(SV2MGWIZ(mg->mg_ptr)->cb_local, nsv, mg->mg_obj);
+ return vmg_cb_call1(SV2MGWIZ(mg->mg_ptr)->cb_local, nsv, mg->mg_obj);
 }
 #endif /* MGf_LOCAL */
 
-STATIC I32 vmg_uf_val(pTHX_ IV idx, SV *sv) {
+#if VMG_UVAR
+STATIC I32 vmg_svt_val(pTHX_ IV action, SV *sv) {
+ struct ufuncs *uf;
  MAGIC *mg;
- SV *key;
- for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) {
-  if (mg->mg_type == PERL_MAGIC_uvar) { key = mg->mg_obj; break; }
- }
- if (!key) { return 0; }
+ SV *key = NULL;
+
+ mg  = mg_find(sv, PERL_MAGIC_uvar);
+ /* mg can't be NULL or we wouldn't be there. */
+ key = mg->mg_obj;
+ uf  = (struct ufuncs *) mg->mg_ptr;
+
+ if (uf[1].uf_val != NULL) { uf[1].uf_val(aTHX_ action, sv); }
+ if (uf[1].uf_set != NULL) { uf[1].uf_set(aTHX_ action, sv); }
+
+ action &= HV_FETCH_ISSTORE | HV_FETCH_ISEXISTS | HV_FETCH_LVALUE | HV_DELETE;
  for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) {
   MGWIZ *w;
-  if ((mg->mg_type != PERL_MAGIC_ext) ||
-      (mg->mg_private < SIG_MIN) || (mg->mg_private > SIG_MAX)) { continue; }
+  if ((mg->mg_type != PERL_MAGIC_ext)
+   || (mg->mg_private < SIG_MIN)
+   || (mg->mg_private > SIG_MAX)) { continue; }
   w = SV2MGWIZ(mg->mg_ptr);
   if (!w->uvar) { continue; }
-  switch (idx & (HV_FETCH_ISSTORE|HV_FETCH_ISEXISTS|HV_FETCH_LVALUE|HV_DELETE)){
+  switch (action) {
    case 0:
-    if (w->cb_fetch) { return vmg_cb_call2(w->cb_fetch, sv, mg->mg_obj, key); }
+    if (w->cb_fetch)  { vmg_cb_call2(w->cb_fetch,  sv, mg->mg_obj, key); }
     break;
    case HV_FETCH_ISSTORE:
    case HV_FETCH_LVALUE:
    case (HV_FETCH_ISSTORE|HV_FETCH_LVALUE):
-    if (w->cb_store) { return vmg_cb_call2(w->cb_store, sv, mg->mg_obj, key); }
+    if (w->cb_store)  { vmg_cb_call2(w->cb_store,  sv, mg->mg_obj, key); }
     break;
    case HV_FETCH_ISEXISTS:
-    if (w->cb_exists) { return vmg_cb_call2(w->cb_exists, sv, mg->mg_obj, key);}
+    if (w->cb_exists) { vmg_cb_call2(w->cb_exists, sv, mg->mg_obj, key); }
     break;
    case HV_DELETE:
-    if (w->cb_delete) { return vmg_cb_call2(w->cb_delete, sv, mg->mg_obj, key);}
+    if (w->cb_delete) { vmg_cb_call2(w->cb_delete, sv, mg->mg_obj, key); }
     break;
   }
  }
+
  return 0;
 }
+#endif /* VMG_UVAR */
 
 /* ... Wizard destructor ................................................... */
 
@@ -433,10 +619,12 @@ STATIC int vmg_wizard_free(pTHX_ SV *wiz, MAGIC *mg) {
 #if MGf_LOCAL
  if (w->cb_local != NULL) { SvREFCNT_dec(SvRV(w->cb_local)); }
 #endif /* MGf_LOCAL */
- if (w->cb_fetch != NULL) { SvREFCNT_dec(SvRV(w->cb_fetch)); }
- if (w->cb_store != NULL) { SvREFCNT_dec(SvRV(w->cb_store)); }
+#if VMG_UVAR
+ if (w->cb_fetch  != NULL) { SvREFCNT_dec(SvRV(w->cb_fetch)); }
+ if (w->cb_store  != NULL) { SvREFCNT_dec(SvRV(w->cb_store)); }
  if (w->cb_exists != NULL) { SvREFCNT_dec(SvRV(w->cb_exists)); }
  if (w->cb_delete != NULL) { SvREFCNT_dec(SvRV(w->cb_delete)); }
+#endif /* VMG_UVAR */
  Safefree(w->vtbl);
  Safefree(w);
 
@@ -460,12 +648,10 @@ STATIC MGVTBL vmg_wizard_vtbl = {
 #endif /* MGf_LOCAL */
 };
 
-/* --- Error messages and misc helpers ------------------------------------- */
-
-STATIC const char vmg__wizard_args[]   = "_wizard() called with a wrong number of arguments - use wizard() instead";
 STATIC const char vmg_invalid_wiz[]    = "Invalid wizard object";
 STATIC const char vmg_invalid_sv[]     = "Invalid variable";
 STATIC const char vmg_invalid_sig[]    = "Invalid numeric signature";
+STATIC const char vmg_wrongargnum[]    = "Wrong number of arguments";
 STATIC const char vmg_toomanysigs[]    = "Too many magic signatures used";
 STATIC const char vmg_argstorefailed[] = "Error while storing arguments";
 
@@ -488,18 +674,21 @@ STATIC U16 vmg_sv2sig(pTHX_ SV *sv) {
  return sig;
 }
 
-#define VMG_SET_CB(T, M, CB) \
- cb = (CB); \
- (M)->cb_##T = (SvROK(cb)) ? newRV_inc(SvRV(cb)) : NULL;
-
-#define VMG_SET_CB_SVT(T, V, M, CB) \
- cb = (CB); \
- if (SvROK(cb)) { \
-  (V)->svt_##T = vmg_svt_##T; (M)->cb_##T = newRV_inc(SvRV(cb)); \
- } else { \
-  (V)->svt_##T = NULL;        (M)->cb_##T = NULL; \
+#define VMG_SET_CB(S, N)              \
+ cb = (S);                            \
+ w->cb_ ## N = (SvOK(cb) && SvROK(cb)) ? newRV_inc(SvRV(cb)) : NULL;
+
+#define VMG_SET_SVT_CB(S, N)          \
+ cb = (S);                            \
+ if (SvOK(cb) && SvROK(cb)) {         \
+  t->svt_ ## N = vmg_svt_ ## N;       \
+  w->cb_  ## N = newRV_inc(SvRV(cb)); \
+ } else {                             \
+  t->svt_ ## N = NULL;                \
+  w->cb_  ## N = NULL;                \
  }
 
+
 /* --- XS ------------------------------------------------------------------ */
 
 MODULE = Variable::Magic            PACKAGE = Variable::Magic
@@ -519,27 +708,50 @@ BOOT:
  newCONSTSUB(stash, "MGf_COPY",  newSVuv(MGf_COPY));
  newCONSTSUB(stash, "MGf_DUP",   newSVuv(MGf_DUP));
  newCONSTSUB(stash, "MGf_LOCAL", newSVuv(MGf_LOCAL));
+ newCONSTSUB(stash, "VMG_UVAR",  newSVuv(VMG_UVAR));
+ newCONSTSUB(stash, "VMG_COMPAT_ARRAY_PUSH_NOLEN",
+                    newSVuv(VMG_COMPAT_ARRAY_PUSH_NOLEN));
+ newCONSTSUB(stash, "VMG_COMPAT_ARRAY_UNDEF_CLEAR",
+                    newSVuv(VMG_COMPAT_ARRAY_UNDEF_CLEAR));
+ newCONSTSUB(stash, "VMG_COMPAT_SCALAR_LENGTH_NOLEN",
+                    newSVuv(VMG_COMPAT_SCALAR_LENGTH_NOLEN));
 }
 
-SV *_wizard(SV *svsig, ...)
-PROTOTYPE: $@
+SV *_wizard(...)
+PROTOTYPE: DISABLE
 PREINIT:
+ I32 i = 0;
  U16 sig;
- I32 i;
  char buf[8];
  MGWIZ *w;
  MGVTBL *t;
  MAGIC *mg;
- SV *cb, *sv;
+ SV *sv;
+ SV *svsig;
+ SV *cb;
 CODE:
  dMY_CXT;
 
- if (items != 14) { croak(vmg__wizard_args); }
+ if (items != 7
+#if MGf_COPY
+              + 1
+#endif /* MGf_COPY */
+#if MGf_DUP
+              + 1
+#endif /* MGf_DUP */
+#if MGf_LOCAL
+              + 1
+#endif /* MGf_LOCAL */
+#if VMG_UVAR
+              + 4
+#endif /* VMG_UVAR */
+              ) { croak(vmg_wrongargnum); }
 
+ svsig = ST(i++);
  if (SvOK(svsig)) {
   SV **old;
   sig = vmg_sv2sig(svsig);
-  if (old = hv_fetch(MY_CXT.wizz, buf, sprintf(buf, "%u", sig), 0)) {
+  if ((old = hv_fetch(MY_CXT.wizz, buf, sprintf(buf, "%u", sig), 0))) {
    ST(0) = sv_2mortal(newRV_inc(*old));
    XSRETURN(1);
   }
@@ -547,46 +759,44 @@ CODE:
   if (MY_CXT.count >= SIG_NBR) { croak(vmg_toomanysigs); }
   sig = vmg_gensig();
  }
-
+ 
  Newx(t, 1, MGVTBL);
  Newx(w, 1, MGWIZ);
- w->vtbl = t;
- w->sig  = sig;
 
- VMG_SET_CB(data,         w, ST(1));
- VMG_SET_CB_SVT(get,   t, w, ST(2));
- VMG_SET_CB_SVT(set,   t, w, ST(3));
- VMG_SET_CB_SVT(len,   t, w, ST(4));
- VMG_SET_CB_SVT(clear, t, w, ST(5));
- VMG_SET_CB_SVT(free,  t, w, ST(6));
+ VMG_SET_CB(ST(i++), data);
+ VMG_SET_SVT_CB(ST(i++), get);
+ VMG_SET_SVT_CB(ST(i++), set);
+ VMG_SET_SVT_CB(ST(i++), len);
+ VMG_SET_SVT_CB(ST(i++), clear);
+ VMG_SET_SVT_CB(ST(i++), free);
 #if MGf_COPY
- VMG_SET_CB_SVT(copy,  t, w, ST(7));
+ VMG_SET_SVT_CB(ST(i++), copy);
 #endif /* MGf_COPY */
 #if MGf_DUP
- VMG_SET_CB_SVT(dup,   t, w, ST(8));
+ /* VMG_SET_SVT_CB(ST(i++), dup); */
+ i++;
+ t->svt_dup = NULL;
+ w->cb_dup  = NULL;
 #endif /* MGf_DUP */
 #if MGf_LOCAL
- VMG_SET_CB_SVT(local, t, w, ST(9));
+ VMG_SET_SVT_CB(ST(i++), local);
 #endif /* MGf_LOCAL */
- VMG_SET_CB(fetch,        w, ST(10));
- VMG_SET_CB(store,        w, ST(11));
- VMG_SET_CB(exists,       w, ST(12));
- VMG_SET_CB(delete,       w, ST(13));
+#if VMG_UVAR
+ VMG_SET_CB(ST(i++), fetch);
+ VMG_SET_CB(ST(i++), store);
+ VMG_SET_CB(ST(i++), exists);
+ VMG_SET_CB(ST(i++), delete);
+#endif /* VMG_UVAR */
 
+ w->vtbl = t;
+ w->sig  = sig;
+#if VMG_UVAR
  w->uvar = (w->cb_fetch || w->cb_store || w->cb_exists || w->cb_delete);
+#endif /* VMG_UVAR */
 
  sv = MGWIZ2SV(w);
  mg = sv_magicext(sv, NULL, PERL_MAGIC_ext, &vmg_wizard_vtbl, NULL, -1);
  mg->mg_private = SIG_WIZ;
-#if MGf_COPY
- if (t->svt_copy)  { mg->mg_flags |= MGf_COPY; }
-#endif /* MGf_COPY */
-#if MGf_DUP
- if (t->svt_dup)   { mg->mg_flags |= MGf_DUP; }
-#endif /* MGf_DUP */
-#if MGf_LOCAL
- if (t->svt_local) { mg->mg_flags |= MGf_LOCAL; }
-#endif /* MGf_LOCAL */
 
  hv_store(MY_CXT.wizz, buf, sprintf(buf, "%u", sig), sv, 0);
  ++MY_CXT.count;
@@ -625,7 +835,7 @@ CODE:
   char buf[8];
   SV **old;
   U16 sig = vmg_sv2sig(wiz);
-  if (old = hv_fetch(MY_CXT.wizz, buf, sprintf(buf, "%u", sig), 0)) {
+  if ((old = hv_fetch(MY_CXT.wizz, buf, sprintf(buf, "%u", sig), 0))) {
    wiz = *old;
   } else {
    XSRETURN_UNDEF;
@@ -669,7 +879,7 @@ CODE:
  }
  data = vmg_data_get(SvRV(sv), sig);
  if (!data) { XSRETURN_UNDEF; }
- ST(0) = newSVsv(data);
+ ST(0) = data;
  XSRETURN(1);
 
 SV *dispell(SV *sv, SV *wiz)