# 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)
#define VMG_SAVE_LAST_CX (!VMG_HAS_PERL(5, 8, 4) || VMG_HAS_PERL(5, 9, 5))
-STATIC I32 vmg_call_sv(pTHX_ SV *sv, I32 flags, I32 destructor) {
+STATIC I32 vmg_call_sv(pTHX_ SV *sv, I32 flags, SV *dsv) {
#define vmg_call_sv(S, F, D) vmg_call_sv(aTHX_ (S), (F), (D))
I32 ret, cxix = 0, in_eval = 0;
#if VMG_SAVE_LAST_CX
if (cxstack_ix < cxstack_max) {
cxix = cxstack_ix + 1;
- if (destructor && CxTYPE(cxstack + cxix) == CXt_EVAL)
+ if (dsv && CxTYPE(cxstack + cxix) == CXt_EVAL)
in_eval = 1;
}
#else
++PL_Ierror_count;
#endif
- } else if (!in_eval)
+ } else if (!in_eval) {
+ if (dsv) {
+ /* We are about to croak() while dsv is being destroyed. Try to clean up
+ * things a bit. */
+ MAGIC *mg = SvMAGIC(dsv);
+ SvREFCNT_dec((SV *) mg->mg_ptr);
+ /* mg->mg_obj may not be refcounted if the data constructor returned the
+ * variable itself. */
+ if (mg->mg_flags & MGf_REFCOUNTED)
+ SvREFCNT_dec(mg->mg_obj);
+ SvMAGIC_set(dsv, mg->mg_moremagic);
+ Safefree(mg);
+ mg_magical(dsv);
+ SvREFCNT_dec(dsv);
+ }
croak(NULL);
+ }
} else {
if (old_err) {
SvREFCNT_dec(ERRSV);
START_MY_CXT
-/* --- Signatures ---------------------------------------------------------- */
-
-#define SIG_WZO ((U16) (0x3891))
-#define SIG_WIZ ((U16) (0x3892))
-
/* --- <vmg_vtable> structure ---------------------------------------------- */
#if VMG_THREADSAFE
#define vmg_vtable_vtbl(T) (T)->vtbl
-#if VMG_THREADSAFE
STATIC perl_mutex vmg_vtable_refcount_mutex;
-#endif
STATIC vmg_vtable *vmg_vtable_dup(pTHX_ vmg_vtable *t) {
#define vmg_vtable_dup(T) vmg_vtable_dup(aTHX_ (T))
if (!w)
return;
- SvREFCNT_dec(w->cb_data);
- SvREFCNT_dec(w->cb_get);
- SvREFCNT_dec(w->cb_set);
- SvREFCNT_dec(w->cb_len);
- SvREFCNT_dec(w->cb_clear);
- SvREFCNT_dec(w->cb_free);
- SvREFCNT_dec(w->cb_copy);
+ /* During global destruction, any of the callbacks may already have been
+ * freed, so we can't rely on still being able to access them. */
+ if (!PL_dirty) {
+ SvREFCNT_dec(w->cb_data);
+ SvREFCNT_dec(w->cb_get);
+ SvREFCNT_dec(w->cb_set);
+ SvREFCNT_dec(w->cb_len);
+ SvREFCNT_dec(w->cb_clear);
+ SvREFCNT_dec(w->cb_free);
+ SvREFCNT_dec(w->cb_copy);
#if 0
- SvREFCNT_dec(w->cb_dup);
+ SvREFCNT_dec(w->cb_dup);
#endif
#if MGf_LOCAL
- SvREFCNT_dec(w->cb_local);
+ SvREFCNT_dec(w->cb_local);
#endif /* MGf_LOCAL */
#if VMG_UVAR
- SvREFCNT_dec(w->cb_fetch);
- SvREFCNT_dec(w->cb_store);
- SvREFCNT_dec(w->cb_exists);
- SvREFCNT_dec(w->cb_delete);
+ SvREFCNT_dec(w->cb_fetch);
+ SvREFCNT_dec(w->cb_store);
+ SvREFCNT_dec(w->cb_exists);
+ SvREFCNT_dec(w->cb_delete);
#endif /* VMG_UVAR */
+ }
+ /* PerlMemShared_free() and Safefree() are still fine during global
+ * destruction though. */
vmg_vtable_free(w->vtable);
Safefree(w);
#endif /* VMG_THREADSAFE */
+#define vmg_wizard_id(W) PTR2IV(vmg_vtable_vtbl((W)->vtable))
+
/* --- Wizard SV objects --------------------------------------------------- */
STATIC int vmg_wizard_sv_free(pTHX_ SV *sv, MAGIC *mg) {
- if (PL_dirty) /* During global destruction, the context is already freed */
- return 0;
-
vmg_wizard_free((vmg_wizard *) mg->mg_ptr);
return 0;
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;
-}
+#define vmg_sv_has_wizard_type(S) (SvTYPE(S) >= SVt_PVMG)
-#if VMG_THREADSAFE
-
-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))
+#else /* VMG_THREADSAFE */
+
+#define vmg_sv_has_wizard_type(S) SvIOK(S)
-#define vmg_wizard_sv_id(W) PTR2IV(vmg_vtable_vtbl(vmg_wizard_from_sv(W)->vtable))
+#define vmg_wizard_from_sv_nocheck(W) INT2PTR(const vmg_wizard *, SvIVX(W))
-#else
+#endif /* !VMG_THREADSAFE */
-#define vmg_wizard_sv_id(W) SvIVX((const SV *) (W))
+#define vmg_wizard_from_sv(W) (vmg_sv_has_wizard_type(W) ? vmg_wizard_from_sv_nocheck(W) : NULL)
-#define vmg_wizard_from_sv(W) INT2PTR(const vmg_wizard *, vmg_wizard_sv_id(W))
+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;
-#endif
+ if (vmg_sv_has_wizard_type(sv))
+ return vmg_wizard_from_sv_nocheck(sv);
+ }
+
+ return NULL;
+}
+
+#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;
PUSHs(args[i]);
PUTBACK;
- vmg_call_sv(ctor, G_SCALAR, 0);
+ vmg_call_sv(ctor, G_SCALAR, NULL);
SPAGAIN;
nsv = POPs;
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;
}
}
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];
return &PL_sv_undef;
}
-/* ... svt callbacks ....................................................... */
+/* --- svt callbacks ------------------------------------------------------- */
#define VMG_CB_CALL_ARGS_MASK 15
#define VMG_CB_CALL_ARGS_SHIFT 4
XPUSHs(vmg_op_info(opinfo));
PUTBACK;
- vmg_call_sv(cb, G_SCALAR, 0);
+ vmg_call_sv(cb, G_SCALAR, NULL);
SPAGAIN;
svr = POPs;
#define vmg_cb_call3(I, OI, S, A1, A2, A3) \
vmg_cb_call(aTHX_ (I), VMG_CB_FLAGS((OI), 3), (S), (A1), (A2), (A3))
+STATIC int vmg_svt_default_noop(pTHX_ SV *sv, MAGIC *mg) {
+ return 0;
+}
+
+/* ... get magic ........................................................... */
+
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);
}
+#define vmg_svt_get_noop vmg_svt_default_noop
+
+/* ... set magic ........................................................... */
+
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);
}
+#define vmg_svt_set_noop vmg_svt_default_noop
+
+/* ... len magic ........................................................... */
+
+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;
XPUSHs(vmg_op_info(opinfo));
PUTBACK;
- vmg_call_sv(w->cb_len, G_SCALAR, 0);
+ vmg_call_sv(w->cb_len, G_SCALAR, NULL);
SPAGAIN;
svr = POPs;
return ret;
}
+STATIC U32 vmg_svt_len_noop(pTHX_ SV *sv, MAGIC *mg) {
+ U32 len = 0;
+ svtype t = SvTYPE(sv);
+
+ if (t < SVt_PVAV) {
+ len = vmg_sv_len(sv);
+ } else if (t == SVt_PVAV) {
+ len = (U32) av_len((AV *) sv);
+ }
+
+ return len;
+}
+
+/* ... clear magic ......................................................... */
+
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);
}
+#define vmg_svt_clear_noop vmg_svt_default_noop
+
+/* ... free magic .......................................................... */
+
STATIC int vmg_svt_free(pTHX_ SV *sv, MAGIC *mg) {
const vmg_wizard *w;
int ret = 0;
dSP;
- /* Don't even bother if we are in global destruction - the wizard is prisoner
- * of circular references and we are way beyond user realm */
+ /* During global destruction, we cannot be sure that the wizard and its free
+ * callback are still alive. */
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);
XPUSHs(vmg_op_info(w->opinfo));
PUTBACK;
- vmg_call_sv(w->cb_free, G_SCALAR, 1);
+ vmg_call_sv(w->cb_free, G_SCALAR, sv);
SPAGAIN;
svr = POPs;
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);
+#define vmg_svt_free_noop vmg_svt_default_noop
+
+#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
+
+/* ... copy magic .......................................................... */
+
+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;
return ret;
}
+STATIC int vmg_svt_copy_noop(pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *key, VMG_SVT_COPY_KEYLEN_TYPE keylen) {
+ return 0;
+}
+
+/* ... dup magic ........................................................... */
+
#if 0
STATIC int vmg_svt_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *param) {
return 0;
}
+#define vmg_svt_dup_noop vmg_svt_dup
#endif
+/* ... local magic ......................................................... */
+
#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);
}
+
+#define vmg_svt_local_noop vmg_svt_default_noop
+
#endif /* MGf_LOCAL */
+/* ... uvar magic .......................................................... */
+
#if VMG_UVAR
STATIC OP *vmg_pp_resetuvar(pTHX) {
SvRMAGICAL_on(cSVOP_sv);
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);
}
/* --- Macros for the XS section ------------------------------------------- */
-#define VMG_SET_CB(S, N) \
- cb = (S); \
- w->cb_ ## N = (SvOK(cb) && SvROK(cb)) ? SvREFCNT_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 = SvREFCNT_inc(SvRV(cb)); \
- } else { \
- t->svt_ ## N = NULL; \
- w->cb_ ## N = NULL; \
- }
+#ifdef CvISXSUB
+# define VMG_CVOK(C) \
+ ((CvISXSUB(C) ? (void *) CvXSUB(C) : (void *) CvROOT(C)) ? 1 : 0)
+#else
+# define VMG_CVOK(C) (CvROOT(C) || CvXSUB(C))
+#endif
+
+#define VMG_CBOK(S) ((SvTYPE(S) == SVt_PVCV) ? VMG_CVOK(S) : SvOK(S))
+
+#define VMG_SET_CB(S, N) { \
+ SV *cb = (S); \
+ if (SvOK(cb) && SvROK(cb)) { \
+ cb = SvRV(cb); \
+ if (VMG_CBOK(cb)) \
+ SvREFCNT_inc_simple_void(cb); \
+ else \
+ cb = NULL; \
+ } else { \
+ cb = NULL; \
+ } \
+ w->cb_ ## N = cb; \
+}
+
+#define VMG_SET_SVT_CB(S, N) { \
+ SV *cb = (S); \
+ if (SvOK(cb) && SvROK(cb)) { \
+ cb = SvRV(cb); \
+ if (VMG_CBOK(cb)) { \
+ t->svt_ ## N = vmg_svt_ ## N; \
+ SvREFCNT_inc_simple_void(cb); \
+ } else { \
+ t->svt_ ## N = vmg_svt_ ## N ## _noop; \
+ cb = NULL; \
+ } \
+ } else { \
+ t->svt_ ## N = NULL; \
+ cb = NULL; \
+ } \
+ w->cb_ ## N = cb; \
+}
/* --- XS ------------------------------------------------------------------ */
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));
PREINIT:
vmg_wizard *w;
MGVTBL *t;
- SV *cb, *op_info, *copy_key;
+ SV *op_info, *copy_key;
I32 i = 0;
CODE:
if (items != 9
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