X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=indirect.xs;h=2f8ab7de7e87bb461ade74f6d9431b0ce952d8df;hb=19ca5f7be6790f6520f3c37e178f9fcf7596f628;hp=c89c8b9d0080aee0aec716c668885e640674c65c;hpb=574d2ca938e5c479fbc2b24c0f306f7f55e38cc2;p=perl%2Fmodules%2Findirect.git

diff --git a/indirect.xs b/indirect.xs
index c89c8b9..2f8ab7d 100644
--- a/indirect.xs
+++ b/indirect.xs
@@ -87,11 +87,14 @@ STATIC IV indirect_hint(pTHX) {
 STATIC HV *indirect_map = NULL;
 STATIC const char *indirect_linestr = NULL;
 
-#define OP2STR(O) (sprintf(buf, "%u", PTR2UV(o)))
+/* We need (CHAR_BIT * sizeof(UV)) / 4 + 1 chars, but it's just better to take
+ * a power of two */
+#define OP2STR_BUF char buf[(CHAR_BIT * sizeof(UV)) / 2]
+#define OP2STR(O)  (sprintf(buf, "%"UVxf, PTR2UV(O)))
 
 STATIC void indirect_map_store(pTHX_ const OP *o, const char *src, SV *sv) {
 #define indirect_map_store(O, S, N) indirect_map_store(aTHX_ (O), (S), (N))
- char buf[32];
+ OP2STR_BUF;
  const char *pl_linestr;
  SV *val;
 
@@ -117,7 +120,7 @@ STATIC void indirect_map_store(pTHX_ const OP *o, const char *src, SV *sv) {
 
 STATIC const char *indirect_map_fetch(pTHX_ const OP *o, SV ** const name) {
 #define indirect_map_fetch(O, S) indirect_map_fetch(aTHX_ (O), (S))
- char buf[32];
+ OP2STR_BUF;
  SV **val;
 
  if (indirect_linestr != SvPVX_const(PL_linestr))
@@ -135,24 +138,28 @@ STATIC const char *indirect_map_fetch(pTHX_ const OP *o, SV ** const name) {
 
 STATIC void indirect_map_delete(pTHX_ const OP *o) {
 #define indirect_map_delete(O) indirect_map_delete(aTHX_ (O))
- char buf[32];
+ OP2STR_BUF;
 
- hv_delete(indirect_map, buf, OP2STR(o), G_DISCARD);
+ (void)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;
+  const OP *kid = ((const UNOP *) o)->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,7 +210,7 @@ STATIC OP *indirect_ck_rv2sv(pTHX_ OP *o) {
   SV *sv;
   const char *name = NULL, *s;
   STRLEN len;
-  OPCODE type = op->op_type;
+  OPCODE type = (OPCODE) op->op_type;
 
   switch (type) {
    case OP_GV:
@@ -215,9 +222,9 @@ STATIC OP *indirect_ck_rv2sv(pTHX_ OP *o) {
    }
    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);
+     SV *nsv = cSVOPx_sv(op);
+     if (SvPOK(nsv) && (SvTYPE(nsv) >= SVt_PV))
+      name = SvPV_const(nsv, len);
     }
   }
   if (!name)
@@ -314,37 +321,48 @@ STATIC const char indirect_msg[] = "Indirect call of method \"%s\" on object \"%
 STATIC OP *(*indirect_old_ck_entersub)(pTHX_ OP *) = 0;
 
 STATIC OP *indirect_ck_entersub(pTHX_ OP *o) {
- LISTOP *op;
- OP *om, *oo;
  IV hint = indirect_hint();
 
  o = CALL_FPTR(indirect_old_ck_entersub)(aTHX_ o);
 
  if (hint) {
-  const char *pm, *po;
-  SV *svm, *svo;
-  oo = o;
+  const char *mpos, *opos;
+  SV *mnamesv, *onamesv;
+  OP *mop, *oop;
+  LISTOP *lop;
+
+  oop = o;
   do {
-   op = (LISTOP *) oo;
-   if (!op->op_flags & OPf_KIDS)
+   lop = (LISTOP *) oop;
+   if (!(lop->op_flags & OPf_KIDS))
     goto done;
-   oo = op->op_first;
-  } while (oo->op_type != OP_PUSHMARK);
-  oo = oo->op_sibling;
-  om = op->op_last;
-  if (om->op_type == OP_METHOD)
-   om = cUNOPx(om)->op_first;
-  else if (om->op_type != OP_METHOD_NAMED)
+   oop = lop->op_first;
+  } while (oop->op_type != OP_PUSHMARK);
+  oop = oop->op_sibling;
+  mop = lop->op_last;
+
+  if (mop->op_type == OP_METHOD)
+   mop = cUNOPx(mop)->op_first;
+  else if (mop->op_type != OP_METHOD_NAMED)
    goto done;
-  pm = indirect_map_fetch(om, &svm);
-  po = indirect_map_fetch(oo, &svo);
-  if (pm && po && pm < po) {
-   const char *psvm = SvPV_nolen_const(svm), *psvo = SvPV_nolen_const(svo);
+
+  mpos = indirect_map_fetch(mop, &mnamesv);
+  if (!mpos)
+   goto done;
+
+  opos = indirect_map_fetch(oop, &onamesv);
+  if (!opos)
+   goto done;
+
+  if (mpos < opos) {
+   const char *mname = SvPV_nolen_const(mnamesv);
+   const char *oname = SvPV_nolen_const(onamesv);
    if (hint == 2)
-    croak(indirect_msg, psvm, psvo);
+    croak(indirect_msg, mname, oname);
    else
-    warn(indirect_msg, psvm, psvo);
+    warn(indirect_msg, mname, oname);
   }
+
 done:
   indirect_map_clean(o);
  }