X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=indirect.xs;h=2c1f089cb7b2802bcf56ff8a9a82b56386379455;hp=e8250f14934373f601fb0c2069fa03b16f0e4968;hb=a21a68b2f726d4002d20fb64677a52f72c520964;hpb=243292e1cc67ea36d0b7b5ca4b727ddf86e57a51

diff --git a/indirect.xs b/indirect.xs
index e8250f1..2c1f089 100644
--- a/indirect.xs
+++ b/indirect.xs
@@ -18,41 +18,102 @@
 # define SvPVX_const SvPVX
 #endif
 
+#ifndef sv_catpvn_nomg
+# define sv_catpvn_nomg sv_catpvn
+#endif
+
+#ifndef HvNAME_get
+# define HvNAME_get(H) HvNAME(H)
+#endif
+
+#ifndef HvNAMELEN_get
+# define HvNAMELEN_get(H) strlen(HvNAME_get(H))
+#endif
+
+#define I_HAS_PERL(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S))))))
+
+#if I_HAS_PERL(5, 10, 0) || defined(PL_parser)
+# ifndef PL_lex_inwhat
+#  define PL_lex_inwhat PL_parser->lex_inwhat
+# endif
+# ifndef PL_linestr
+#  define PL_linestr PL_parser->linestr
+# endif
+# ifndef PL_bufptr
+#  define PL_bufptr PL_parser->bufptr
+# endif
+# ifndef PL_oldbufptr
+#  define PL_oldbufptr PL_parser->oldbufptr
+# endif
+#else
+# ifndef PL_lex_inwhat
+#  define PL_lex_inwhat PL_Ilex_inwhat
+# endif
+# ifndef PL_linestr
+#  define PL_linestr PL_Ilinestr
+# endif
+# ifndef PL_bufptr
+#  define PL_bufptr PL_Ibufptr
+# endif
+# ifndef PL_oldbufptr
+#  define PL_oldbufptr PL_Ioldbufptr
+# endif
+#endif
+
 /* ... Hints ............................................................... */
 
 STATIC U32 indirect_hash = 0;
 
 STATIC IV indirect_hint(pTHX) {
 #define indirect_hint() indirect_hint(aTHX)
- SV *id = Perl_refcounted_he_fetch(aTHX_ PL_curcop->cop_hints_hash,
-                                         NULL,
-                                         "indirect", 8,
-                                         0,
-                                         indirect_hash);
+ SV *id;
+#if I_HAS_PERL(5, 10, 0)
+ id = Perl_refcounted_he_fetch(aTHX_ PL_curcop->cop_hints_hash,
+                                     NULL,
+                                     "indirect", 8,
+                                     0,
+                                     indirect_hash);
+#else
+ SV **val = hv_fetch(GvHV(PL_hintgv), "indirect", 8, indirect_hash);
+ if (!val)
+  return 0;
+ id = *val;
+#endif
  return (id && SvOK(id) && SvIOK(id)) ? SvIV(id) : 0;
 }
 
 /* ... op -> source position ............................................... */
 
-STATIC HV *indirect_map = NULL;
-STATIC const char *indirect_linestr = NULL;
+#define PTABLE_NAME        ptable_map
+#define PTABLE_VAL_FREE(V) SvREFCNT_dec(V)
+
+#define pPTBL  pTHX
+#define pPTBL_ pTHX_
+#define aPTBL  aTHX
+#define aPTBL_ aTHX_
+
+#include "ptable.h"
 
-#define OP2STR(O) (sprintf(buf, "%u", PTR2UV(o)))
+#define ptable_map_store(T, K, V) ptable_map_store(aTHX_ (T), (K), (V))
+#define ptable_map_clear(T)       ptable_map_clear(aTHX_ (T))
+#define ptable_map_free(T)        ptable_map_free(aTHX_ (T))
+
+STATIC ptable *indirect_map = NULL;
+
+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))
- char buf[32];
- const char *pl_linestr;
  SV *val;
 
  /* When lex_inwhat is set, we're in a quotelike environment (qq, qr, but not q)
   * In this case the linestr has temporarly changed, but the old buffer should
   * still be alive somewhere. */
 
