X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=indirect.xs;h=b7857c3a438c297db6ae2f360922c50cf45c395b;hb=34244fc361780dc3c2e189834b20ecf4dced6178;hp=5ec4e03e786b56147f88792b0ce23041d7593c8b;hpb=cf93cbf9ffecce3a44dad3b7e89d79bf2933e19e;p=perl%2Fmodules%2Findirect.git

diff --git a/indirect.xs b/indirect.xs
index 5ec4e03..b7857c3 100644
--- a/indirect.xs
+++ b/indirect.xs
@@ -18,6 +18,10 @@
 # define SvPVX_const SvPVX
 #endif
 
+#ifndef sv_catpvn_nomg
+# define sv_catpvn_nomg sv_catpvn
+#endif
+
 /* ... Hints ............................................................... */
 
 STATIC U32 indirect_hash = 0;
@@ -62,8 +66,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) {
@@ -109,9 +112,6 @@ 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;
-
  p = strstr(s, r);
  while (p) {
   p += len;
@@ -165,13 +165,35 @@ STATIC OP *indirect_ck_rv2sv(pTHX_ OP *o) {
   }
   if (name) {
    SV *sv = sv_2mortal(newSVpvn("$", 1));
-   sv_catpvn(sv, name, len);
+   sv_catpvn_nomg(sv, name, len);
+   const char *s;
+   s = indirect_find(sv, PL_parser->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) || name != strstr(name, stash)) {
+     /* Failed again ? Try to remove main */
+     stash = "main";
+     stashlen = 4;
+     if ((len < stashlen + 2) || name != strstr(name, stash))
+      goto done;
+    }
+    sv_setpvn(sv, "$", 1);
+    if (name[stashlen] != ':' || name[stashlen+1] != ':')
+     goto done;
+    stashlen += 2;
+    sv_catpvn_nomg(sv, name + stashlen, len - stashlen);
+    s = indirect_find(sv, PL_parser->oldbufptr);
+    if (!s)
+     goto done;
+   }
    o = CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o);
-   indirect_map_store(o, indirect_find(sv, PL_parser->oldbufptr), sv);
+   indirect_map_store(o, s, sv);
    return o;
   }
  }
 
+done:
  return CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o);
 }