Add support and tests for package variables

diff --git a/indirect.xs b/indirect.xs
index 5ec4e03e786b56147f88792b0ce23041d7593c8b..5b012683f3deec681f399ac4636aa7c98ceae6b3 100644 (file)
--- 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;
@@ -165,13 +169,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);
 }
 

diff --git a/t/20-bad.t b/t/20-bad.t
index 226a2fccb258dd3fb8938324fa586804dd6a02cd..57df08fb0d5aad6acec2ed8ff9a103ab43948a1f 100644 (file)
--- a/t/20-bad.t
+++ b/t/20-bad.t
@@ -9,9 +9,10 @@ package main;
 use strict;
 use warnings;
 
-use Test::More tests => 36 * 4 + 2;
+use Test::More tests => 44 * 4 + 2;
 
 my ($obj, $x);
+our ($y, $bloop);
 
 {
  local $/ = "####\n";
@@ -27,7 +28,7 @@ my ($obj, $x);
    no indirect;
    eval "die qq{the code compiled but it shouldn't have\n}; $_";
   }
-  like($@, qr/^warn:Indirect\s+call\s+of\s+method\s+"(?:new|meh|HlaghHlagh)"\s+on\s+object\s+"(?:Hlagh|newnew|\$x|\$_)"/, "no indirect: $_");
+  like($@, qr/^warn:Indirect\s+call\s+of\s+method\s+"(?:new|meh|HlaghHlagh)"\s+on\s+object\s+"(?:Hlagh|newnew|\$[xy_]|\$(?:sploosh::)?sploosh|\$(?:main::)?bloop)"/, "no indirect: $_");
   s/Hlagh/Dongs/g;
   {
    use indirect;
@@ -38,7 +39,7 @@ my ($obj, $x);
    no indirect;
    eval "die qq{the code compiled but it shouldn't have\n}; $_";
   }
-  like($@, qr/^warn:Indirect\s+call\s+of\s+method\s+"(?:new|meh|DongsDongs)"\s+on\s+object\s+"(?:Dongs|newnew|\$x|\$_)"/, "no indirect, defined: $_");
+  like($@, qr/^warn:Indirect\s+call\s+of\s+method\s+"(?:new|meh|DongsDongs)"\s+on\s+object\s+"(?:Dongs|newnew|\$[xy_]|\$(?:sploosh::)?sploosh|\$(?:main::)?bloop)"/, "no indirect, defined: $_");
  }
 }
 
@@ -120,6 +121,31 @@ meh $x 1, 2;
 ####
 meh $x, 1, 2;
 ####
+meh $y;
+####
+meh $y 1, 2;
+####
+meh $y, 1, 2;
+####
+package sploosh;
+our $sploosh;
+meh $sploosh::sploosh;
+####
+package sploosh;
+our $sploosh;
+meh $sploosh;
+####
+package sploosh;
+meh $main::bloop;
+####
+package sploosh;
+meh $bloop;
+####
+package sploosh;
+our $sploosh;
+package main;
+meh $sploosh::sploosh;
+####
 new Hlagh->wut;
 ####
 new Hlagh->wut();