X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=t%2F21-bad.t;h=c789371945f4364fa2b7750b501b34999b37e5f4;hp=eea745eb863c64e8301c610f528aeabc740e1549;hb=6dbf3b321823741481f481326a36e7614d2346e8;hpb=ff16be2f69592b80dfcbc397b37dd4ea070b9d62

diff --git a/t/21-bad.t b/t/21-bad.t
index eea745e..c789371 100644
--- a/t/21-bad.t
+++ b/t/21-bad.t
@@ -1,6 +1,6 @@
 #!perl -T
 
-package Dongs;
+package NotEmpty;
 
 sub new;
 
@@ -11,11 +11,13 @@ use warnings;
 
 my ($tests, $reports);
 BEGIN {
- $tests   = 60;
- $reports = 68;
+ $tests   = 88;
+ $reports = 100;
 }
 
-use Test::More tests => 3 * (4 * $tests + $reports) + 2;
+use Test::More tests => 3 * (4 * $tests + $reports) + 4;
+
+BEGIN { delete $ENV{PERL_INDIRECT_PM_DISABLE} }
 
 my ($obj, $x);
 our ($y, $bloop);
@@ -29,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;
 }
@@ -42,7 +44,7 @@ sub try {
 
  @warns = ();
  {
-  local $SIG{__WARN__} = sub { push @warns, join(' ', @_) };
+  local $SIG{__WARN__} = sub { push @warns, @_ };
   eval $code;
  }
 }
@@ -60,12 +62,18 @@ sub try {
 
 SKIP:
   {
-   my ($code, $expected) = split /^-{4,}$/m, $_, 2;
-   my @expected = expect($expected);
-
-   skip "$_: $skip" => 3 * (4 + @expected) if eval $skip;
+   if (do { local $@; eval $skip }) {
+    my ($code, $expected) = split /^-{4,}$/m, $_, 2;
+    my @expected = expect($expected);
+    skip "$_: $skip" => 3 * (4 + @expected);
+   }
 
    {
+    local $_ = $_;
+    s/Pkg/Empty/g;
+    my ($code, $expected) = split /^-{4,}$/m, $_, 2;
+    my @expected = expect($expected);
+
     try "return; $prefix; use indirect; $code";
     is $@,     '', "use indirect: $code";
     is @warns, 0,  'correct number of reports';
@@ -80,7 +88,7 @@ SKIP:
 
    {
     local $_ = $_;
-    s/Hlagh/Dongs/g;
+    s/Pkg/NotEmpty/g;
     my ($code, $expected) = split /^-{4,}$/m, $_, 2;
     my @expected = expect($expected);
 
@@ -96,8 +104,14 @@ SKIP:
     }
    }
 
+SKIP:
    {
-    my $code = $code;
+    local $_ = $_;
+    s/Pkg/Empty/g;
+    my ($code, $expected) = split /^-{4,}$/m, $_, 2;
+    my @expected = expect($expected);
+    skip 'No space tests on perl 5.11' => 4 + @expected
+                                              if "$]" >= 5.011 and "$]" < 5.012;
     $code =~ s/\$/\$ \n\t /g;
 
     try "return; $prefix; use indirect; $code";
@@ -116,73 +130,83 @@ SKIP:
 }
 
 eval {
- my $warn;
- local $SIG{__WARN__} = sub { $warn = join ' ', @_ };
- eval "die qq{ok\n}; no indirect 'hlagh'; \$obj = new Hlagh1;";
- is($@, "ok\n", 'no indirect "hlagh" didn\'t croak');
- like($warn, qr/^Indirect\s+call\s+of\s+method\s+"new"\s+on\s+object\s+"Hlagh1"/, 'no indirect "hlagh" enables the pragma');
+ my @warns;
+ {
+  local $SIG{__WARN__} = sub { push @warns, @_ };
+  eval "return; no indirect 'whatever'; \$obj = new Pkg1;";
+ }
+ is        $@,      '',  'no indirect "whatever" didn\'t croak';
+ is        @warns,  1,   'only one warning';
+ my $warn = shift @warns;
+ like      $warn,   qr/^Indirect call of method "new" on object "Pkg1"/,
+                         'no indirect "whatever" enables the pragma';
+ is_deeply \@warns, [ ], 'nothing more';
 }
 
 __DATA__
 
-$obj = new Hlagh;
+$obj = new Pkg;
+----
+[ 'new', 'Pkg' ]
+####
+$obj = new Pkg if 0;
 ----
-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]
 ####
-$obj = new Hlagh();
+$obj = new Pkg();
 ----
-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]
 ####
-$obj = new Hlagh(1);
+$obj = new Pkg(1);
 ----
-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]
 ####
-$obj = new Hlagh(1, 2);
+$obj = new Pkg(1, 2);
 ----
-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]
 ####
-$obj = new        Hlagh            ;
+$obj = new        Pkg            ;
 ----
-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]
 ####
-$obj = new        Hlagh     (      )      ;
+$obj = new        Pkg     (      )      ;
 ----
-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]
 ####
-$obj = new        Hlagh     (      1        )     ;
+$obj = new        Pkg     (      1        )     ;
 ----
-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]
 ####
-$obj = new        Hlagh     (      1        ,       2        )     ;
+$obj = new        Pkg     (      1        ,       2        )     ;
 ----
-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]
 ####
 $obj = new    
-                      Hlagh		
+                      Pkg		
         ;
 ----
-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]
 ####
 $obj = new   
-                                       Hlagh     (    
+                                       Pkg     (    
                   )      ;
 ----
-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]
 ####
 $obj =
               new    
