Integrate:

[ 21124]
In trying to save space, the warnings.pl change (#21107)
pulled in attributes.pm... and the change didn't seem to
be that well tested with different configurations.
Retract #21119, #21117, #21107.
p4raw-link: @21124 on //depot/perl: 53610d0bd42b53473db45197fdfabc36caa55679

p4raw-id: //depot/maint-5.8/perl@21129
p4raw-integrated: from //depot/perl@21125 'ignore' ext/B/t/stash.t
	(@21119..) 'merge in' lib/warnings.pm warnings.pl (@21107..)

diff --git a/ext/B/t/stash.t b/ext/B/t/stash.t
index 171abf1..b1c97b0 100755 (executable)
--- a/ext/B/t/stash.t
+++ b/ext/B/t/stash.t
@@ -66,7 +66,7 @@ print "# got = @got\n";
 
 $got = "@got";
 
-my $expected = "attributes Carp Carp::Heavy DB Exporter Exporter::Heavy Internals main Regexp utf8 version warnings";
+my $expected = "attributes Carp Carp::Heavy DB Exporter Exporter::Heavy Internals main Regexp utf8 warnings";
 
 {
     no strict 'vars';

diff --git a/lib/warnings.pm b/lib/warnings.pm
index a4d4157..027eb28 100644 (file)
--- a/lib/warnings.pm
+++ b/lib/warnings.pm
@@ -6,7 +6,7 @@
 
 package warnings;
 
-our $VERSION = '1.03';
+our $VERSION = '1.02';
 
 =head1 NAME
 
@@ -131,9 +131,9 @@ See L<perlmodlib/Pragmatic Modules> and L<perllexwarn>.
 
 =cut
 
-use Carp ();
+use Carp ;
 
-our %Offsets : unique = (
+%Offsets = (
 
     # Warnings Categories added in Perl 5.008
 
@@ -186,7 +186,7 @@ our %Offsets : unique = (
     'y2k'              => 92,
   );
 
-our %Bits : unique = (
+%Bits = (
     'all'              => "\x55\x55\x55\x55\x55\x55\x55\x55\x55\x55\x55\x15", # [0..46]
     'ambiguous'                => "\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00", # [29]
     'bareword'         => "\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00", # [30]
@@ -236,7 +236,7 @@ our %Bits : unique = (
     'y2k'              => "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10", # [46]
   );
 
-our %DeadBits : unique = (
+%DeadBits = (
     'all'              => "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x2a", # [0..46]
     'ambiguous'                => "\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00", # [29]
     'bareword'         => "\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00", # [30]
@@ -295,7 +295,7 @@ $All = "" ; vec($All, $Offsets{'all'}, 2) = 3 ;
 sub Croaker
 {
     delete $Carp::CarpInternal{'warnings'};
-    Carp::croak(@_);
+    croak(@_);
 }
 
 sub bits
@@ -464,10 +464,10 @@ sub warn
 
     my $message = pop ;
     my ($callers_bitmask, $offset, $i) = __chk(@_) ;
-    Carp::croak($message)
+    croak($message)
        if vec($callers_bitmask, $offset+1, 1) ||
           vec($callers_bitmask, $Offsets{'all'}+1, 1) ;
-    Carp::carp($message) ;
+    carp($message) ;
 }
 
 sub warnif
@@ -483,11 +483,11 @@ sub warnif
                (vec($callers_bitmask, $offset, 1) ||
                vec($callers_bitmask, $Offsets{'all'}, 1)) ;
 
-    Carp::croak($message)
+    croak($message)
        if vec($callers_bitmask, $offset+1, 1) ||
           vec($callers_bitmask, $Offsets{'all'}+1, 1) ;
 
-    Carp::carp($message) ;
+    carp($message) ;
 }
 
 1;

diff --git a/warnings.pl b/warnings.pl
index 6f64b79..b82fd1e 100644 (file)
--- a/warnings.pl
+++ b/warnings.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 
-
-$VERSION = '1.02';
+$VERSION = '1.01';
 
 BEGIN {
   push @INC, './lib';
@@ -413,7 +412,7 @@ while (<DATA>) {
 #$list{'all'} = [ $offset .. 8 * ($warn_size/2) - 1 ] ;
 
 $last_ver = 0;
-print PM "our %Offsets : unique = (\n" ;
+print PM "%Offsets = (\n" ;
 foreach my $k (sort { $a <=> $b } keys %ValueToName) {
     my ($name, $version) = @{ $ValueToName{$k} };
     $name = lc $name;
@@ -429,7 +428,7 @@ foreach my $k (sort { $a <=> $b } keys %ValueToName) {
 
 print PM "  );\n\n" ;
 
-print PM "our %Bits : unique = (\n" ;
+print PM "%Bits = (\n" ;
 foreach $k (sort keys  %list) {
 
     my $v = $list{$k} ;
@@ -443,7 +442,7 @@ foreach $k (sort keys  %list) {
 
 print PM "  );\n\n" ;
 
-print PM "our %DeadBits : unique = (\n" ;
+print PM "%DeadBits = (\n" ;
 foreach $k (sort keys  %list) {
 
     my $v = $list{$k} ;
@@ -474,7 +473,7 @@ __END__
 
 package warnings;
 
-our $VERSION = '1.03';
+our $VERSION = '1.02';
 
 =head1 NAME
 
@@ -599,7 +598,7 @@ See L<perlmodlib/Pragmatic Modules> and L<perllexwarn>.
 
 =cut
 
-use Carp ();
+use Carp ;
 
 KEYWORDS
 
@@ -608,7 +607,7 @@ $All = "" ; vec($All, $Offsets{'all'}, 2) = 3 ;
 sub Croaker
 {
     delete $Carp::CarpInternal{'warnings'};
-    Carp::croak(@_);
+    croak(@_);
 }
 
 sub bits
@@ -777,10 +776,10 @@ sub warn
 
     my $message = pop ;
     my ($callers_bitmask, $offset, $i) = __chk(@_) ;
-    Carp::croak($message)
+    croak($message)
        if vec($callers_bitmask, $offset+1, 1) ||
           vec($callers_bitmask, $Offsets{'all'}+1, 1) ;
-    Carp::carp($message) ;
+    carp($message) ;
 }
 
 sub warnif
@@ -796,11 +795,11 @@ sub warnif
                (vec($callers_bitmask, $offset, 1) ||
                vec($callers_bitmask, $Offsets{'all'}, 1)) ;
 
-    Carp::croak($message)
+    croak($message)
        if vec($callers_bitmask, $offset+1, 1) ||
           vec($callers_bitmask, $Offsets{'all'}+1, 1) ;
 
-    Carp::carp($message) ;
+    carp($message) ;
 }
 
 1;