# define VMG_UVAR 0
#endif
+#if VMG_HAS_PERL_MAINT(5, 11, 0, 32969) || VMG_HAS_PERL(5, 12, 0)
+# define VMG_COMPAT_SCALAR_LENGTH_NOLEN 1
+#else
+# define VMG_COMPAT_SCALAR_LENGTH_NOLEN 0
+#endif
+
/* Applied to dev-5.9 as 25854, integrated to maint-5.8 as 28160, partially
* reverted to dev-5.11 as 9cdcb38b */
#if VMG_HAS_PERL_MAINT(5, 8, 9, 28160) || VMG_HAS_PERL_MAINT(5, 9, 3, 25854) || VMG_HAS_PERL(5, 10, 0)
# define VMG_COMPAT_ARRAY_UNDEF_CLEAR 0
#endif
-#if VMG_HAS_PERL_MAINT(5, 11, 0, 32969) || VMG_HAS_PERL(5, 12, 0)
-# define VMG_COMPAT_SCALAR_LENGTH_NOLEN 1
+#if VMG_HAS_PERL(5, 11, 0)
+# define VMG_COMPAT_HASH_DELETE_NOUVAR_VOID 1
#else
-# define VMG_COMPAT_SCALAR_LENGTH_NOLEN 0
+# define VMG_COMPAT_HASH_DELETE_NOUVAR_VOID 0
#endif
#if VMG_HAS_PERL(5, 13, 2)
STATIC const char vmg_wrongargnum[] = "Wrong number of arguments";
STATIC const char vmg_argstorefailed[] = "Error while storing arguments";
-/* --- Signatures ---------------------------------------------------------- */
+/* --- Context-safe global data -------------------------------------------- */
+
+#define MY_CXT_KEY __PACKAGE__ "::_guts" XS_VERSION
+
+typedef struct {
+ HV *b__op_stashes[OPc_MAX];
+} my_cxt_t;
-#define SIG_WZO ((U16) (0x3891))
-#define SIG_WIZ ((U16) (0x3892))
+START_MY_CXT
/* --- <vmg_vtable> structure ---------------------------------------------- */
#endif /* VMG_THREADSAFE */
-/* --- Context-safe global data -------------------------------------------- */
+#define vmg_wizard_id(W) PTR2IV(vmg_vtable_vtbl((W)->vtable))
-#define MY_CXT_KEY __PACKAGE__ "::_guts" XS_VERSION
+/* --- Wizard SV objects --------------------------------------------------- */
-typedef struct {
- HV *b__op_stashes[OPc_MAX];
-} my_cxt_t;
+STATIC int vmg_wizard_sv_free(pTHX_ SV *sv, MAGIC *mg) {
+ if (PL_dirty) /* During global destruction, the context is already freed */
+ return 0;
-START_MY_CXT
+ vmg_wizard_free((vmg_wizard *) mg->mg_ptr);
-/* --- Wizard SV objects --------------------------------------------------- */
+ return 0;
+}
-STATIC int vmg_wizard_sv_free(pTHX_ SV *sv, MAGIC *mg);
#if VMG_THREADSAFE
-STATIC int vmg_wizard_sv_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *params);
-#endif
+
+STATIC int vmg_wizard_sv_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *params) {
+ mg->mg_ptr = (char *) vmg_wizard_dup((const vmg_wizard *) mg->mg_ptr, params);
+
+ return 0;
+}
+
+#endif /* VMG_THREADSAFE */
STATIC MGVTBL vmg_wizard_sv_vtbl = {
NULL, /* get */
if (w) {
MAGIC *mg = sv_magicext(wiz, NULL, PERL_MAGIC_ext, &vmg_wizard_sv_vtbl,
(const char *) w, 0);
- mg->mg_private = SIG_WZO;
+ mg->mg_private = 0;
#if VMG_THREADSAFE
mg->mg_flags |= MGf_DUP;
#endif
return wiz;
}
-STATIC const SV *vmg_wizard_sv_validate(pTHX_ const SV *wiz) {
-#define vmg_wizard_sv_validate(W) vmg_wizard_sv_validate(aTHX_ (W))
- if (SvROK(wiz)) {
- wiz = SvRV_const(wiz);
#if VMG_THREADSAFE
- if (SvTYPE(wiz) >= SVt_PVMG && SvMAGIC(wiz))
-#else
- if (SvIOK(wiz))
-#endif
- return wiz;
- }
-
- croak(vmg_invalid_wiz);
- /* Not reached */
- return NULL;
-}
-#if VMG_THREADSAFE
+#define vmg_sv_has_wizard_type(S) (SvTYPE(S) >= SVt_PVMG)
-STATIC const vmg_wizard *vmg_wizard_from_sv(const SV *wiz) {
+STATIC const vmg_wizard *vmg_wizard_from_sv_nocheck(const SV *wiz) {
MAGIC *mg;
for (mg = SvMAGIC(wiz); mg; mg = mg->mg_moremagic) {
return NULL;
}
-#define vmg_wizard_from_sv(W) vmg_wizard_from_sv((const SV *) (W))
-
-#define vmg_wizard_sv_id(W) PTR2IV(vmg_vtable_vtbl(vmg_wizard_from_sv(W)->vtable))
-
-#else
-
-#define vmg_wizard_sv_id(W) SvIVX((const SV *) (W))
-
-#define vmg_wizard_from_sv(W) INT2PTR(const vmg_wizard *, vmg_wizard_sv_id(W))
+#else /* VMG_THREADSAFE */
-#endif
+#define vmg_sv_has_wizard_type(S) SvIOK(S)
-STATIC int vmg_wizard_sv_free(pTHX_ SV *sv, MAGIC *mg) {
- if (PL_dirty) /* During global destruction, the context is already freed */
- return 0;
+#define vmg_wizard_from_sv_nocheck(W) INT2PTR(const vmg_wizard *, SvIVX(W))
- vmg_wizard_free((vmg_wizard *) mg->mg_ptr);
+#endif /* !VMG_THREADSAFE */
- return 0;
-}
+#define vmg_wizard_from_sv(W) (vmg_sv_has_wizard_type(W) ? vmg_wizard_from_sv_nocheck(W) : NULL)
-#if VMG_THREADSAFE
+STATIC const vmg_wizard *vmg_wizard_from_mg(const MAGIC *mg) {
+ if (mg->mg_type == PERL_MAGIC_ext && mg->mg_len == HEf_SVKEY) {
+ SV *sv = (SV *) mg->mg_ptr;
-STATIC int vmg_wizard_sv_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *params) {
- mg->mg_ptr = (char *) vmg_wizard_dup((const vmg_wizard *) mg->mg_ptr, params);
+ if (vmg_sv_has_wizard_type(sv))
+ return vmg_wizard_from_sv_nocheck(sv);
+ }
- return 0;
+ return NULL;
}
-#endif /* VMG_THREADSAFE */
+#define vmg_wizard_from_mg_nocheck(M) vmg_wizard_from_sv_nocheck((const SV *) (M)->mg_ptr)
/* --- User-level functions implementation --------------------------------- */
-STATIC const MAGIC *vmg_find(const SV *sv, const SV *wiz) {
- const MAGIC *mg, *moremagic;
+STATIC const MAGIC *vmg_find(const SV *sv, const vmg_wizard *w) {
+ const MAGIC *mg;
IV wid;
if (SvTYPE(sv) < SVt_PVMG)
return NULL;
- wid = vmg_wizard_sv_id(wiz);
- for (mg = SvMAGIC(sv); mg; mg = moremagic) {
- moremagic = mg->mg_moremagic;
- if (mg->mg_type == PERL_MAGIC_ext && mg->mg_private == SIG_WIZ) {
- IV zid = vmg_wizard_sv_id(mg->mg_ptr);
- if (zid == wid)
- return mg;
- }
+ wid = vmg_wizard_id(w);
+
+ for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) {
+ const vmg_wizard *z = vmg_wizard_from_mg(mg);
+
+ if (z && vmg_wizard_id(z) == wid)
+ return mg;
}
return NULL;
return nsv;
}
-STATIC SV *vmg_data_get(pTHX_ SV *sv, const SV *wiz) {
+STATIC SV *vmg_data_get(pTHX_ SV *sv, const vmg_wizard *w) {
#define vmg_data_get(S, W) vmg_data_get(aTHX_ (S), (W))
- const MAGIC *mg = vmg_find(sv, wiz);
+ const MAGIC *mg = vmg_find(sv, w);
+
return mg ? mg->mg_obj : NULL;
}
}
#endif /* VMG_UVAR */
-STATIC UV vmg_cast(pTHX_ SV *sv, const SV *wiz, SV **args, I32 items) {
-#define vmg_cast(S, W, A, I) vmg_cast(aTHX_ (S), (W), (A), (I))
- const vmg_wizard *w;
- MAGIC *mg;
- SV *data;
- U32 oldgmg;
+STATIC UV vmg_cast(pTHX_ SV *sv, const vmg_wizard *w, const SV *wiz, SV **args, I32 items) {
+#define vmg_cast(S, W, WIZ, A, I) vmg_cast(aTHX_ (S), (W), (WIZ), (A), (I))
+ MAGIC *mg;
+ MGVTBL *t;
+ SV *data;
+ U32 oldgmg;
- if (vmg_find(sv, wiz))
+ if (vmg_find(sv, w))
return 1;
- w = vmg_wizard_from_sv(wiz);
oldgmg = SvGMAGICAL(sv);
data = (w->cb_data) ? vmg_data_new(w->cb_data, sv, args, items) : NULL;
+
+ t = vmg_vtable_vtbl(w->vtable);
+ mg = sv_magicext(sv, data, PERL_MAGIC_ext, t, (const char *) wiz, HEf_SVKEY);
+ mg->mg_private = 0;
+
/* sv_magicext() calls mg_magical and increments data's refcount */
- mg = sv_magicext(sv, data, PERL_MAGIC_ext, vmg_vtable_vtbl(w->vtable),
- (const char *) wiz, HEf_SVKEY);
SvREFCNT_dec(data);
- mg->mg_private = SIG_WIZ;
- if (w->cb_copy)
+
+ if (t->svt_copy)
mg->mg_flags |= MGf_COPY;
#if 0
- if (w->cb_dup)
+ if (t->svt_dup)
mg->mg_flags |= MGf_DUP;
#endif
#if MGf_LOCAL
- if (w->cb_local)
+ if (t->svt_local)
mg->mg_flags |= MGf_LOCAL;
#endif /* MGf_LOCAL */
return 1;
}
-STATIC UV vmg_dispell(pTHX_ SV *sv, const SV *wiz) {
+STATIC UV vmg_dispell(pTHX_ SV *sv, const vmg_wizard *w) {
#define vmg_dispell(S, W) vmg_dispell(aTHX_ (S), (W))
#if VMG_UVAR
U32 uvars = 0;
#endif /* VMG_UVAR */
MAGIC *mg, *prevmagic, *moremagic = NULL;
- IV wid = vmg_wizard_sv_id(wiz);
+ IV wid = vmg_wizard_id(w);
if (SvTYPE(sv) < SVt_PVMG)
return 0;
for (prevmagic = NULL, mg = SvMAGIC(sv); mg; prevmagic = mg, mg = moremagic) {
+ const vmg_wizard *z;
+
moremagic = mg->mg_moremagic;
- if (mg->mg_type == PERL_MAGIC_ext && mg->mg_private == SIG_WIZ) {
+
+ z = vmg_wizard_from_mg(mg);
+ if (z) {
+ IV zid = vmg_wizard_id(z);
+
#if VMG_UVAR
- const vmg_wizard *z = vmg_wizard_from_sv(mg->mg_ptr);
-#endif /* VMG_UVAR */
- IV zid = vmg_wizard_sv_id(mg->mg_ptr);
if (zid == wid) {
-#if VMG_UVAR
/* If the current has no uvar, short-circuit uvar deletion. */
uvars = z->uvar ? (uvars + 1) : 0;
-#endif /* VMG_UVAR */
break;
-#if VMG_UVAR
} else if (z->uvar) {
++uvars;
/* We can't break here since we need to find the ext magic to delete. */
-#endif /* VMG_UVAR */
}
+#else /* VMG_UVAR */
+ if (zid == wid)
+ break;
+#endif /* !VMG_UVAR */
}
}
if (!mg)
/* 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_WIZ) {
- const vmg_wizard *z = vmg_wizard_from_sv(mg->mg_ptr);
- if (z->uvar) {
- ++uvars;
- break;
- }
+ const vmg_wizard *z = vmg_wizard_from_mg(mg);
+
+ if (z && z->uvar) {
+ ++uvars;
+ break;
}
}
vmg_cb_call(aTHX_ (I), VMG_CB_FLAGS((OI), 3), (S), (A1), (A2), (A3))
STATIC int vmg_svt_get(pTHX_ SV *sv, MAGIC *mg) {
- const vmg_wizard *w = vmg_wizard_from_sv(mg->mg_ptr);
+ const vmg_wizard *w = vmg_wizard_from_mg_nocheck(mg);
+
return vmg_cb_call1(w->cb_get, w->opinfo, sv, mg->mg_obj);
}
STATIC int vmg_svt_set(pTHX_ SV *sv, MAGIC *mg) {
- const vmg_wizard *w = vmg_wizard_from_sv(mg->mg_ptr);
+ const vmg_wizard *w = vmg_wizard_from_mg_nocheck(mg);
+
return vmg_cb_call1(w->cb_set, w->opinfo, sv, mg->mg_obj);
}
+STATIC U32 vmg_sv_len(pTHX_ SV *sv) {
+#define vmg_sv_len(S) vmg_sv_len(aTHX_ (S))
+ STRLEN len;
+#if VMG_HAS_PERL(5, 9, 3)
+ const U8 *s = VOID2(const U8 *, VOID2(const void *, SvPV_const(sv, len)));
+#else
+ U8 *s = SvPV(sv, len);
+#endif
+
+ return DO_UTF8(sv) ? utf8_length(s, s + len) : len;
+}
+
STATIC U32 vmg_svt_len(pTHX_ SV *sv, MAGIC *mg) {
- const vmg_wizard *w = vmg_wizard_from_sv(mg->mg_ptr);
+ const vmg_wizard *w = vmg_wizard_from_mg_nocheck(mg);
unsigned int opinfo = w->opinfo;
U32 len, ret;
SV *svr;
PUSHs(sv_2mortal(newRV_inc(sv)));
PUSHs(mg->mg_obj ? mg->mg_obj : &PL_sv_undef);
if (t < SVt_PVAV) {
- STRLEN l;
-#if VMG_HAS_PERL(5, 9, 3)
- const U8 *s = VOID2(const U8 *, VOID2(const void *, SvPV_const(sv, l)));
-#else
- U8 *s = SvPV(sv, l);
-#endif
- if (DO_UTF8(sv))
- len = utf8_length(s, s + l);
- else
- len = l;
+ len = vmg_sv_len(sv);
mPUSHu(len);
} else if (t == SVt_PVAV) {
len = av_len((AV *) sv) + 1;
}
STATIC int vmg_svt_clear(pTHX_ SV *sv, MAGIC *mg) {
- const vmg_wizard *w = vmg_wizard_from_sv(mg->mg_ptr);
+ const vmg_wizard *w = vmg_wizard_from_mg_nocheck(mg);
+
return vmg_cb_call1(w->cb_clear, w->opinfo, sv, mg->mg_obj);
}
if (PL_dirty)
return 0;
- w = vmg_wizard_from_sv(mg->mg_ptr);
+ w = vmg_wizard_from_mg_nocheck(mg);
/* So that it survives the temp cleanup below */
SvREFCNT_inc_simple_void(sv);
return ret;
}
-STATIC int vmg_svt_copy(pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *key,
-# if VMG_HAS_PERL_MAINT(5, 11, 0, 33256) || VMG_HAS_PERL(5, 12, 0)
- I32 keylen
-# else
- int keylen
-# endif
- ) {
- const vmg_wizard *w = vmg_wizard_from_sv(mg->mg_ptr);
+#if VMG_HAS_PERL_MAINT(5, 11, 0, 33256) || VMG_HAS_PERL(5, 12, 0)
+# define VMG_SVT_COPY_KEYLEN_TYPE I32
+#else
+# define VMG_SVT_COPY_KEYLEN_TYPE int
+#endif
+
+STATIC int vmg_svt_copy(pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *key, VMG_SVT_COPY_KEYLEN_TYPE keylen) {
+ const vmg_wizard *w = vmg_wizard_from_mg_nocheck(mg);
SV *keysv;
int ret;
#if MGf_LOCAL
STATIC int vmg_svt_local(pTHX_ SV *nsv, MAGIC *mg) {
- const vmg_wizard *w = vmg_wizard_from_sv(mg->mg_ptr);
+ const vmg_wizard *w = vmg_wizard_from_mg_nocheck(mg);
+
return vmg_cb_call1(w->cb_local, w->opinfo, nsv, mg->mg_obj);
}
#endif /* MGf_LOCAL */
if (uf[1].uf_set)
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) {
const vmg_wizard *w;
+
switch (mg->mg_type) {
case PERL_MAGIC_ext:
break;
default:
continue;
}
- if (mg->mg_private != SIG_WIZ) continue;
- w = vmg_wizard_from_sv(mg->mg_ptr);
+
+ w = vmg_wizard_from_mg(mg);
+ if (!w)
+ continue;
+
switch (w->uvar) {
case 0:
continue;
if (!newkey)
newkey = key = umg->mg_obj = sv_mortalcopy(umg->mg_obj);
}
- switch (action) {
+
+ switch (action
+ & (HV_FETCH_ISSTORE|HV_FETCH_ISEXISTS|HV_FETCH_LVALUE|HV_DELETE)) {
case 0:
if (w->cb_fetch)
vmg_cb_call2(w->cb_fetch, w->opinfo, sv, mg->mg_obj, key);
}
}
- if (SvRMAGICAL(sv) && !tied) {
+ if (SvRMAGICAL(sv) && !tied && !(action & (HV_FETCH_ISSTORE|HV_DELETE))) {
/* Temporarily hide the RMAGICAL flag of the hash so it isn't wrongly
* mistaken for a tied hash by the rest of hv_common. It will be reset by
* the op_ppaddr of a new fake op injected between the current and the next
* one. */
- OP *o = PL_op;
- if (!o->op_next || o->op_next->op_ppaddr != vmg_pp_resetuvar) {
+ OP *nop = PL_op->op_next;
+ if (!nop || nop->op_ppaddr != vmg_pp_resetuvar) {
SVOP *svop;
NewOp(1101, svop, 1, SVOP);
svop->op_type = OP_STUB;
svop->op_ppaddr = vmg_pp_resetuvar;
- svop->op_next = o->op_next;
+ svop->op_next = nop;
svop->op_flags = 0;
svop->op_sv = sv;
- o->op_next = (OP *) svop;
+ PL_op->op_next = (OP *) svop;
}
SvRMAGICAL_off(sv);
}
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_SCALAR_LENGTH_NOLEN",
+ newSVuv(VMG_COMPAT_SCALAR_LENGTH_NOLEN));
newCONSTSUB(stash, "VMG_COMPAT_ARRAY_PUSH_NOLEN",
newSVuv(VMG_COMPAT_ARRAY_PUSH_NOLEN));
newCONSTSUB(stash, "VMG_COMPAT_ARRAY_PUSH_NOLEN_VOID",
newSVuv(VMG_COMPAT_ARRAY_UNSHIFT_NOLEN_VOID));
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));
+ newCONSTSUB(stash, "VMG_COMPAT_HASH_DELETE_NOUVAR_VOID",
+ newSVuv(VMG_COMPAT_HASH_DELETE_NOUVAR_VOID));
newCONSTSUB(stash, "VMG_COMPAT_GLOB_GET", newSVuv(VMG_COMPAT_GLOB_GET));
newCONSTSUB(stash, "VMG_PERL_PATCHLEVEL", newSVuv(VMG_PERL_PATCHLEVEL));
newCONSTSUB(stash, "VMG_THREADSAFE", newSVuv(VMG_THREADSAFE));
SV *cast(SV *sv, SV *wiz, ...)
PROTOTYPE: \[$@%&*]$@
PREINIT:
+ const vmg_wizard *w = NULL;
SV **args = NULL;
+ UV ret;
I32 i = 0;
CODE:
if (items > 2) {
i = items - 2;
args = &ST(2);
}
- RETVAL = newSVuv(vmg_cast(SvRV(sv), vmg_wizard_sv_validate(wiz), args, i));
+ if (SvROK(wiz)) {
+ wiz = SvRV_const(wiz);
+ w = vmg_wizard_from_sv(wiz);
+ }
+ if (!w)
+ croak(vmg_invalid_wiz);
+ RETVAL = newSVuv(vmg_cast(SvRV(sv), w, wiz, args, i));
OUTPUT:
RETVAL
getdata(SV *sv, SV *wiz)
PROTOTYPE: \[$@%&*]$
PREINIT:
+ const vmg_wizard *w = NULL;
SV *data;
PPCODE:
- data = vmg_data_get(SvRV(sv), vmg_wizard_sv_validate(wiz));
+ if (SvROK(wiz))
+ w = vmg_wizard_from_sv(SvRV_const(wiz));
+ if (!w)
+ croak(vmg_invalid_wiz);
+ data = vmg_data_get(SvRV(sv), w);
if (!data)
XSRETURN_EMPTY;
ST(0) = data;
SV *dispell(SV *sv, SV *wiz)
PROTOTYPE: \[$@%&*]$
+PREINIT:
+ const vmg_wizard *w = NULL;
CODE:
- RETVAL = newSVuv(vmg_dispell(SvRV(sv), vmg_wizard_sv_validate(wiz)));
+ if (SvROK(wiz))
+ w = vmg_wizard_from_sv(SvRV_const(wiz));
+ if (!w)
+ croak(vmg_invalid_wiz);
+ RETVAL = newSVuv(vmg_dispell(SvRV(sv), w));
OUTPUT:
RETVAL
projects / perl / modules / Variable-Magic.git / blobdiff