#ifndef MGf_COPY
# define MGf_COPY 0
-#endif /* !MGf_COPY */
+#endif
+#undef MGf_DUP /* Disable it for now. */
#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_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 -------------------------------------------- */
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
#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)))
/* ... Magic cast/dispell .................................................. */
-STATIC I32 vmg_uf_val(pTHX_ IV idx, SV *sv);
+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);
+}
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
#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 VMG_UVAR
+ MGWIZ *w = SV2MGWIZ(mg->mg_ptr);
+ if (w->uvar) { ++uvars; }
+#endif /* VMG_UVAR */
+ if (mg->mg_private == sig) {
+#if VMG_UVAR
+ if (!w->uvar) { uvars = 0; } /* Short-circuit uvar deletion. */
+#endif /* VMG_UVAR */
+ break;
+ }
+ }
}
if (!mg) { return 0; }
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) && 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_len = sizeof(struct ufuncs);
+ } else {
+ /* Remove the uvar magic. */
+ vmg_uvar_del(sv, prevmagic, mg, moremagic);
+ }
+ }
+ }
+#endif /* VMG_UVAR */
+
return 1;
}
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))
+#if MGf_COPY || VMG_UVAR
+STATIC int vmg_cb_call2(pTHX_ SV *cb, SV *sv, SV *data, SV *sv2) {
+#define vmg_cb_call2(I, S, D, S2) vmg_cb_call2(aTHX_ (I), (S), (D), (S2))
int ret;
dSP;
PUSHMARK(SP);
XPUSHs(sv_2mortal(newRV_inc(sv)));
XPUSHs(data ? data : &PL_sv_undef);
- if (extra) { XPUSHs(extra); }
+ if (sv2) { XPUSHs(sv2); }
PUTBACK;
count = call_sv(cb, G_SCALAR);
return ret;
}
+#endif /* MGf_COPY || VMG_UVAR */
STATIC int vmg_svt_get(pTHX_ SV *sv, MAGIC *mg) {
return vmg_cb_call(SV2MGWIZ(mg->mg_ptr)->cb_get, sv, mg->mg_obj);
PUSHMARK(SP);
XPUSHs(sv_2mortal(newRV_inc(sv)));
- XPUSHs((mg->mg_obj) ? (mg->mg_obj) : &PL_sv_undef);
+ XPUSHs(mg->mg_obj ? mg->mg_obj : &PL_sv_undef);
if (SvTYPE(sv) == SVt_PVAV) {
XPUSHs(sv_2mortal(newSViv(av_len((AV *) sv) + 1)));
}
#endif /* MGf_COPY */
#if MGf_DUP
-STATIC int vmg_svt_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *p) {
+STATIC int vmg_svt_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *param) {
return 0;
}
#endif /* MGf_DUP */
}
#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); }
+ 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); }
+ 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);}
+ 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);}
+ vmg_cb_call2(w->cb_delete, sv, mg->mg_obj, key);
break;
}
}
+
return 0;
}
+#endif /* VMG_UVAR */
/* ... Wizard destructor ................................................... */
#endif /* MGf_COPY */
#if MGf_DUP
if (w->cb_dup != NULL) { SvREFCNT_dec(SvRV(w->cb_dup)); }
-#endif /* MGf_DUP */
+#endif /* MGf_COPY */
#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)); }
+#endif /* MGf_COPY */
+#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);
#endif /* MGf_DUP */
#if MGf_LOCAL
NULL, /* local */
-#endif /* MGf_LOCAL */
+#endif /* MGf_DUP */
};
-/* --- 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";
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
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));
}
-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 (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);
#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;
projects / perl / modules / Variable-Magic.git / blobdiff