- if (!PL_parser->lex_inwhat) {
-  pl_linestr = SvPVX_const(PL_parser->linestr);
+ if (!PL_lex_inwhat) {
+  const char *pl_linestr = SvPVX_const(PL_linestr);
   if (indirect_linestr != pl_linestr) {
-   hv_clear(indirect_map);
+   ptable_map_clear(indirect_map);
    indirect_linestr = pl_linestr;
   }
  }
@@ -62,47 +123,25 @@ STATIC void indirect_map_store(pTHX_ const OP *o, const char *src, SV *sv) {
  SvUVX(val) = PTR2UV(src);
  SvIOK_on(val);
  SvIsUV_on(val);
- if (!hv_store(indirect_map, buf, OP2STR(o), val, 0))
-  SvREFCNT_dec(val);
+
+ ptable_map_store(indirect_map, o, val);
 }
 
 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];
- SV **val;
+ SV *val;
 
- if (indirect_linestr != SvPVX_const(PL_parser->linestr))
+ if (indirect_linestr != SvPVX_const(PL_linestr))
   return NULL;
 
- val = hv_fetch(indirect_map, buf, OP2STR(o), 0);
+ val = ptable_fetch(indirect_map, o);
  if (!val) {
   *name = NULL;
   return NULL;
  }
 
