X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Op.xs;h=91f07cc2aeec34ed2a457e38e506e9b813fc442f;hb=efeaaece7f45dd3c188aca0094d050ea242d4bb6;hp=fe67d0838e80e459cefcb49c9bcee3d9af81d18a;hpb=61188a20996808b5a4ad19cc35d272ff7d83b8f1;p=perl%2Fmodules%2FSub-Op.git

diff --git a/Op.xs b/Op.xs
index fe67d08..91f07cc 100644
--- a/Op.xs
+++ b/Op.xs
@@ -55,8 +55,6 @@
 
 typedef struct {
  HV  *map;
- AV  *next_pkg;
- AV  *next_name;
  CV  *placeholder;
 #if SO_THREADSAFE
  tTHX owner;
@@ -92,87 +90,115 @@ STATIC SV *so_clone(pTHX_ SV *sv, tTHX owner) {
 
 #endif /* SO_THREADSAFE */
 
-#define PTABLE_NAME        ptable
-#define PTABLE_VAL_FREE(V) PerlMemShared_free(V)
+/* --- Public API ---------------------------------------------------------- */
+
+#include "sub_op.h"
 
-#include "ptable.h"
+void sub_op_init(sub_op_config_t *c) {
+ c->name     = NULL;
+ c->namelen  = 0;
+ c->proto    = NULL;
+ c->protolen = 0;
+ c->call     = 0;
+ c->ref      = 0;
+ c->ud       = NULL;
 
-/* PerlMemShared_free() needs the [ap]PTBLMS_? default values */
-#define ptable_store(T, K, V) ptable_store(aPTBLMS_ (T), (K), (V))
+ return;
+}
 
-STATIC ptable *sub_op_name = NULL;
+void sub_op_register(pTHX_ const sub_op_config_t *c, U32 flags) {
+ dMY_CXT;
 
-#ifdef USE_ITHREADS
-STATIC perl_mutex sub_op_name_mutex;
-#endif
+ if (!(flags & SUB_OP_REGISTER_STEAL))
+  c = sub_op_dup(aTHX_ c);
 
-typedef struct {
+ (void) hv_store(MY_CXT.map, c->name, c->namelen, newSViv(PTR2IV(c)), 0);
+}
+
+sub_op_config_t *sub_op_dup(pTHX_ const sub_op_config_t *orig) {
  STRLEN len;
- char   buf;
-} sub_op_name_t;
+ sub_op_config_t *dupe = PerlMemShared_malloc(sizeof *dupe);
+
+ len           = orig->namelen;
+ if (orig->name) {
+  dupe->name   = PerlMemShared_malloc(len + 1);
+  Copy(orig->name, dupe->name, len, char);
+  ((char *) dupe->name)[len] = '\0';
+ } else {
+  dupe->name   = NULL;
+ }
+ dupe->namelen = len;
+
+ len            = orig->protolen;
+ if (orig->proto) {
+  dupe->proto   = PerlMemShared_malloc(len + 1);
+  Copy(orig->proto, dupe->proto, len, char);
+  ((char *) dupe->proto)[len] = '\0';
+ } else {
+  dupe->proto   = NULL;
+ }
+ dupe->protolen = len;
 
-/* --- Public API ---------------------------------------------------------- */
+ dupe->call = orig->call;
+ dupe->ref  = orig->ref;
+ dupe->ud   = orig->ud;
 
-#include "sub_op.h"
+ return dupe;
+}
 
-void sub_op_register(pTHX_ const sub_op_keyword *k) {
- SV *key = newSViv(PTR2IV(k->pp));
+void sub_op_free(pTHX_ sub_op_config_t *c) {
+ PerlMemShared_free((char *) c->name);
+ PerlMemShared_free(c);
 
- if (!PL_custom_op_names)
-  PL_custom_op_names = newHV();
- (void) hv_store_ent(PL_custom_op_names, key, newSVpv(k->name, k->len), 0);
+ return;
+}
 
- if (!PL_custom_op_descs)
-  PL_custom_op_descs = newHV();
- (void) hv_store_ent(PL_custom_op_descs, key, newSVpv(k->name, k->len), 0);
+OP *sub_op_study(const OP *o, OP **last_arg_p, OP **rv2cv_p) {
+ OP *ex_list, *last_arg, *rv2cv, *gvop;
 
- if (k->check) {
-  SV *check = newSViv(PTR2IV(k->check));
-  sv_magicext(key, check, PERL_MAGIC_ext, NULL, k->ud, 0);
-  SvREFCNT_dec(check);
- }
+ ex_list = cUNOPo->op_first;
+ /* pushmark when a method call */
+ if (!ex_list || ex_list->op_type != OP_NULL)
+  goto skip;
 
- {
-  dMY_CXT;
-  (void) hv_store(MY_CXT.map, k->name, k->len, key, 0);
+ rv2cv = cUNOPx(ex_list)->op_first;
+ if (!rv2cv)
+  goto skip;
+
+ while (1) {
+  OP *next = rv2cv->op_sibling;
+  if (!next)
+   break;
+  last_arg = rv2cv;
+  rv2cv    = next;
  }
-}
 
-/* --- Private helpers ----------------------------------------------------- */
+ if (!(rv2cv->op_flags & OPf_KIDS))
+  goto skip;
 
-#define SO_LINKLIST(O) ((O)->op_next ? (O)->op_next : sub_op_linklist(O))
-
-STATIC OP *sub_op_linklist(pTHX_ OP *o) {
-#define sub_op_linklist(O) sub_op_linklist(aTHX_ (O))
-    OP *first;
-
-    if (o->op_next)
-        return o->op_next;
-
-    /* establish postfix order */
-    first = cUNOPo->op_first;
-    if (first) {
-        register OP *kid;
-        o->op_next = SO_LINKLIST(first);
-        kid = first;
-        for (;;) {
-            if (kid->op_sibling) {
-                kid->op_next = SO_LINKLIST(kid->op_sibling);
-                kid = kid->op_sibling;
-            } else {
-                kid->op_next = o;
-                break;
-            }
-        }
-    }
-    else
-        o->op_next = o;
+ gvop = cUNOPx(rv2cv)->op_first;
 
-    return o->op_next;
+ if (gvop && gvop->op_type == OP_GV)
+  goto done;
+
+skip:
+ last_arg = NULL;
+ rv2cv    = NULL;
+ gvop     = NULL;
+
+done:
+ if (last_arg_p)
+  *last_arg_p = last_arg;
+ if (rv2cv_p)
+  *rv2cv_p    = rv2cv;
+
+ return gvop;
 }
 
-STATIC IV sub_op_hint(pTHX) {
-#define sub_op_hint() sub_op_hint(aTHX)
+/* --- Private helpers ----------------------------------------------------- */
+
+STATIC IV so_hint(pTHX) {
+#define so_hint() so_hint(aTHX)
  SV *hint;
 
 #if SO_HAS_PERL(5, 9, 5)
@@ -193,100 +219,142 @@ STATIC IV sub_op_hint(pTHX) {
  return (SvOK(hint) && SvIOK(hint)) ? SvIVX(hint) : 0;
 }
 
-STATIC OP *(*sub_op_old_ck_entersub)(pTHX_ OP *) = 0;
+STATIC OP *so_find_gvop(const OP *o) {
+ OP *ex_list, *last_arg, *rv2cv, *gvop;
 
-STATIC OP *sub_op_ck_entersub(pTHX_ OP *o) {
- o = CALL_FPTR(sub_op_old_ck_entersub)(aTHX_ o);
+ ex_list = cUNOPo->op_first;
+ /* pushmark when a method call */
+ if (!ex_list || ex_list->op_type != OP_NULL)
+  goto skip;
 
- if (sub_op_hint()) {
-  OP *ex_list, *rv2cv, *gvop, *last_arg = NULL;
-  GV *gv;
+ rv2cv = cUNOPx(ex_list)->op_first;
+ if (!rv2cv)
+  goto skip;
 
-  if (o->op_type != OP_ENTERSUB)
-   goto skip;
-  if (o->op_private & OPpENTERSUB_AMPER) /* hopefully \&foo */
-   goto skip;
+ while (1) {
+  OP *next = rv2cv->op_sibling;
+  if (!next)
+   break;
+  rv2cv = next;
+ }
 
-  ex_list = cUNOPo->op_first;
-  /* pushmark when a method call */
-  if (!ex_list || ex_list->op_type != OP_NULL)
-   goto skip;
+ if (!(rv2cv->op_flags & OPf_KIDS))
+  goto skip;
 
-  rv2cv = cUNOPx(ex_list)->op_first;
-  if (!rv2cv)
-   goto skip;
+ gvop = cUNOPx(rv2cv)->op_first;
+ if (gvop && gvop->op_type == OP_GV)
+  return gvop;
 
-  while (1) {
-   OP *next = rv2cv->op_sibling;
-   if (!next)
-    break;
-   last_arg = rv2cv;
-   rv2cv    = next;
-  }
+skip:
+ return NULL;
+}
+
+STATIC OP *(*so_old_ck_entersub)(pTHX_ OP *) = 0;
 
-  if (!(rv2cv->op_flags & OPf_KIDS))
+STATIC OP *so_ck_entersub(pTHX_ OP *o) {
+ o = CALL_FPTR(so_old_ck_entersub)(aTHX_ o);
+
+ if (so_hint()) {
+  OP *gvop;
+  GV *gv;
+
+  if (o->op_type != OP_ENTERSUB)
+   goto skip;
+  if (o->op_private & OPpENTERSUB_AMPER) /* hopefully \&foo */
    goto skip;
 
-  gvop = cUNOPx(rv2cv)->op_first;
-  if (!gvop || gvop->op_type != OP_GV)
+  gvop = so_find_gvop(o);
+  if (!gvop)
    goto skip;
 
   gv = cGVOPx_gv(gvop);
 
   {
-   HV *stash = GvSTASH(gv);
-   SV *pp_sv, **svp;
-   CV *cv = NULL;
+   SV **svp;
+   CV  *cv = NULL;
    const char *name = GvNAME(gv);
    I32         len  = GvNAMELEN(gv);
+   const sub_op_config_t *c;
    dMY_CXT;
 
    svp = hv_fetch(MY_CXT.map, name, len, 0);
    if (!svp)
     goto skip;
 
-   pp_sv = *svp;
-   if (!pp_sv || !SvOK(pp_sv))
-    goto skip;
+   c = INT2PTR(const sub_op_config_t *, SvIVX(*svp));
 
    if (gv && SvTYPE(gv) >= SVt_PVGV && (cv = GvCV(gv)) == MY_CXT.placeholder) {
     SvREFCNT_dec(cv);
     GvCV(gv) = NULL;
-    if (!GvSV(gv) && !GvAV(gv) && !GvHV(gv) && !GvIO(gv) && !GvFORM(gv)) {
-     (void) hv_delete(stash, name, len, G_DISCARD);
-    }
    }
 
-   o->op_type   = OP_CUSTOM;
-   o->op_ppaddr = INT2PTR(Perl_ppaddr_t, SvIVX(pp_sv));
+   if (c->call)
+    o = CALL_FPTR(c->call)(aTHX_ o, c->ud);
+  }
+ }
+
+skip:
+ return o;
+}
 
-   if (last_arg)
-    last_arg->op_sibling = NULL;
+STATIC OP *(*so_old_ck_refgen)(pTHX_ OP *) = 0;
 
-   op_free(rv2cv);
+STATIC OP *so_ck_refgen(pTHX_ OP *o) {
+ o = CALL_FPTR(so_old_ck_refgen)(aTHX_ o);
 
-   {
-    MAGIC *mg = mg_find(pp_sv, PERL_MAGIC_ext);
-    if (mg) {
-     sub_op_check_t check = INT2PTR(sub_op_check_t, SvIVX(mg->mg_obj));
-     o = CALL_FPTR(check)(aTHX_ o, mg->mg_ptr);
-    }
-   }
+ if (so_hint()) {
+  OP *kid    = o;
+  OP *prev   = NULL;
+  OP *parent = NULL;
+
+  while (kid->op_flags & OPf_KIDS) {
+   parent = kid;
+   kid    = cUNOPx(kid)->op_first;
+  }
+
+  if (!parent)
+   goto skip;
 
-   sub_op_linklist(o);
+  for (kid; kid; prev = kid, kid = kid->op_sibling) {
+   OP *gvop;
+   GV *gv;
+   const sub_op_config_t *c;
+
+   if (kid->op_type != OP_RV2CV)
+    continue;
+
+   gvop = so_find_gvop(kid);
+   if (!gvop)
+    continue;
+
+   gv = cGVOPx_gv(gvop);
 
    {
-    sub_op_name_t *on = PerlMemShared_malloc(sizeof(*on) + len);
-    Copy(name, &on->buf, len, char);
-    (&on->buf)[len] = '\0';
-    on->len = len;
-#ifdef USE_ITHREADS
-    MUTEX_LOCK(&sub_op_name_mutex);
-#endif /* USE_ITHREADS */
-    ptable_store(sub_op_name, o, on);
-#ifdef USE_ITHREADS
-    MUTEX_UNLOCK(&sub_op_name_mutex);
-#endif /* USE_ITHREADS */
+    SV **svp;
+    const char *name = GvNAME(gv);
+    I32         len  = GvNAMELEN(gv);
+    dMY_CXT;
+
+    svp = hv_fetch(MY_CXT.map, name, len, 0);
+    if (!svp)
+     continue;
+
+    c = INT2PTR(const sub_op_config_t *, SvIVX(*svp));
+   }
+
+   if (c->ref) {
+    OP *new_kid = CALL_FPTR(c->ref)(aTHX_ kid, c->ud);
+
+    if (new_kid != kid) {
+     new_kid->op_sibling = kid->op_sibling;
+     new_kid->op_next = new_kid;
+     if (prev)
+      prev->op_sibling = new_kid;
+     else
+      cUNOPx(parent)->op_first = new_kid;
+     op_null(kid);
+     kid = new_kid;
+    }
    }
   }
  }
@@ -295,12 +363,12 @@ skip:
  return o;
 }
 
-STATIC OP *(*sub_op_old_ck_gelem)(pTHX_ OP *) = 0;
+STATIC OP *(*so_old_ck_gelem)(pTHX_ OP *) = 0;
 
-STATIC OP *sub_op_ck_gelem(pTHX_ OP *o) {
- o = CALL_FPTR(sub_op_old_ck_entersub)(aTHX_ o);
+STATIC OP *so_ck_gelem(pTHX_ OP *o) {
+ o = CALL_FPTR(so_old_ck_entersub)(aTHX_ o);
 
- if (sub_op_hint()) {
+ if (so_hint()) {
   OP *rv2gv, *gvop;
   GV *gv;
 
@@ -323,9 +391,6 @@ STATIC OP *sub_op_ck_gelem(pTHX_ OP *o) {
    if (gv && SvTYPE(gv) >= SVt_PVGV && (cv = GvCV(gv)) == MY_CXT.placeholder) {
     SvREFCNT_dec(cv);
     GvCV(gv) = NULL;
-    if (!GvSV(gv) && !GvAV(gv) && !GvHV(gv) && !GvIO(gv) && !GvFORM(gv)) {
-     (void)hv_delete(GvSTASH(gv), GvNAME_get(gv), GvNAMELEN_get(gv), G_DISCARD);
-    }
    }
   }
  }
@@ -342,24 +407,19 @@ PROTOTYPES: ENABLE
 
 BOOT:
 {
- sub_op_name = ptable_new();
-#ifdef USE_ITHREADS
- MUTEX_INIT(&sub_op_name_mutex);
-#endif
-
  MY_CXT_INIT;
  MY_CXT.map         = newHV();
- MY_CXT.next_pkg    = newAV();
- MY_CXT.next_name   = newAV();
  MY_CXT.placeholder = NULL;
 #if SO_THREADSAFE
  MY_CXT.owner       = aTHX;
 #endif /* SO_THREADSAFE */
 
- sub_op_old_ck_entersub = PL_check[OP_ENTERSUB];
- PL_check[OP_ENTERSUB]  = sub_op_ck_entersub;
- sub_op_old_ck_gelem    = PL_check[OP_GELEM];
- PL_check[OP_GELEM]     = sub_op_ck_gelem;
+ so_old_ck_entersub    = PL_check[OP_ENTERSUB];
+ PL_check[OP_ENTERSUB] = so_ck_entersub;
+ so_old_ck_refgen      = PL_check[OP_REFGEN];
+ PL_check[OP_REFGEN]   = so_ck_refgen;
+ so_old_ck_gelem       = PL_check[OP_GELEM];
+ PL_check[OP_GELEM]    = so_ck_gelem;
 }
 
 #if SO_THREADSAFE
@@ -371,7 +431,7 @@ PREINIT:
  HV  *map;
  CV  *placeholder;
  tTHX owner;
-CODE:
+PPCODE:
  {
   dMY_CXT;
   owner       = MY_CXT.owner;
@@ -381,11 +441,10 @@ CODE:
  {
   MY_CXT_CLONE;
   MY_CXT.map         = map;
-  MY_CXT.next_pkg    = newAV();
-  MY_CXT.next_name   = newAV();
   MY_CXT.placeholder = placeholder;
   MY_CXT.owner       = aTHX;
  }
+ XSRETURN(0);
 
 #endif /* SO_THREADSAFE */
 
@@ -404,25 +463,30 @@ PPCODE:
  XSRETURN(0);
 
 void
-_custom_name(SV *op)
+_constant_sub(SV *sv)
 PROTOTYPE: $
-PREINIT:
- OP *o;
- sub_op_name_t *on;
 PPCODE:
- if (!SvROK(op))
+ if (!SvROK(sv))
+  XSRETURN_UNDEF;
+ sv = SvRV(sv);
+ if (SvTYPE(sv) < SVt_PVCV)
   XSRETURN_UNDEF;
- o = INT2PTR(OP *, SvIV(SvRV(op)));
- if (!o || o->op_type != OP_CUSTOM)
+ ST(0) = sv_2mortal(newSVuv(CvCONST(sv)));
+ XSRETURN(1);
+
+SV *
+_get_prototype(SV *name)
+PROTOTYPE: $
+PREINIT:
+ HE *he;
+ const sub_op_config_t *c;
+PPCODE:
+ dMY_CXT;
+ he = hv_fetch_ent(MY_CXT.map, name, 0, 0);
+ if (!he)
   XSRETURN_UNDEF;
-#ifdef USE_ITHREADS
- MUTEX_LOCK(&sub_op_name_mutex);
-#endif /* USE_ITHREADS */
- on = ptable_fetch(sub_op_name, o);
-#ifdef USE_ITHREADS
- MUTEX_UNLOCK(&sub_op_name_mutex);
-#endif /* USE_ITHREADS */
- if (!on)
+ c = INT2PTR(const sub_op_config_t *, SvIVX(HeVAL(he)));
+ if (!c->proto)
   XSRETURN_UNDEF;
- ST(0) = sv_2mortal(newSVpvn(&on->buf, on->len));
+ ST(0) = sv_2mortal(newSVpvn(c->proto, c->protolen));
  XSRETURN(1);