Test 'package A; sub foo; foo A->new' that gets deparsed as 'A->foo->new'

diff --git a/MANIFEST b/MANIFEST
index bf713754ff775e2bc74cb20c4592c43e28a679ae..80a587412236331f73091e1007661b8f20872784 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -9,6 +9,7 @@ t/00-load.t
 t/10-good.t
 t/20-bad.t
 t/21-bad-fatal.t
+t/22-bad-mixed.t
 t/30-scope.t
 t/90-boilerplate.t
 t/91-pod.t

diff --git a/t/10-good.t b/t/10-good.t
index b88d721779fd773545a194f9451235b45b573cf2..0132f45ec4ac6ea96569815a5c843706ac071c22 100644 (file)
--- a/t/10-good.t
+++ b/t/10-good.t
@@ -1,9 +1,15 @@
 #!perl -T
 
+package Dongs;
+
+sub new;
+
+package main;
+
 use strict;
 use warnings;
 
-use Test::More tests => 36 * 2;
+use Test::More tests => 36 * 4;
 
 my ($obj, $pkg, $cb, $x);
 sub meh;
@@ -12,18 +18,28 @@ sub meh;
  local $/ = "####\n";
  while (<DATA>) {
   chomp;
+  local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
   {
    use indirect;
-   local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
    eval "die qq{ok\\n}; $_";
   }
-  is($@, "ok\n", $_);
+  is($@, "ok\n", "use indirect: $_");
   {
    no indirect;
-   local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
    eval "die qq{ok\n}; $_";
   }
-  is($@, "ok\n", $_);
+  is($@, "ok\n", "no indirect: $_");
+  s/Hlagh/Dongs/g;
+  {
+   use indirect;
+   eval "die qq{ok\\n}; $_";
+  }
+  is($@, "ok\n", "use indirect, defined: $_");
+  {
+   no indirect;
+   eval "die qq{ok\\n}; $_";
+  }
+  is($@, "ok\n", "no indirect, defined: $_");
  }
 }
 

diff --git a/t/20-bad.t b/t/20-bad.t
index 5c57ebed84a6a2b65e26ee44470402101e460b6b..0a61cd1917454c16db0c84054042650389d4a6c3 100644 (file)
--- a/t/20-bad.t
+++ b/t/20-bad.t
@@ -1,9 +1,15 @@
 #!perl -T
 
+package Dongs;
+
+sub new;
+
+package main;
+
 use strict;
 use warnings;
 
-use Test::More tests => 30 * 2 + 2;
+use Test::More tests => 33 * 4 + 2;
 
 my ($obj, $x);
 
@@ -11,18 +17,28 @@ my ($obj, $x);
  local $/ = "####\n";
  while (<DATA>) {
   chomp;
+  local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
+  {
+   use indirect;
+   eval "die qq{ok\\n}; $_";
+  }
+  is($@, "ok\n", "use indirect: $_");
+  {
+   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: $_");
+  s/Hlagh/Dongs/g;
   {
    use indirect;
-   local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
    eval "die qq{ok\\n}; $_";
   }
-  is($@, "ok\n", $_);
+  is($@, "ok\n", "use indirect, defined: $_");
   {
    no indirect;
-   local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
    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|\$_)"/, $_);
+  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: $_");
  }
 }
 
@@ -98,6 +114,12 @@ meh $x;
 ####
 meh $x, 1, 2;
 ####
+new Hlagh->wut;
+####
+new Hlagh->wut();
+####
+new Hlagh->wut, "Wut";
+####
 $obj = HlaghHlagh Hlagh;
 ####
 $obj = HlaghHlagh Hlagh; # HlaghHlagh Hlagh

diff --git a/t/22-bad-mixed.t b/t/22-bad-mixed.t
new file mode 100644 (file)
index 0000000..bbc2f23
--- /dev/null
+++ b/t/22-bad-mixed.t
@@ -0,0 +1,50 @@
+#!perl -T
+
+package Dongs;
+
+sub new;
+
+package main;
+
+use strict;
+use warnings;
+
+use Test::More tests => 3 * 4;
+
+sub meh;
+
+{
+ local $/ = "####\n";
+ while (<DATA>) {
+  chomp;
+  local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
+  {
+   use indirect;
+   eval "die qq{ok\\n}; $_";
+  }
+  is($@, "ok\n", "use indirect: $_");
+  {
+   no indirect;
+   eval "die qq{ok\n}; $_";
+  }
+  is($@, "ok\n", "no indirect: $_");
+  s/Hlagh/Dongs/g;
+  {
+   use indirect;
+   eval "die qq{ok\\n}; $_";
+  }
+  is($@, "ok\n", "use indirect, defined: $_");
+  {
+   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+"meh"\s+on\s+object\s+"Dongs"/, "no indirect, defined: $_");
+ }
+}
+
+__DATA__
+meh Hlagh->new;
+####
+meh Hlagh->new();
+####
+meh Hlagh->new, "Wut";