X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=indirect.xs;h=ad4a23f4837d288243c6056146d3b75b61abcfb7;hp=cd118b1e45dc4b1921ac14057eb403aa731bf89a;hb=d8064d5f5037d23c51e6e62386f32e65cef50d33;hpb=8e33a0159329bb82e048058ea048ab005ea322fe

diff --git a/indirect.xs b/indirect.xs
index cd118b1..ad4a23f 100644
--- a/indirect.xs
+++ b/indirect.xs
@@ -18,17 +18,67 @@
 # 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;
 }
 
@@ -49,8 +99,8 @@ STATIC void indirect_map_store(pTHX_ const OP *o, const char *src, SV *sv) {
   * 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) {
+  pl_linestr = SvPVX_const(PL_linestr);
   if (indirect_linestr != pl_linestr) {
    hv_clear(indirect_map);
    indirect_linestr = pl_linestr;
@@ -62,8 +112,7 @@ 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);
+ if (!hv_store(indirect_map, buf, OP2STR(o), val, 0)) SvREFCNT_dec(val);
 }
 
 STATIC const char *indirect_map_fetch(pTHX_ const OP *o, SV ** const name) {
@@ -71,7 +120,7 @@ STATIC const char *indirect_map_fetch(pTHX_ const OP *o, SV ** const name) {
  char buf[32];
  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);
@@ -87,7 +136,6 @@ 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];
- SV *val;
 
  hv_delete(indirect_map, buf, OP2STR(o), G_DISCARD);
 }
@@ -110,8 +158,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 +187,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,14 +200,59 @@ 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);
-   indirect_map_store(o, indirect_find(sv, PL_parser->oldbufptr), sv);
+  SV *sv;
+  const char *name = NULL, *s;
+  STRLEN len;
+
+  switch (op->op_type) {
+   case OP_GV:
+   case OP_GVSV: {
+    GV *gv = cGVOPx_gv(op);
+    name = GvNAME(gv);
+    len  = GvNAMELEN(gv);
+    break;
+   }
+   default: {
+    SV *sv = cSVOPx_sv(op);
+    if (SvPOK(sv) && (SvTYPE(sv) >= SVt_PV))
+     name = SvPV_const(sv, len);
+    break;
+   }
   }
+  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);
 }
 
@@ -167,13 +265,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;
@@ -193,7 +294,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 */