X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Magic.xs;h=87139f6841c1f21d98204c635bc66a39c69ef287;hb=007eabbe0d1375007c447941bb31760d069d572c;hp=14874e19527ef9c408e59e8ad264e2fbcb4b7d07;hpb=8556481280524737222300317146a23b801f6be0;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/Magic.xs b/Magic.xs
index 14874e1..87139f6 100644
--- a/Magic.xs
+++ b/Magic.xs
@@ -1,7 +1,6 @@
 /* This file is part of the Variable::Magic Perl module.
  * See http://search.cpan.org/dist/Variable-Magic/ */
 
-#include <stdlib.h> /* rand(), RAND_MAX */
 #include <stdio.h>  /* sprintf() */
 
 #define PERL_NO_GET_CONTEXT
@@ -13,6 +12,10 @@
 
 #define R(S) fprintf(stderr, "R(" #S ") = %d\n", SvREFCNT(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))))))
+
 /* --- Compatibility ------------------------------------------------------- */
 
 #ifndef Newx
@@ -30,6 +33,22 @@
 # define MY_CXT_INIT
 #endif
 
+#ifndef PERL_MAGIC_ext
+# define PERL_MAGIC_ext '~'
+#endif
+
+#ifndef MGf_COPY
+# define MGf_COPY 0
+#endif /* !MGf_COPY */
+
+#ifndef MGf_DUP
+# define MGf_DUP 0
+#endif /* !MGf_DUP */
+
+#ifndef MGf_LOCAL
+# define MGf_LOCAL 0
+#endif /* !MGf_LOCAL */
+
 /* --- Context-safe global data -------------------------------------------- */
 
 #define MY_CXT_KEY __PACKAGE__ "::_guts" XS_VERSION
