use vars wasn't use utf8 aware.

[p5sagit/p5-mst-13.2.git] / lib / vars.pm

diff --git a/lib/vars.pm b/lib/vars.pm
index 4f3bddf..f6125fb 100644 (file)
--- a/lib/vars.pm
+++ b/lib/vars.pm
@@ -1,22 +1,16 @@
 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) {
         ($ch, $sym) = unpack('a1a*', $_);
        if ($sym =~ tr/A-Za-z_0-9//c) {
@@ -26,8 +20,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') &&
+                      # Either no 'use utf8' or if utf8, no non-word
+                      ($^H & $utf8::hint_bits == 0 ||
+                       $sym =~ /\W/) ) {
+                 Carp::croak("'$_' is not a valid variable name under strict vars");
            }
        }
        $sym = "${callpack}::$sym" unless $sym =~ /::/;