padmy names may begin with a non-alnum. I think

[perl/modules/indirect.git] / indirect.xs

diff --git a/indirect.xs b/indirect.xs
index b7857c3a438c297db6ae2f360922c50cf45c395b..e144b02a4febf353155eefc2f432ba7734c5cf4d 100644 (file)
--- a/indirect.xs
+++ b/indirect.xs
@@ -112,6 +112,14 @@ STATIC const char *indirect_find(pTHX_ SV *sv, const char *s) {
  STRLEN len;
  const char *p = NULL, *r = SvPV_const(sv, len);
 
+ if (len >= 1 && *r == '$') {
+  ++r;
+  --len;
+  s = strchr(s, '$');
+  if (!s)
+   return NULL;
+ }
+
  p = strstr(s, r);
  while (p) {
   p += len;
@@ -146,8 +154,10 @@ 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;
-  const char *name = NULL;
+  SV *sv;
+  const char *name = NULL, *s;
   STRLEN len;
+
   switch (op->op_type) {
    case OP_GV:
    case OP_GVSV: {
@@ -163,34 +173,37 @@ STATIC OP *indirect_ck_rv2sv(pTHX_ OP *o) {
     break;
    }
   }
-  if (name) {
-   SV *sv = sv_2mortal(newSVpvn("$", 1));
-   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)
+  if (!name)
+   goto done;
+
+  sv = sv_2mortal(newSVpvn("$", 1));
+  sv_catpvn_nomg(sv, name, len);
+  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;
    }
-   o = CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o);
-   indirect_map_store(o, s, sv);
-   return o;
+   if (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_parser->oldbufptr);
+   if (!s)
+    goto done;
   }
+
+  o = CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o);
+  indirect_map_store(o, s, sv);
+  return o;
  }
 
 done:
@@ -209,10 +222,13 @@ STATIC OP *indirect_ck_padany(pTHX_ OP *o) {
   const char *s = PL_parser->oldbufptr, *t = PL_parser->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;