X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=indirect.xs;h=9acddcdf88b7cc94aea523668fcb05f7291a7aff;hb=fdc979b79c21fcaa1fdd8e9a465756510ed26e88;hp=ad4a23f4837d288243c6056146d3b75b61abcfb7;hpb=73065691a24f100af6f7fd8055ccca40772f42b2;p=perl%2Fmodules%2Findirect.git

diff --git a/indirect.xs b/indirect.xs
index ad4a23f..9acddcd 100644
--- a/indirect.xs
+++ b/indirect.xs
@@ -140,19 +140,23 @@ STATIC void indirect_map_delete(pTHX_ const OP *o) {
  hv_delete(indirect_map, buf, OP2STR(o), G_DISCARD);
 }
 
-STATIC void indirect_map_clean(pTHX_ const OP *o) {
-#define indirect_map_clean(O) indirect_map_clean(aTHX_ (O))
+STATIC void indirect_map_clean_kids(pTHX_ const OP *o) {
+#define indirect_map_clean_kids(O) indirect_map_clean_kids(aTHX_ (O))
  if (o->op_flags & OPf_KIDS) {
   const OP *kid = cUNOPo->op_first;
   for (; kid; kid = kid->op_sibling) {
+   indirect_map_clean_kids(kid);
    indirect_map_delete(kid);
-   indirect_map_clean(kid);
   }
- } else {
-  indirect_map_delete(o);
  }
 }
 
+STATIC void indirect_map_clean(pTHX_ const OP *o) {
+#define indirect_map_clean(O) indirect_map_clean(aTHX_ (O))
+ indirect_map_clean_kids(o);
+ indirect_map_delete(o);
+}
+
 STATIC const char *indirect_find(pTHX_ SV *sv, const char *s) {
 #define indirect_find(N, S) indirect_find(aTHX_ (N), (S))
  STRLEN len;
@@ -203,8 +207,9 @@ STATIC OP *indirect_ck_rv2sv(pTHX_ OP *o) {
   SV *sv;
   const char *name = NULL, *s;
   STRLEN len;
+  OPCODE type = op->op_type;
 
-  switch (op->op_type) {
+  switch (type) {
    case OP_GV:
    case OP_GVSV: {
     GV *gv = cGVOPx_gv(op);
@@ -212,12 +217,12 @@ STATIC OP *indirect_ck_rv2sv(pTHX_ OP *o) {
     len  = GvNAMELEN(gv);
     break;
    }
-   default: {
-    SV *sv = cSVOPx_sv(op);
-    if (SvPOK(sv) && (SvTYPE(sv) >= SVt_PV))
-     name = SvPV_const(sv, len);
-    break;
-   }
+   default:
+    if ((PL_opargs[type] & OA_CLASS_MASK) == OA_SVOP) {
+     SV *sv = cSVOPx_sv(op);
+     if (SvPOK(sv) && (SvTYPE(sv) >= SVt_PV))
+      name = SvPV_const(sv, len);
+    }
   }
   if (!name)
    goto done;