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

diff --git a/indirect.xs b/indirect.xs
index e8250f1..5b01268 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;
@@ -87,7 +91,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);
 }
@@ -147,16 +150,54 @@ 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)) {
+  const char *name = NULL;
+  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) {
    SV *sv = sv_2mortal(newSVpvn("$", 1));
-   sv_catsv(sv, name);
+   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);
 }