undo change#5506; add patch to make blank line warnings optional

[perl5.git] / lib / vars.pm

diff --git a/lib/vars.pm b/lib/vars.pm
index 5723ac6..6ae5373 100644 (file)
--- a/lib/vars.pm
+++ b/lib/vars.pm
@@ -13,11 +13,20 @@ sub import {
     my $callpack = caller;
     my ($pack, @imports, $sym, $ch) = @_;
     foreach $sym (@imports) {
-       if ($sym =~ /::/) {
-           require Carp;
-           Carp::croak("Can't declare another package's variables");
-       }
         ($ch, $sym) = unpack('a1a*', $sym);
+       if ($sym =~ tr/A-Za-z_0-9//c) {
+           # time for a more-detailed check-up
+           if ($sym =~ /::/) {
+               require Carp;
+               Carp::croak("Can't declare another package's variables");
+           } elsif ($sym =~ /^\w+[[{].*[]}]$/) {
+               require Carp;
+               Carp::croak("Can't declare individual elements of hash or array");
+           } elsif ($^W and length($sym) == 1 and $sym !~ tr/a-zA-Z//) {
+               require Carp;
+               Carp::carp("No need to declare built-in vars");
+           }
+       }
         *{"${callpack}::$sym"} =
           (  $ch eq "\$" ? \$   {"${callpack}::$sym"}
            : $ch eq "\@" ? \@   {"${callpack}::$sym"}
@@ -26,7 +35,7 @@ sub import {
            : $ch eq "\&" ? \&   {"${callpack}::$sym"}
            : do {
                require Carp;
-               Carp::croak("'$ch$sym' is not a valid variable name\n");
+               Carp::croak("'$ch$sym' is not a valid variable name");
             });
     }
 };
@@ -36,7 +45,7 @@ __END__
 
 =head1 NAME
 
-vars - Perl pragma to predeclare global variable names
+vars - Perl pragma to predeclare global variable names (obsolete)
 
 =head1 SYNOPSIS
 
@@ -44,6 +53,10 @@ vars - Perl pragma to predeclare global variable names
 
 =head1 DESCRIPTION
 
+NOTE: The functionality provided by this pragma has been superseded
+by C<our> declarations, available in Perl v5.6.0 or later.  See
+L<perlfunc/our>.
+
 This will predeclare all the variables whose names are 
 in the list, allowing you to use them under "use strict", and
 disabling any typo warnings.
@@ -61,6 +74,6 @@ outside of the package), it can act as an acceptable substitute by
 pre-declaring global symbols, ensuring their availability to the
 later-loaded routines.
 
-See L<perlmod/Pragmatic Modules>.
+See L<perlmodlib/Pragmatic Modules>.
 
 =cut