X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=indirect.xs;h=85741a83de37d18e6bfec577bbf577737627e75b;hb=f5b9489370626c0c6c8becbdafa6c0ef5d6f0899;hp=c8ca38f3b548fd0c881bcf56289b2dde4aecf92b;hpb=443a0a4c9ac49515e3046f161d909ad4eb4aadfb;p=perl%2Fmodules%2Findirect.git

diff --git a/indirect.xs b/indirect.xs
index c8ca38f..85741a8 100644
--- a/indirect.xs
+++ b/indirect.xs
@@ -95,7 +95,6 @@ STATIC const char *indirect_linestr = NULL;
 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))
  OP2STR_BUF;
- const char *pl_linestr;
  SV *val;
 
  /* When lex_inwhat is set, we're in a quotelike environment (qq, qr, but not q)
@@ -103,7 +102,7 @@ STATIC void indirect_map_store(pTHX_ const OP *o, const char *src, SV *sv) {
   * still be alive somewhere. */
 
  if (!PL_lex_inwhat) {
-  pl_linestr = SvPVX_const(PL_linestr);
+  const char *pl_linestr = SvPVX_const(PL_linestr);
   if (indirect_linestr != pl_linestr) {
    hv_clear(indirect_map);
    indirect_linestr = pl_linestr;
@@ -321,37 +320,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;
+
+  mpos = indirect_map_fetch(mop, &mnamesv);
+  if (!mpos)
    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);
+
+  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);
  }