X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Op.xs;h=634ddc873f87e8297bf1dc030b9b1a32ba3730ed;hb=e87c30401d00a01f0b92de32fc9a71b25ad8b57f;hp=bc85f7f921a4cf43c7af85f2e264bbb55c675f8d;hpb=6a7b5fad65453cfc8742554cef515b1d7c84443a;p=perl%2Fmodules%2FSub-Op.git

diff --git a/Op.xs b/Op.xs
index bc85f7f..634ddc8 100644
--- a/Op.xs
+++ b/Op.xs
@@ -118,11 +118,11 @@ void sub_op_register(pTHX_ const sub_op_config_t *c) {
 
  if (!PL_custom_op_names)
   PL_custom_op_names = newHV();
- (void) hv_store_ent(PL_custom_op_names, key, newSVpv(c->name, c->len), 0);
+ (void) hv_store_ent(PL_custom_op_names, key, newSVpv(c->name, c->namelen), 0);
 
  if (!PL_custom_op_descs)
   PL_custom_op_descs = newHV();
- (void) hv_store_ent(PL_custom_op_descs, key, newSVpv(c->name, c->len), 0);
+ (void) hv_store_ent(PL_custom_op_descs, key, newSVpv(c->name, c->namelen), 0);
 
  if (c->check) {
   SV *check = newSViv(PTR2IV(c->check));
@@ -132,7 +132,7 @@ void sub_op_register(pTHX_ const sub_op_config_t *c) {
 
  {
   dMY_CXT;
-  (void) hv_store(MY_CXT.map, c->name, c->len, key, 0);
+  (void) hv_store(MY_CXT.map, c->name, c->namelen, key, 0);
  }
 }
 
@@ -201,7 +201,6 @@ STATIC OP *so_ck_entersub(pTHX_ OP *o) {
   gv = cGVOPx_gv(gvop);
 
   {
-   HV *stash = GvSTASH(gv);
    SV *pp_sv, **svp;
    CV *cv = NULL;
    const char *name = GvNAME(gv);
@@ -219,9 +218,6 @@ STATIC OP *so_ck_entersub(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(stash, name, len, G_DISCARD);
-    }
    }
 
    o->op_type   = OP_CUSTOM;
@@ -288,9 +284,6 @@ STATIC OP *so_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);
-    }
    }
   }
  }
@@ -334,7 +327,7 @@ PREINIT:
  HV  *map;
  CV  *placeholder;
  tTHX owner;
-CODE:
+PPCODE:
  {
   dMY_CXT;
   owner       = MY_CXT.owner;
@@ -347,6 +340,7 @@ CODE:
   MY_CXT.placeholder = placeholder;
   MY_CXT.owner       = aTHX;
  }
+ XSRETURN(0);
 
 #endif /* SO_THREADSAFE */
 
@@ -387,3 +381,15 @@ PPCODE:
   XSRETURN_UNDEF;
  ST(0) = sv_2mortal(newSVpvn(&on->buf, on->len));
  XSRETURN(1);
+
+void
+_constant_sub(SV *sv)
+PROTOTYPE: $
+PPCODE:
+ if (!SvROK(sv))
+  XSRETURN_UNDEF;
+ sv = SvRV(sv);
+ if (SvTYPE(sv) < SVt_PVCV)
+  XSRETURN_UNDEF;
+ ST(0) = sv_2mortal(newSVuv(CvCONST(sv)));
+ XSRETURN(1);