- *name = *val;
- return INT2PTR(const char *, SvUVX(*val));
-}
-
-STATIC void indirect_map_delete(pTHX_ const OP *o) {
-#define indirect_map_delete(O) indirect_map_delete(aTHX_ (O))
- char buf[32];
- SV *val;
-
- 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))
- if (o->op_flags & OPf_KIDS) {
-  const OP *kid = cUNOPo->op_first;
-  for (; kid; kid = kid->op_sibling) {
-   indirect_map_delete(kid);
-   indirect_map_clean(kid);
-  }
- } else {
-  indirect_map_delete(o);
- }
+ *name = val;
+ return INT2PTR(const char *, SvUVX(val));
 }
 
 STATIC const char *indirect_find(pTHX_ SV *sv, const char *s) {
@@ -110,8 +149,13 @@ STATIC const char *indirect_find(pTHX_ SV *sv, const char *s) {
  STRLEN len;
  const char *p = NULL, *r = SvPV_const(sv, len);
 
- if (!len)
-  return s;
+ if (len >= 1 && *r == '$') {
+  ++r;
+  --len;
+  s = strchr(s, '$');
+  if (!s)
+   return NULL;
+ }
 
  p = strstr(s, r);
  while (p) {
@@ -134,7 +178,7 @@ STATIC OP *indirect_ck_const(pTHX_ OP *o) {
  if (indirect_hint()) {
   SV *sv = cSVOPo_sv;
   if (SvPOK(sv) && (SvTYPE(sv) >= SVt_PV))
-   indirect_map_store(o, indirect_find(sv, PL_parser->oldbufptr), sv);
+   indirect_map_store(o, indirect_find(sv, PL_oldbufptr), sv);
  }
 
  return o;
@@ -147,16 +191,60 @@ STATIC OP *(*indirect_old_ck_rv2sv)(pTHX_ OP *) = 0;
 STATIC OP *indirect_ck_rv2sv(pTHX_ OP *o) {
  if (indirect_hint()) {
   OP *op = cUNOPo->op_first;
-  SV *name = cSVOPx_sv(op);
-  if (SvPOK(name) && (SvTYPE(name) >= SVt_PV)) {
-   SV *sv = sv_2mortal(newSVpvn("$", 1));
-   sv_catsv(sv, name);
-   o = CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o);
-   indirect_map_store(o, indirect_find(sv, PL_parser->oldbufptr), sv);
-   return o;
+  SV *sv;
+  const char *name = NULL, *s;
+  STRLEN len;
+  OPCODE type = (OPCODE) op->op_type;
+
+  switch (type) {
+   case OP_GV:
+   case OP_GVSV: {
+    GV *gv = cGVOPx_gv(op);
+    name = GvNAME(gv);
+    len  = GvNAMELEN(gv);
+    break;
+   }
+   default:
+    if ((PL_opargs[type] & OA_CLASS_MASK) == OA_SVOP) {
+     SV *nsv = cSVOPx_sv(op);
+     if (SvPOK(nsv) && (SvTYPE(nsv) >= SVt_PV))
+      name = SvPV_const(nsv, len);
+    }
+  }
+  if (!name)
+   goto done;
+
+  sv = sv_2mortal(newSVpvn("$", 1));
+  sv_catpvn_nomg(sv, name, len);
+  s = indirect_find(sv, PL_oldbufptr);
+  if (!s) { /* If it failed, retry without the current stash */
+   const char *stash = HvNAME_get(PL_curstash);
+   STRLEN stashlen = HvNAMELEN_get(PL_curstash);
+
+   if ((len < stashlen + 2) || strnNE(name, stash, stashlen)
+       || name[stashlen] != ':' || name[stashlen+1] != ':') {
+    /* Failed again ? Try to remove main */
+    stash = "main";
+    stashlen = 4;
+    if ((len < stashlen + 2) || strnNE(name, stash, stashlen)
+        || name[stashlen] != ':' || name[stashlen+1] != ':')
+     goto done;
+   }
+
+   sv_setpvn(sv, "$", 1);
+   stashlen += 2;
+   sv_catpvn_nomg(sv, name + stashlen, len - stashlen);
+   s = indirect_find(sv, PL_oldbufptr);
+   if (!s)
+    goto done;
   }
+
+  o = CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o);
+  indirect_map_store(o, s, sv);
+  return o;
  }
 
+done:
  return CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o);
 }
 
@@ -169,13 +257,16 @@ STATIC OP *indirect_ck_padany(pTHX_ OP *o) {
 
  if (indirect_hint()) {
   SV *sv;
-  const char *s = PL_parser->oldbufptr, *t = PL_parser->bufptr - 1;
+  const char *s = PL_oldbufptr, *t = PL_bufptr - 1;
 
   while (s < t && isSPACE(*s)) ++s;
-  while (t > s && isSPACE(*t)) --t;
-  sv = sv_2mortal(newSVpvn(s, t - s + 1));
-
-  indirect_map_store(o, s, sv);
+  if (*s == '$' && ++s <= t) {
+   while (s < t && isSPACE(*s)) ++s;
+   while (s < t && isSPACE(*t)) --t;
+   sv = sv_2mortal(newSVpvn("$", 1));
+   sv_catpvn_nomg(sv, s, t - s + 1);
+   indirect_map_store(o, s, sv);
+  }
  }
 
  return o;
@@ -195,7 +286,7 @@ STATIC OP *indirect_ck_method(pTHX_ OP *o) {
    if (!SvPOK(sv) || (SvTYPE(sv) < SVt_PV))
     goto done;
    sv = sv_mortalcopy(sv);
-   s  = indirect_find(sv, PL_parser->oldbufptr);
+   s  = indirect_find(sv, PL_oldbufptr);
   }
   o = CALL_FPTR(indirect_old_ck_method)(aTHX_ o);
   /* o may now be a method_named */
@@ -214,41 +305,50 @@ 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);
  }
 
+done:
  return o;
 }
 
@@ -264,7 +364,7 @@ BOOT:
 {
  if (!indirect_initialized++) {
   PERL_HASH(indirect_hash, "indirect", 8);
-  indirect_map = newHV();
+  indirect_map = ptable_new();
   indirect_old_ck_const    = PL_check[OP_CONST];
   PL_check[OP_CONST]       = MEMBER_TO_FPTR(indirect_ck_const);
   indirect_old_ck_rv2sv    = PL_check[OP_RV2SV];