X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fvars.pm;h=4abc2d1c08ad745f4c959629534a5eb1c16945c1;hb=32ce01bccb8e58ee340ca4100517f9c031630ea7;hp=bde0b2a0e8c2274a44d07e7537c9b3739ee4b9ff;hpb=d3a7d8c7d7e4d69d7d81e4e3e900ec57f07ca07c;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/vars.pm b/lib/vars.pm
index bde0b2a..4abc2d1 100644
--- a/lib/vars.pm
+++ b/lib/vars.pm
@@ -1,41 +1,39 @@
 package vars;
 
-require 5.002;
+require 5.6.0;
 
-# 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;
-use warnings::register();
+our $VERSION = '1.01';
+
+use warnings::register;
+use strict qw(vars subs);
 
 sub import {
     my $callpack = caller;
-    my ($pack, @imports, $sym, $ch) = @_;
-    foreach $sym (@imports) {
-        ($ch, $sym) = unpack('a1a*', $sym);
+    my ($pack, @imports) = @_;
+    my ($sym, $ch);
+    foreach (@imports) {
+        ($ch, $sym) = unpack('a1a*', $_);
 	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+[[{].*[]}]$/) {
+	    if ($sym =~ /^\w+[[{].*[]}]$/) {
 		require Carp;
 		Carp::croak("Can't declare individual elements of hash or array");
 	    } elsif (warnings::enabled() and length($sym) == 1 and $sym !~ tr/a-zA-Z//) {
 		warnings::warn("No need to declare built-in vars");
+            } elsif  ( $^H &= strict::bits('vars') ) {
+              Carp::croak("'$_' is not a valid variable name under strict vars");
 	    }
 	}
-        *{"${callpack}::$sym"} =
-          (  $ch eq "\$" ? \$   {"${callpack}::$sym"}
-           : $ch eq "\@" ? \@   {"${callpack}::$sym"}
-           : $ch eq "\%" ? \%   {"${callpack}::$sym"}
-           : $ch eq "\*" ? \*   {"${callpack}::$sym"}
-           : $ch eq "\&" ? \&   {"${callpack}::$sym"}
+	$sym = "${callpack}::$sym" unless $sym =~ /::/;
+        *$sym =
+          (  $ch eq "\$" ? \$$sym
+           : $ch eq "\@" ? \@$sym
+           : $ch eq "\%" ? \%$sym
+           : $ch eq "\*" ? \*$sym
+           : $ch eq "\&" ? \&$sym
            : do {
 		require Carp;
-		Carp::croak("'$ch$sym' is not a valid variable name");
+		Carp::croak("'$_' is not a valid variable name");
 	     });
     }
 };
@@ -53,9 +51,9 @@ vars - Perl pragma to predeclare global variable names (obsolete)
 
 =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>.
+NOTE: For variables in the current package, 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