@@ -57,8 +76,7 @@ STATIC U16 vmg_gensig(pTHX) {
  dMY_CXT;
 
  do {
-  double u = rand() / (RAND_MAX + 1.0);
-  sig = SIG_NBR * u + SIG_MIN;
+  sig = SIG_NBR * Drand01() + SIG_MIN;
  } while (hv_exists(MY_CXT.wizz, buf, sprintf(buf, "%u", sig)));
 
  return sig;
@@ -69,7 +87,19 @@ STATIC U16 vmg_gensig(pTHX) {
 typedef struct {
  MGVTBL *vtbl;
  U16 sig;
- SV *cb_get, *cb_set, *cb_len, *cb_clear, *cb_free, *cb_data;
+ int uvar;
+ SV *cb_data;
+ SV *cb_get, *cb_set, *cb_len, *cb_clear, *cb_free;
+#if MGf_COPY
+ SV *cb_copy;
+#endif /* MGf_COPY */
+#if MGf_DUP
+ SV *cb_dup;
+#endif /* MGf_DUP */
+#if MGf_LOCAL
+ SV *cb_local;
+#endif /* MGf_LOCAL */
+ SV *cb_fetch, *cb_store, *cb_exists, *cb_delete;
 } MGWIZ;
 
 #define MGWIZ2SV(W) (newSVuv(PTR2UV(W)))
@@ -101,7 +131,11 @@ STATIC SV *vmg_data_new(pTHX_ SV *ctor, SV *sv, AV *args) {
 
  if (count != 1) { croak("Callback needs to return 1 scalar\n"); }
  nsv = POPs;
- SvREFCNT_inc(nsv); /* Or it will be destroyed in FREETMPS */
+#if PERL_VERSION_LE(5, 8, 2)
+ nsv = sv_newref(nsv); /* Workaround some bug in SvREFCNT_inc() */
+#else
+ SvREFCNT_inc(nsv);    /* Or it will be destroyed in FREETMPS */
+#endif
 
  PUTBACK;
 
@@ -128,26 +162,48 @@ STATIC SV *vmg_data_get(SV *sv, U16 sig) {
 
 /* ... Magic cast/dispell .................................................. */
 
+STATIC I32 vmg_uf_val(pTHX_ IV idx, SV *sv);
+
 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) {
-  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 ((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 (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,
-                            (const char *) wiz, HEf_SVKEY);
+ mg = sv_magicext(sv, data, PERL_MAGIC_ext, w->vtbl, (char *) wiz, HEf_SVKEY);
  mg->mg_private = w->sig;
+ mg->mg_flags   = mg->mg_flags
+#if MGf_COPY
+                | MGf_COPY
+#endif /* MGf_COPY */
+#if MGf_DUP
+                | MGf_DUP
+#endif /* MGf_DUP */
+#if MGf_LOCAL
+                | MGf_LOCAL
+#endif /* MGf_LOCAL */
+ ;
 
  return 1;
 }
@@ -211,6 +267,37 @@ 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;
+}
+
 STATIC int vmg_svt_get(pTHX_ SV *sv, MAGIC *mg) {
  return vmg_cb_call(SV2MGWIZ(mg->mg_ptr)->cb_get, sv, mg->mg_obj);
 }
@@ -263,6 +350,57 @@ STATIC int vmg_svt_free(pTHX_ SV *sv, MAGIC *mg) {
  return vmg_cb_call(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);
+}
+#endif /* MGf_COPY */
+
+#if MGf_DUP
+STATIC int vmg_svt_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *p) {
+ 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);
+}
+#endif /* MGf_LOCAL */
+
+STATIC I32 vmg_uf_val(pTHX_ IV idx, SV *sv) {
+ 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; }
+ 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; }
+  w = SV2MGWIZ(mg->mg_ptr);
+  if (!w->uvar) { continue; }
+  switch (idx & (HV_FETCH_ISSTORE|HV_FETCH_ISEXISTS|HV_FETCH_LVALUE|HV_DELETE)){
+   case 0:
+    if (w->cb_fetch) { return 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); }
+    break;
+   case HV_FETCH_ISEXISTS:
+    if (w->cb_exists) { return 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);}
+    break;
+  }
+ }
+ return 0;
+}
+
 /* ... Wizard destructor ................................................... */
 
 STATIC int vmg_wizard_free(pTHX_ SV *wiz, MAGIC *mg) {
@@ -273,19 +411,32 @@ STATIC int vmg_wizard_free(pTHX_ SV *wiz, MAGIC *mg) {
  w = SV2MGWIZ(wiz);
 
  SvREFCNT_inc(wiz); /* Fake survival - it's gonna be deleted anyway */
-#if PERL_API_REVISION >= 5 && PERL_API_VERSION >= 9 && PERL_API_SUBVERSION >= 5
+#if PERL_API_VERSION_GE(5, 9, 5)
  SvREFCNT_inc(wiz); /* One more push */
 #endif
  if (hv_delete(MY_CXT.wizz, buf, sprintf(buf, "%u", w->sig), 0)) {
   --MY_CXT.count;
  }
 
+ if (w->cb_data  != NULL) { SvREFCNT_dec(SvRV(w->cb_data)); }
  if (w->cb_get   != NULL) { SvREFCNT_dec(SvRV(w->cb_get)); }
  if (w->cb_set   != NULL) { SvREFCNT_dec(SvRV(w->cb_set)); }
  if (w->cb_len   != NULL) { SvREFCNT_dec(SvRV(w->cb_len)); }
  if (w->cb_clear != NULL) { SvREFCNT_dec(SvRV(w->cb_clear)); }
  if (w->cb_free  != NULL) { SvREFCNT_dec(SvRV(w->cb_free)); }
- if (w->cb_data  != NULL) { SvREFCNT_dec(SvRV(w->cb_data)); }
+#if MGf_COPY
+ if (w->cb_copy  != NULL) { SvREFCNT_dec(SvRV(w->cb_copy)); }
+#endif /* MGf_COPY */
+#if MGf_DUP
+ if (w->cb_dup   != NULL) { SvREFCNT_dec(SvRV(w->cb_dup)); }
+#endif /* MGf_DUP */
+#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 (w->cb_exists != NULL) { SvREFCNT_dec(SvRV(w->cb_exists)); }
+ if (w->cb_delete != NULL) { SvREFCNT_dec(SvRV(w->cb_delete)); }
  Safefree(w->vtbl);
  Safefree(w);
 
@@ -298,14 +449,20 @@ STATIC MGVTBL vmg_wizard_vtbl = {
  NULL,            /* len */
  NULL,            /* clear */
  vmg_wizard_free, /* free */
-#ifdef MGf_COPY
+#if MGf_COPY
  NULL,            /* copy */
 #endif /* MGf_COPY */
-#ifdef MGf_DUP
+#if MGf_DUP
  NULL,            /* dup */
 #endif /* MGf_DUP */
+#if MGf_LOCAL
+ NULL,            /* local */
+#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";
@@ -331,6 +488,18 @@ 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; \
+ }
+
 /* --- XS ------------------------------------------------------------------ */
 
 MODULE = Variable::Magic            PACKAGE = Variable::Magic
@@ -344,26 +513,29 @@ BOOT:
  MY_CXT.wizz = newHV();
  MY_CXT.count = 0;
  stash = gv_stashpv(__PACKAGE__, 1);
- newCONSTSUB(stash, "SIG_MIN",  newSVuv(SIG_MIN));
- newCONSTSUB(stash, "SIG_MAX",  newSVuv(SIG_MAX));
- newCONSTSUB(stash, "SIG_NBR",  newSVuv(SIG_NBR));
-/*
- newCONSTSUB(stash, "MGf_COPY", newSVuv(MGf_COPY));
- newCONSTSUB(stash, "MGf_DUP",  newSVuv(MGf_DUP));
-*/
+ newCONSTSUB(stash, "SIG_MIN",   newSVuv(SIG_MIN));
+ newCONSTSUB(stash, "SIG_MAX",   newSVuv(SIG_MAX));
+ newCONSTSUB(stash, "SIG_NBR",   newSVuv(SIG_NBR));
+ newCONSTSUB(stash, "MGf_COPY",  newSVuv(MGf_COPY));
+ newCONSTSUB(stash, "MGf_DUP",   newSVuv(MGf_DUP));
+ newCONSTSUB(stash, "MGf_LOCAL", newSVuv(MGf_LOCAL));
 }
 
-SV *_wizard(SV *svsig, SV *cb_get, SV *cb_set, SV *cb_len, SV *cb_clear, SV *cb_free, SV *cb_data)
-PROTOTYPE: $&&&&&&
+SV *_wizard(SV *svsig, ...)
+PROTOTYPE: $@
 PREINIT:
  U16 sig;
+ I32 i;
  char buf[8];
  MGWIZ *w;
  MGVTBL *t;
  MAGIC *mg;
- SV *sv;
+ SV *cb, *sv;
 CODE:
  dMY_CXT;
+
+ if (items != 14) { croak(vmg__wizard_args); }
+
  if (SvOK(svsig)) {
   SV **old;
   sig = vmg_sv2sig(svsig);
@@ -375,33 +547,46 @@ CODE:
   if (MY_CXT.count >= SIG_NBR) { croak(vmg_toomanysigs); }
   sig = vmg_gensig();
  }
- 
- Newx(t, 1, MGVTBL);
- t->svt_get   = (SvOK(cb_get))   ? vmg_svt_get   : NULL;
- t->svt_set   = (SvOK(cb_set))   ? vmg_svt_set   : NULL;
- t->svt_len   = (SvOK(cb_len))   ? vmg_svt_len   : NULL;
- t->svt_clear = (SvOK(cb_clear)) ? vmg_svt_clear : NULL;
- t->svt_free  = (SvOK(cb_free))  ? vmg_svt_free  : NULL;
-#ifdef MGf_COPY
- t->svt_copy  = NULL;
-#endif /* MGf_COPY */
-#ifdef MGf_DUP
- t->svt_dup   = NULL;
-#endif /* MGf_DUP */
 
+ Newx(t, 1, MGVTBL);
  Newx(w, 1, MGWIZ);
  w->vtbl = t;
  w->sig  = sig;
- w->cb_get   = (SvROK(cb_get))   ? newRV_inc(SvRV(cb_get))   : NULL;
- w->cb_set   = (SvROK(cb_set))   ? newRV_inc(SvRV(cb_set))   : NULL;
- w->cb_len   = (SvROK(cb_len))   ? newRV_inc(SvRV(cb_len))   : NULL;
- w->cb_clear = (SvROK(cb_clear)) ? newRV_inc(SvRV(cb_clear)) : NULL;
- w->cb_free  = (SvROK(cb_free))  ? newRV_inc(SvRV(cb_free))  : NULL;
- w->cb_data  = (SvROK(cb_data))  ? newRV_inc(SvRV(cb_data))  : NULL;
+
+ 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));
+#if MGf_COPY
+ VMG_SET_CB_SVT(copy,  t, w, ST(7));
+#endif /* MGf_COPY */
+#if MGf_DUP
+ VMG_SET_CB_SVT(dup,   t, w, ST(8));
+#endif /* MGf_DUP */
+#if MGf_LOCAL
+ VMG_SET_CB_SVT(local, t, w, ST(9));
+#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));
+
+ w->uvar = (w->cb_fetch || w->cb_store || w->cb_exists || w->cb_delete);
 
  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;