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

diff --git a/lib/vars.pm b/lib/vars.pm
index 4f3bddf..020568e 100644
--- a/lib/vars.pm
+++ b/lib/vars.pm
@@ -1,23 +1,21 @@
 package vars;
 
-require 5.002;
+use 5.006;
 
-our $VERSION = '1.00';
-
-# 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;
-require strict;
+use strict qw(vars subs);
 
 sub import {
     my $callpack = caller;
-    my ($pack, @imports, $sym, $ch) = @_;
+    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
@@ -26,8 +24,11 @@ sub import {
 		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");
+            } 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");
 	    }
 	}
 	$sym = "${callpack}::$sym" unless $sym =~ /::/;
@@ -78,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