X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fvars.pm;h=ca2a08dcf6c9572fa1936cd26cfaf9a3bb79f39f;hb=f4c556ac9d141bf86702c68d95acad2db5ec6874;hp=0dd575829711679def0d40120c631dfea51037e9;hpb=c6f23971087b60e76ee381271f91c188d85e1db7;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/vars.pm b/lib/vars.pm
index 0dd5758..ca2a08d 100644
--- a/lib/vars.pm
+++ b/lib/vars.pm
@@ -1,46 +1,75 @@
 package vars;
 
-=head1 NAME
-
-vars - Perl pragma to predeclare global variable names
-
-=head1 SYNOPSIS
-
-    use vars qw($frob @mung %seen);
-
-=head1 DESCRIPTION
+require 5.002;
 
-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.
-
-Packages such as the B<AutoLoader> and B<SelfLoader> that delay loading
-of subroutines within packages can create problems with package lexicals
-defined using C<my()>. While the B<vars> pragma cannot duplicate the
-effect of package lexicals (total transparency outside of the package),
-it can act as an acceptable substitute by pre-declaring global symbols,
-ensuring their availability to to the later-loaded routines.
-
-See L<perlmod/Pragmatic Modules>.
-
-=cut
-require 5.000;
-use Carp;
+# The following require can't be removed during maintenance
+# releases, sadly, because of the risk of buggy code that does
+# require Carp; Carp::croak "..."; without brackets dying
+# if Carp hasn't been loaded in earlier compile time. :-(
+# We'll let those bugs get found on the development track.
+require Carp if $] < 5.00450;
 
 sub import {
     my $callpack = caller;
     my ($pack, @imports, $sym, $ch) = @_;
     foreach $sym (@imports) {
-	croak "Can't declare another package's variables" if $sym =~ /::/;
         ($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"}
            : $ch eq "\%" ? \%   {"${callpack}::$sym"}
            : $ch eq "\*" ? \*   {"${callpack}::$sym"}
            : $ch eq "\&" ? \&   {"${callpack}::$sym"}
-           : croak "'$ch$sym' is not a valid variable name\n");
+           : do {
+		require Carp;
+		Carp::croak("'$ch$sym' is not a valid variable name");
+	     });
     }
 };
 
 1;
+__END__
+
+=head1 NAME
+
+vars - Perl pragma to predeclare global variable names
+
+=head1 SYNOPSIS
+
+    use vars qw($frob @mung %seen);
+
+=head1 DESCRIPTION
+
+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.
+
+Unlike pragmas that affect the C<$^H> hints variable, the C<use vars> and
+C<use subs> declarations are not BLOCK-scoped.  They are thus effective
+for the entire file in which they appear.  You may not rescind such
+declarations with C<no vars> or C<no subs>.
+
+Packages such as the B<AutoLoader> and B<SelfLoader> that delay
+loading of subroutines within packages can create problems with
+package lexicals defined using C<my()>. While the B<vars> pragma
+cannot duplicate the effect of package lexicals (total transparency
+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<perlmodlib/Pragmatic Modules>.
+
+=cut