-    Hlagh     (      1   
+    Pkg     (      1   
             )     ;
 ----
-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]
 ####
 $obj =
 new      
-Hlagh    
+Pkg    
                    (      1        ,  
                 2        )     ;
 ----
-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]
 ####
 $obj = new $x;
 ----
@@ -204,7 +228,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' ]
 ####
@@ -265,15 +289,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' ]
@@ -312,25 +336,25 @@ meh $sploosh::sploosh;
 ----
 [ 'meh', '$sploosh::sploosh' ]
 ####
-new Hlagh->wut;
+new Pkg->wut;
 ----
-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]
 ####
-new Hlagh->wut();
+new Pkg->wut();
 ----
-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]
 ####
-new Hlagh->wut, "Wut";
+new Pkg->wut, "Wut";
 ----
-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]
 ####
-$obj = HlaghHlagh Hlagh;
+$obj = PkgPkg Pkg;
 ----
-[ 'HlaghHlagh', 'Hlagh' ]
+[ 'PkgPkg', 'Pkg' ]
 ####
-$obj = HlaghHlagh Hlagh; # HlaghHlagh Hlagh
+$obj = PkgPkg Pkg; # PkgPkg Pkg
 ----
-[ 'HlaghHlagh', 'Hlagh' ]
+[ 'PkgPkg', 'Pkg' ]
 ####
 $obj = new newnew;
 ----
@@ -348,14 +372,94 @@ $obj = feh feh; # feh feh
 ----
 [ 'feh', 'feh' ]
 ####
-new Hlagh (meh $x)
+new Pkg (meh $x)
 ----
-[ 'meh', '$x' ], [ 'new', 'Hlagh' ]
+[ 'meh', '$x' ], [ 'new', 'Pkg' ]
 ####
-Hlagh->new(meh $x)
+Pkg->new(meh $x)
 ----
 [ 'meh', '$x' ]
 ####
+$obj = "apple ${\(new Pkg)} pear"
+----
+[ 'new', 'Pkg' ]
+####
+$obj = "apple @{[new Pkg]} pear"
+----
+[ 'new', 'Pkg' ]
+####
+$obj = "apple ${\(new $x)} pear"
+----
+[ 'new', '$x' ]
+####
+$obj = "apple @{[new $x]} pear"
+----
+[ 'new', '$x' ]
+####
+$obj = "apple ${\(new $y)} pear"
+----
+[ 'new', '$y' ]
+####
+$obj = "apple @{[new $y]} pear"
+----
+[ 'new', '$y' ]
+####
+$obj = "apple ${\(new $x qq|${\(stuff $y)}|)} pear"
+----
+[ 'stuff', '$y' ], [ 'new', '$x' ]
+####
+$obj = "apple @{[new $x qq|@{[stuff $y]}|]} pear"
+----
+[ 'stuff', '$y' ], [ 'new', '$x' ]
+#### # local $_ = "foo";
+s/foo/return; new Pkg/e;
+----
+[ 'new', 'Pkg' ]
+#### # local $_ = "bar";
+s/foo/return; new Pkg/e;
+----
+[ 'new', 'Pkg' ]
+#### # 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 Pkg})/;
+----
+[ 'new', 'Pkg' ]
+####
+"foo" =~ /(?{new $x})/;
+----
+[ 'new', '$x' ]
+####
+"foo" =~ /(?{new $y})/;
+----
+[ 'new', '$y' ]
+####
+"foo" =~ /(??{new Pkg})/;
+----
+[ 'new', 'Pkg' ]
+####
+"foo" =~ /(??{new $x})/;
+----
+[ 'new', '$x' ]
+####
+"foo" =~ /(??{new $y})/;
+----
+[ 'new', '$y' ]
+####
 meh { };
 ----
 [ 'meh', '{' ]
@@ -373,15 +477,15 @@ meh {
 ----
 [ 'meh', '{' ]
 ####
-meh { new Hlagh; 1; };
+meh { new Pkg; 1; };
 ----
-[ 'new', 'Hlagh' ], [ 'meh', '{' ]
+[ 'new', 'Pkg' ], [ 'meh', '{' ]
 ####
 meh { feh $x; 1; };
 ----
 [ 'feh', '$x' ], [ 'meh', '{' ]
 ####
-meh { feh $x; use indirect; new Hlagh; 1; };
+meh { feh $x; use indirect; new Pkg; 1; };
 ----
 [ 'feh', '$x' ], [ 'meh', '{' ]
 ####
@@ -389,6 +493,40 @@ meh { feh $y; 1; };
 ----
 [ 'feh', '$y' ], [ 'meh', '{' ]
 ####
-meh { feh $x; 1; } new Hlagh, feh $y;
+meh { feh $x; 1; } new Pkg, feh $y;
+----
+[ 'feh', '$x' ], [ 'new', 'Pkg' ], [ 'feh', '$y' ], [ 'meh', '{' ]
+####
+$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___' ]
+####
+package Hurp;
+new { __PACKAGE__ }; # Hurp
+----
+[ 'new', '{' ]
+####
+package __PACKAGE_;
+new { __PACKAGE__ };
+----
+[ 'new', '{' ]
+####
+package __PACKAGE__;
+new { __PACKAGE__ };
+----
+[ 'new', '{' ]
+####
+package __PACKAGE___;
+new { __PACKAGE__ };
 ----
-[ 'feh', '$x' ], [ 'new', 'Hlagh' ], [ 'feh', '$y' ], [ 'meh', '{' ]
+[ 'new', '{' ]