X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fop%2Fcaller.t;h=c97191b14a7edf9ac2220555146d72034f5bc673;hb=3511154c18a0900e8873e8e72a4b74931525e718;hp=1b08d93002ef6277080d975e00c677890c8bff78;hpb=07b8c804e887e8334910292dd4862f56c37dcb00;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/op/caller.t b/t/op/caller.t
index 1b08d93..c97191b 100644
--- a/t/op/caller.t
+++ b/t/op/caller.t
@@ -5,42 +5,83 @@ BEGIN {
     chdir 't' if -d 't';
     @INC = '../lib';
     require './test.pl';
+    plan( tests => 27 );
 }
 
-plan( tests => 9 );
-
 my @c;
 
+print "# Tests with caller(0)\n";
+
 @c = caller(0);
 ok( (!@c), "caller(0) in main program" );
 
 eval { @c = caller(0) };
-is( $c[3], "(eval)", "caller(0) - subroutine name in an eval {}" );
+is( $c[3], "(eval)", "subroutine name in an eval {}" );
+ok( !$c[4], "hasargs false in an eval {}" );
 
 eval q{ @c = (Caller(0))[3] };
-is( $c[3], "(eval)", "caller(0) - subroutine name in an eval ''" );
+is( $c[3], "(eval)", "subroutine name in an eval ''" );
+ok( !$c[4], "hasargs false in an eval ''" );
 
 sub { @c = caller(0) } -> ();
-is( $c[3], "main::__ANON__", "caller(0) - anonymous subroutine name" );
+is( $c[3], "main::__ANON__", "anonymous subroutine name" );
+ok( $c[4], "hasargs true with anon sub" );
 
 # Bug 20020517.003, used to dump core
 sub foo { @c = caller(0) }
 my $fooref = delete $::{foo};
 $fooref -> ();
-is( $c[3], "(unknown)", "caller(0) - unknown subroutine name" );
+is( $c[3], "(unknown)", "unknown subroutine name" );
+ok( $c[4], "hasargs true with unknown sub" );
+
+print "# Tests with caller(1)\n";
 
 sub f { @c = caller(1) }
 
+sub callf { f(); }
+callf();
+is( $c[3], "main::callf", "subroutine name" );
+ok( $c[4], "hasargs true with callf()" );
+&callf;
+ok( !$c[4], "hasargs false with &callf" );
+
 eval { f() };
-is( $c[3], "(eval)", "caller(1) - subroutine name in an eval {}" );
+is( $c[3], "(eval)", "subroutine name in an eval {}" );
+ok( !$c[4], "hasargs false in an eval {}" );
 
 eval q{ f() };
-is( $c[3], "(eval)", "caller(1) - subroutine name in an eval ''" );
+is( $c[3], "(eval)", "subroutine name in an eval ''" );
+ok( !$c[4], "hasargs false in an eval ''" );
 
 sub { f() } -> ();
-is( $c[3], "main::__ANON__", "caller(1) - anonymous subroutine name" );
+is( $c[3], "main::__ANON__", "anonymous subroutine name" );
+ok( $c[4], "hasargs true with anon sub" );
 
 sub foo2 { f() }
 my $fooref2 = delete $::{foo2};
 $fooref2 -> ();
-is( $c[3], "(unknown)", "caller(1) - unknown subroutine name" );
+is( $c[3], "(unknown)", "unknown subroutine name" );
+ok( $c[4], "hasargs true with unknown sub" );
+
+# See if caller() returns the correct warning mask
+
+sub testwarn {
+    my $w = shift;
+    is( (caller(0))[9], $w, "warnings");
+}
+
+# NB : extend the warning mask values below when new warnings are added
+{
+    no warnings;
+    BEGIN { is( ${^WARNING_BITS}, "\0" x 12, 'warning bits' ) }
+    testwarn("\0" x 12);
+    use warnings;
+    BEGIN { is( ${^WARNING_BITS}, "U" x 12, 'warning bits' ) }
+    BEGIN { testwarn("U" x 12); }
+    # run-time :
+    # the warning mask has been extended by warnings::register
+    testwarn("UUUUUUUUUUUU\001");
+    use warnings::register;
+    BEGIN { is( ${^WARNING_BITS}, "UUUUUUUUUUUU\001", 'warning bits' ) }
+    testwarn("UUUUUUUUUUUU\001");
+}