IO::Socket now sets $!, avoids eval/die (patch from Graham Barr

[p5sagit/p5-mst-13.2.git] / warnings.pl

diff --git a/warnings.pl b/warnings.pl
index 72d19af..c6f1313 100644 (file)
--- a/warnings.pl
+++ b/warnings.pl
@@ -27,7 +27,7 @@ my $tree = {
                           },
                 'syntax'       => {    'ambiguous'     => DEFAULT_OFF,
                                'semicolon'     => DEFAULT_OFF,
-                               'precedence'    => DEFAULT_OFF,
+                               'bareword'      => DEFAULT_OFF,
                                'reserved'      => DEFAULT_OFF,
                                'octal'         => DEFAULT_OFF,
                                'digit'         => DEFAULT_OFF,
@@ -300,14 +300,15 @@ sub bits {
     my $catmask ;
     my $fatal = 0 ;
     foreach my $word (@_) {
-       if  ($word eq 'FATAL')
-         { $fatal = 1 }
-       elsif ($catmask = $Bits{$word}) {
-         $mask |= $catmask ;
-         $mask |= $DeadBits{$word} if $fatal ;
+       if  ($word eq 'FATAL') {
+           $fatal = 1;
+       }
+       else {
+           if ($catmask = $Bits{$word}) {
+               $mask |= $catmask ;
+               $mask |= $DeadBits{$word} if $fatal ;
+           }
        }
-       else
-         { croak "unknown warning category '$word'" }
     }
 
     return $mask ;
@@ -315,12 +316,12 @@ sub bits {
 
 sub import {
     shift;
-    ${^Warnings} |= bits(@_ ? @_ : 'all') ;
+    ${^WARNING_BITS} |= bits(@_ ? @_ : 'all') ;
 }
 
 sub unimport {
     shift;
-    ${^Warnings} &= ~ bits(@_ ? @_ : 'all') ;
+    ${^WARNING_BITS} &= ~ bits(@_ ? @_ : 'all') ;
 }
 
 sub enabled
@@ -328,7 +329,7 @@ sub enabled
     my $string = shift ;
 
     return 1
-       if $bits{$string} && ${^Warnings} & $bits{$string} ;
+       if $bits{$string} && ${^WARNING_BITS} & $bits{$string} ;
    
     return 0 ; 
 }