X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fvars.pm;h=020568e9e059cb92578fdc11ef0db911c901f3c1;hb=3ca7705ebd432c2fb3599731fec8760f14fddd0f;hp=5256d1199fba25ebee0e81e9af857e1133b5f5b0;hpb=ee580363108be8ac33155650c6c18d2e5cf051f3;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/vars.pm b/lib/vars.pm
index 5256d11..020568e 100644
--- a/lib/vars.pm
+++ b/lib/vars.pm
@@ -1,32 +1,46 @@
 package vars;
 
-require 5.002;
+use 5.006;
 
-# 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;
+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) {
-	if ($sym =~ /::/) {
-	    require Carp;
-	    Carp::croak("Can't declare another package's variables");
+    my ($pack, @imports) = @_;
+    my ($sym, $ch);
+    foreach (@imports) {
+	# TODO: UTF-8 names: (the unpack is quite wrong,
+	# /^(.)(.*)/ would probably be better.)  While you
+	# are at it, until declaring empty package is made
+	# to work the * is too lenient.
+        ($ch, $sym) = unpack('a1a*', $_);
+	if ($sym =~ tr/A-Za-z_0-9//c) {
+	    # time for a more-detailed check-up
+	    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'))) {
+		# TODO: UTF-8 names: be careful to load the UTF-8
+		# machinery only if the symbol requires it.
+		require Carp;
+		Carp::croak("'$_' is not a valid variable name under strict vars");
+	    }
 	}
-        ($ch, $sym) = unpack('a1a*', $sym);
-        *{"${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\n");
+		Carp::croak("'$_' is not a valid variable name");
 	     });
     }
 };
@@ -36,7 +50,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 +58,10 @@ vars - Perl pragma to predeclare global variable names
 
 =head1 DESCRIPTION
 
+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
 disabling any typo warnings.
@@ -61,6 +79,8 @@ outside of the package), it can act as an acceptable substitute by
 pre-declaring global symbols, ensuring their availability to the
 later-loaded routines.
 
+The C<use vars> does not work for UTF-8 variable names.
+
 See L<perlmodlib/Pragmatic Modules>.
 
 =cut