Handle __PACKAGE__ as object name correctly

[perl/modules/indirect.git] / t / 21-bad.t

diff --git a/t/21-bad.t b/t/21-bad.t
index 09157e98c66d668630eaab0699b58f3e09fee44f..0d3b48d96a3f81abe21a73e361595fc19e387381 100644 (file)
--- a/t/21-bad.t
+++ b/t/21-bad.t
@@ -11,8 +11,8 @@ use warnings;
 
 my ($tests, $reports);
 BEGIN {
- $tests   = 70;
- $reports = 82;
+ $tests   = 84;
+ $reports = 96;
 }
 
 use Test::More tests => 3 * (4 * $tests + $reports) + 4;
@@ -31,8 +31,8 @@ sub expect {
   my ($meth, $obj, $file, $line) = @$_;
   $meth = quotemeta $meth;
   $obj  = ($obj =~ /^\s*\{/) ? "a block" : "object \"\Q$obj\E\"";
-  $file = '\(eval \d+\)' unless defined $file;
-  $line = '\d+'          unless defined $line;
+  $file = '\((?:re_)?eval \d+\)' unless defined $file;
+  $line = '\d+'                  unless defined $line;
   qr/^Indirect call of method "$meth" on $obj at $file line $line/
  } eval $expected;
 }
@@ -101,7 +101,7 @@ SKIP:
 SKIP:
    {
     skip 'No space tests on perl 5.11' => 4 + @expected
-                                                  if $] >= 5.011 and $] < 5.012;
+                                              if "$]" >= 5.011 and "$]" < 5.012;
     my $code = $code;
     $code =~ s/\$/\$ \n\t /g;
 
@@ -219,7 +219,7 @@ $obj = new $x qr{foo\s+bar}, 1 .. 1;
 ----
 [ 'new', '$x' ]
 ####
-$obj = new $x(qw/bar baz/);
+$obj = new $x(qw<bar baz>);
 ----
 [ 'new', '$x' ]
 ####
@@ -280,15 +280,15 @@ meh $y 1, 2;
 meh $y, 1, 2;
 ----
 [ 'meh', '$y' ]
-#### $] < 5.010 # use feature 'state'; state $z
+#### "$]" < 5.010 # use feature 'state'; state $z
 meh $z;
 ----
 [ 'meh', '$z' ]
-#### $] < 5.010 # use feature 'state'; state $z
+#### "$]" < 5.010 # use feature 'state'; state $z
 meh $z 1, 2;
 ----
 [ 'meh', '$z' ]
-#### $] < 5.010 # use feature 'state'; state $z
+#### "$]" < 5.010 # use feature 'state'; state $z
 meh $z, 1, 2;
 ----
 [ 'meh', '$z' ]
@@ -402,6 +402,54 @@ $obj = "apple ${\(new $x qq|${\(stuff $y)}|)} pear"
 $obj = "apple @{[new $x qq|@{[stuff $y]}|]} pear"
 ----
 [ 'stuff', '$y' ], [ 'new', '$x' ]
+#### # local $_ = "foo";
+s/foo/return; new Hlagh/e;
+----
+[ 'new', 'Hlagh' ]
+#### # local $_ = "bar";
+s/foo/return; new Hlagh/e;
+----
+[ 'new', 'Hlagh' ]
+#### # local $_ = "foo";
+s/foo/return; new $x/e;
+----
+[ 'new', '$x' ]
+#### # local $_ = "bar";
+s/foo/return; new $x/e;
+----
+[ 'new', '$x' ]
+#### # local $_ = "foo";
+s/foo/return; new $y/e;
+----
+[ 'new', '$y' ]
+#### # local $_ = "bar";
+s/foo/return; new $y/e;
+----
+[ 'new', '$y' ]
+####
+"foo" =~ /(?{new Hlagh})/;
+----
+[ 'new', 'Hlagh' ]
+####
+"foo" =~ /(?{new $x})/;
+----
+[ 'new', '$x' ]
+####
+"foo" =~ /(?{new $y})/;
+----
+[ 'new', '$y' ]
+####
+"foo" =~ /(??{new Hlagh})/;
+----
+[ 'new', 'Hlagh' ]
+####
+"foo" =~ /(??{new $x})/;
+----
+[ 'new', '$x' ]
+####
+"foo" =~ /(??{new $y})/;
+----
+[ 'new', '$y' ]
 ####
 meh { };
 ----
@@ -443,3 +491,13 @@ meh { feh $x; 1; } new Hlagh, feh $y;
 $obj = "apple @{[new { feh $x; meh $y; 1 }]} pear"
 ----
 [ 'feh', '$x' ], [ 'meh', '$y' ], [ 'new', '{' ]
+####
+package __PACKAGE_;
+new __PACKAGE_;
+----
+[ 'new', '__PACKAGE_' ]
+####
+package __PACKAGE___;
+new __PACKAGE___;
+----
+[ 'new', '__PACKAGE___' ]