Remove profanity

We're professionals (or something).

diff --git a/t/20-good.t b/t/20-good.t
index f6fe90abfc61c7e3a7958361d9c6488c51e29d66..f13521623f681f00ec5d434e426ff7a9047609fe 100644 (file)
--- a/t/20-good.t
+++ b/t/20-good.t
@@ -1,6 +1,6 @@
 #!perl -T
 
 #!perl -T
 

-package Dongs;
+package NotEmpty;

 
 sub new;
 
 
 sub new;
 


@@ -46,6 +46,9 @@ SKIP:
    skip "$_: $skip" => 8 if eval $skip;
 
    {
    skip "$_: $skip" => 8 if eval $skip;
 
    {

+    local $_ = $_;
+    s/Pkg/Empty/g;
+

     try "return; $prefix; use indirect; $_";
     is $@,     '', "use indirect: $_";
     is @warns, 0,  'no reports';
     try "return; $prefix; use indirect; $_";
     is $@,     '', "use indirect: $_";
     is @warns, 0,  'no reports';


@@ -57,7 +60,7 @@ SKIP:
 
    {
     local $_ = $_;
 
    {
     local $_ = $_;

-    s/Hlagh/Dongs/g;
+    s/Pkg/NotEmpty/g;

 
     try "return; $prefix; use indirect; $_";
     is $@,     '', "use indirect, defined: $_";
 
     try "return; $prefix; use indirect; $_";
     is $@,     '', "use indirect, defined: $_";


@@ -165,37 +168,37 @@ SKIP:
 
 __DATA__
 
 
 __DATA__
 

-$obj = Hlagh->new;
+$obj = Pkg->new;

 ####
 ####

-$obj = Hlagh->new();
+$obj = Pkg->new();

 ####
 ####

-$obj = Hlagh->new(1);
+$obj = Pkg->new(1);

 ####
 ####

-$obj = Hlagh->new(q{foo}, bar => $obj);
+$obj = Pkg->new(q{foo}, bar => $obj);

 ####
 ####

-$obj = Hlagh   ->   new   ;
+$obj = Pkg   ->   new   ;

 ####
 ####

-$obj = Hlagh   ->   new   (   )   ;
+$obj = Pkg   ->   new   (   )   ;

 ####
 ####

-$obj = Hlagh   ->   new   (   1   )   ;
+$obj = Pkg   ->   new   (   1   )   ;

 ####
 ####

-$obj = Hlagh   ->   new   (   'foo'   ,   bar =>   $obj   );
+$obj = Pkg   ->   new   (   'foo'   ,   bar =>   $obj   );

 ####
 ####

-$obj = Hlagh
+$obj = Pkg

             ->
                           new   ;
 ####
             ->
                           new   ;
 ####

-$obj = Hlagh  
+$obj = Pkg  

 
       ->   
 new   ( 
  )   ;
 ####
 
       ->   
 new   ( 
  )   ;
 ####

-$obj = Hlagh
+$obj = Pkg

                                        ->   new   ( 
                1   )   ;
 ####
                                        ->   new   ( 
                1   )   ;
 ####

-$obj = Hlagh   ->
+$obj = Pkg   ->

                               new   (   "foo"
   ,    bar     
                =>        $obj       );
                               new   (   "foo"
   ,    bar     
                =>        $obj       );


@@ -208,17 +211,17 @@ $obj = new->newnew;
 ####
 $obj = newnew->new;
 ####
 ####
 $obj = newnew->new;
 ####

-$obj = Hlagh->$cb;
+$obj = Pkg->$cb;

 ####
 ####

-$obj = Hlagh->$cb();
+$obj = Pkg->$cb();

 ####
 ####

-$obj = Hlagh->$cb($pkg);
+$obj = Pkg->$cb($pkg);

 ####
 ####

-$obj = Hlagh->$cb(sub { 'foo' },  bar => $obj);
+$obj = Pkg->$cb(sub { 'foo' },  bar => $obj);

 ####
 ####

-$obj = Hlagh->$meth;
+$obj = Pkg->$meth;

 ####
 ####

-$obj =   Hlagh
+$obj =   Pkg

    -> 
           $meth   ( 1,   2   );
 ####
    -> 
           $meth   ( 1,   2   );
 ####


@@ -299,11 +302,11 @@ print $x "oh hai\n";
 ####
 print $y;
 ####
 ####
 print $y;
 ####

-print $y "dongs\n";
+print $y "hello thar\n";

 #### "$]" < 5.010 # use feature 'state'; state $z
 print $z;
 #### "$]" < 5.010 # use feature 'state'; state $z
 #### "$]" < 5.010 # use feature 'state'; state $z
 print $z;
 #### "$]" < 5.010 # use feature 'state'; state $z

-print $z "hlagh\n";
+print $z "lolno\n";

 ####
 print STDOUT "bananananananana\n";
 ####
 ####
 print STDOUT "bananananananana\n";
 ####


@@ -333,17 +336,17 @@ $obj = "apple ${\($y->$meth)} pear"
 ####
 $obj = "apple @{[$y->$meth]} pear"
 #### # local $_ = "foo";
 ####
 $obj = "apple @{[$y->$meth]} pear"
 #### # local $_ = "foo";

-s/foo/return; Hlagh->new/e;
+s/foo/return; Pkg->new/e;

 #### # local $_ = "bar";
 #### # local $_ = "bar";

-s/foo/return; Hlagh->new/e;
+s/foo/return; Pkg->new/e;

 #### # local $_ = "foo";
 #### # local $_ = "foo";

-s/foo/return; Hlagh->$cb/e;
+s/foo/return; Pkg->$cb/e;

 #### # local $_ = "bar";
 #### # local $_ = "bar";

-s/foo/return; Hlagh->$cb/e;
+s/foo/return; Pkg->$cb/e;

 #### # local $_ = "foo";
 #### # local $_ = "foo";

-s/foo/return; Hlagh->$meth/e;
+s/foo/return; Pkg->$meth/e;

 #### # local $_ = "bar";
 #### # local $_ = "bar";

-s/foo/return; Hlagh->$meth/e;
+s/foo/return; Pkg->$meth/e;

 #### # local $_ = "foo";
 s/foo/return; $x->new/e;
 #### # local $_ = "bar";
 #### # local $_ = "foo";
 s/foo/return; $x->new/e;
 #### # local $_ = "bar";


@@ -369,11 +372,11 @@ s/foo/return; $y->$meth/e;
 #### # local $_ = "bar";
 s/foo/return; $y->$meth/e;
 ####
 #### # local $_ = "bar";
 s/foo/return; $y->$meth/e;
 ####

-"foo" =~ /(?{Hlagh->new})/;
+"foo" =~ /(?{Pkg->new})/;

 ####
 ####

-"foo" =~ /(?{Hlagh->$cb})/;
+"foo" =~ /(?{Pkg->$cb})/;

 ####
 ####

-"foo" =~ /(?{Hlagh->$meth})/;
+"foo" =~ /(?{Pkg->$meth})/;

 ####
 "foo" =~ /(?{$x->new})/;
 ####
 ####
 "foo" =~ /(?{$x->new})/;
 ####


@@ -403,28 +406,28 @@ zap { 1; 1; };
 ####
 zap { zap { }; 1; };
 ####
 ####
 zap { zap { }; 1; };
 ####

-my @stuff = sort Hlagh
+my @stuff = sort Pkg

      ->new;
 ####
      ->new;
 ####

-my @stuff = sort Hlagh
+my @stuff = sort Pkg

               ->new;
 ####
               ->new;
 ####

-my @stuff = sort Hlagh
+my @stuff = sort Pkg

                ->new;
 ####
                ->new;
 ####

-my @stuff = sort Hlagh
+my @stuff = sort Pkg

                 ->new;
 ####
                 ->new;
 ####

-my @stuff = sort Hlagh
+my @stuff = sort Pkg

                  ->new;
 ####
                  ->new;
 ####

-my @stuff = sort Hlagh
+my @stuff = sort Pkg

                    ->new;
 ####
                    ->new;
 ####

-my @stuff = sort Hlagh
+my @stuff = sort Pkg

                      ->new;
 ####
                      ->new;
 ####

-my @stuff = sort Hlagh
+my @stuff = sort Pkg

                         ->new;
 ####
 sub {
                         ->new;
 ####
 sub {

diff --git a/t/21-bad.t b/t/21-bad.t
index 0d3b48d96a3f81abe21a73e361595fc19e387381..8e7b5f033217c03cee49f14c477334d5bac3ae64 100644 (file)
--- a/t/21-bad.t
+++ b/t/21-bad.t
@@ -1,6 +1,6 @@
 #!perl -T
 
 #!perl -T
 

-package Dongs;
+package NotEmpty;

 
 sub new;
 
 
 sub new;
 


@@ -62,12 +62,18 @@ sub try {
 
 SKIP:
   {
 
 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';
     try "return; $prefix; use indirect; $code";
     is $@,     '', "use indirect: $code";
     is @warns, 0,  'correct number of reports';


@@ -82,7 +88,7 @@ SKIP:
 
    {
     local $_ = $_;
 
    {
     local $_ = $_;

-    s/Hlagh/Dongs/g;
+    s/Pkg/NotEmpty/g;

     my ($code, $expected) = split /^-{4,}$/m, $_, 2;
     my @expected = expect($expected);
 
     my ($code, $expected) = split /^-{4,}$/m, $_, 2;
     my @expected = expect($expected);
 


@@ -100,9 +106,12 @@ SKIP:
 
 SKIP:
    {
 
 SKIP:
    {

+    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;
     skip 'No space tests on perl 5.11' => 4 + @expected
                                               if "$]" >= 5.011 and "$]" < 5.012;

-    my $code = $code;

     $code =~ s/\$/\$ \n\t /g;
 
     try "return; $prefix; use indirect; $code";
     $code =~ s/\$/\$ \n\t /g;
 
     try "return; $prefix; use indirect; $code";


@@ -124,80 +133,80 @@ eval {
  my @warns;
  {
   local $SIG{__WARN__} = sub { push @warns, @_ };
  my @warns;
  {
   local $SIG{__WARN__} = sub { push @warns, @_ };

-  eval "return; no indirect 'hlagh'; \$obj = new Hlagh1;";
+  eval "return; no indirect 'whatever'; \$obj = new Pkg1;";

  }
  }

- is        $@,      '',  'no indirect "hlagh" didn\'t croak';
+ is        $@,      '',  'no indirect "whatever" didn\'t croak';

  is        @warns,  1,   'only one warning';
  my $warn = shift @warns;
  is        @warns,  1,   'only one warning';
  my $warn = shift @warns;

- like      $warn,   qr/^Indirect call of method "new" on object "Hlagh1"/,
-                         'no indirect "hlagh" enables the pragma';
+ like      $warn,   qr/^Indirect call of method "new" on object "Pkg1"/,
+                         'no indirect "whatever" enables the pragma';

  is_deeply \@warns, [ ], 'nothing more';
 }
 
 __DATA__
 
  is_deeply \@warns, [ ], 'nothing more';
 }
 
 __DATA__
 

-$obj = new Hlagh;
+$obj = new Pkg;

 ----
 ----

-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]

 ####
 ####

-$obj = new Hlagh if 0;
+$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    
 ####
 $obj = new    

-                      Hlagh            
+                      Pkg              

         ;
 ----
         ;
 ----

-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]

 ####
 $obj = new   
 ####
 $obj = new   

-                                       Hlagh     (    
+                                       Pkg     (    

                   )      ;
 ----
                   )      ;
 ----

-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]

 ####
 $obj =
               new    
 ####
 $obj =
               new    

-    Hlagh     (      1   
+    Pkg     (      1   

             )     ;
 ----
             )     ;
 ----

-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]

 ####
 $obj =
 new      
 ####
 $obj =
 new      

-Hlagh    
+Pkg    

                    (      1        ,  
                 2        )     ;
 ----
                    (      1        ,  
                 2        )     ;
 ----

-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]

 ####
 $obj = new $x;
 ----
 ####
 $obj = new $x;
 ----


@@ -327,25 +336,25 @@ meh $sploosh::sploosh;
 ----
 [ '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;
 ----
 ####
 $obj = new newnew;
 ----


@@ -363,21 +372,21 @@ $obj = feh feh; # 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' ]
 ####
 ----
 [ 'meh', '$x' ]
 ####

-$obj = "apple ${\(new Hlagh)} pear"
+$obj = "apple ${\(new Pkg)} pear"

 ----
 ----

-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]

 ####
 ####

-$obj = "apple @{[new Hlagh]} pear"
+$obj = "apple @{[new Pkg]} pear"

 ----
 ----

-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]

 ####
 $obj = "apple ${\(new $x)} pear"
 ----
 ####
 $obj = "apple ${\(new $x)} pear"
 ----


@@ -403,13 +412,13 @@ $obj = "apple @{[new $x qq|@{[stuff $y]}|]} pear"
 ----
 [ 'stuff', '$y' ], [ 'new', '$x' ]
 #### # local $_ = "foo";
 ----
 [ 'stuff', '$y' ], [ 'new', '$x' ]
 #### # local $_ = "foo";

-s/foo/return; new Hlagh/e;
+s/foo/return; new Pkg/e;

 ----
 ----

-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]

 #### # local $_ = "bar";
 #### # local $_ = "bar";

-s/foo/return; new Hlagh/e;
+s/foo/return; new Pkg/e;

 ----
 ----

-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]

 #### # local $_ = "foo";
 s/foo/return; new $x/e;
 ----
 #### # local $_ = "foo";
 s/foo/return; new $x/e;
 ----


@@ -427,9 +436,9 @@ s/foo/return; new $y/e;
 ----
 [ 'new', '$y' ]
 ####
 ----
 [ 'new', '$y' ]
 ####

-"foo" =~ /(?{new Hlagh})/;
+"foo" =~ /(?{new Pkg})/;

 ----
 ----

-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]

 ####
 "foo" =~ /(?{new $x})/;
 ----
 ####
 "foo" =~ /(?{new $x})/;
 ----


@@ -439,9 +448,9 @@ s/foo/return; new $y/e;
 ----
 [ 'new', '$y' ]
 ####
 ----
 [ 'new', '$y' ]
 ####

-"foo" =~ /(??{new Hlagh})/;
+"foo" =~ /(??{new Pkg})/;

 ----
 ----

-[ 'new', 'Hlagh' ]
+[ 'new', 'Pkg' ]

 ####
 "foo" =~ /(??{new $x})/;
 ----
 ####
 "foo" =~ /(??{new $x})/;
 ----


@@ -468,15 +477,15 @@ meh {
 ----
 [ '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; 1; };
 ----
 [ 'feh', '$x' ], [ 'meh', '{' ]
 ####

-meh { feh $x; use indirect; new Hlagh; 1; };
+meh { feh $x; use indirect; new Pkg; 1; };

 ----
 [ 'feh', '$x' ], [ 'meh', '{' ]
 ####
 ----
 [ 'feh', '$x' ], [ 'meh', '{' ]
 ####


@@ -484,9 +493,9 @@ meh { feh $y; 1; };
 ----
 [ 'feh', '$y' ], [ 'meh', '{' ]
 ####
 ----
 [ 'feh', '$y' ], [ 'meh', '{' ]
 ####

-meh { feh $x; 1; } new Hlagh, feh $y;
+meh { feh $x; 1; } new Pkg, feh $y;

 ----
 ----

-[ 'feh', '$x' ], [ 'new', 'Hlagh' ], [ 'feh', '$y' ], [ 'meh', '{' ]
+[ 'feh', '$x' ], [ 'new', 'Pkg' ], [ 'feh', '$y' ], [ 'meh', '{' ]

 ####
 $obj = "apple @{[new { feh $x; meh $y; 1 }]} pear"
 ----
 ####
 $obj = "apple @{[new { feh $x; meh $y; 1 }]} pear"
 ----

diff --git a/t/22-bad-mixed.t b/t/22-bad-mixed.t
index cff75658737a885ebd4a3da0bd9c895e01942bcd..bcb9203410cef9d7b6c96e6f9c87f608f87c9d79 100644 (file)
--- a/t/22-bad-mixed.t
+++ b/t/22-bad-mixed.t
@@ -1,6 +1,6 @@
 #!perl -T
 
 #!perl -T
 

-package Dongs;
+package NotEmpty;

 
 sub new;
 
 
 sub new;
 


@@ -40,9 +40,12 @@ sub try {
 
 SKIP:
   {
 
 SKIP:
   {

-   skip "$_: $skip" => 9 if eval $skip;
+   skip "$_: $skip" => 9 if do { local $@; eval $skip };

 
    {
 
    {

+    local $_ = $_;
+    s/Pkg/Empty/g;
+

     try "return; $prefix; use indirect; $_";
     is $@,     '', "use indirect: $_";
     is @warns, 0,  'correct number of reports';
     try "return; $prefix; use indirect; $_";
     is $@,     '', "use indirect: $_";
     is @warns, 0,  'correct number of reports';


@@ -54,7 +57,7 @@ SKIP:
 
    {
     local $_ = $_;
 
    {
     local $_ = $_;

-    s/Hlagh/Dongs/g;
+    s/Pkg/NotEmpty/g;

 
     try "return; $prefix; use indirect; $_";
     is $@,     '', "use indirect, defined: $_";
 
     try "return; $prefix; use indirect; $_";
     is $@,     '', "use indirect, defined: $_";


@@ -63,7 +66,7 @@ SKIP:
     try "return; $prefix; no indirect; $_";
     is $@,          '', "use indirect, defined: $_";
     is @warns,      1,  'correct number of reports';
     try "return; $prefix; no indirect; $_";
     is $@,          '', "use indirect, defined: $_";
     is @warns,      1,  'correct number of reports';

-    like $warns[0], qr/^Indirect call of method "meh" on object "Dongs" at \(eval \d+\) line \d+/, 'report 0 is correct';
+    like $warns[0], qr/^Indirect call of method "meh" on object "NotEmpty" at \(eval \d+\) line \d+/, 'report 0 is correct';

    }
   }
  }
    }
   }
  }


@@ -71,8 +74,8 @@ SKIP:
 
 __DATA__
 
 
 __DATA__
 

-meh Hlagh->new;
+meh Pkg->new;

 ####
 ####

-meh Hlagh->new();
+meh Pkg->new();

 ####
 ####

-meh Hlagh->new, "Wut";
+meh Pkg->new, "Wut";