Re: [PATCH] Lighten up glob

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

diff --git a/lib/vars.pm b/lib/vars.pm
index 6ae5373..d39f197 100644 (file)
--- a/lib/vars.pm
+++ b/lib/vars.pm
@@ -2,6 +2,8 @@ package vars;
 
 require 5.002;
 
+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
@@ -9,6 +11,9 @@ require 5.002;
 # We'll let those bugs get found on the development track.
 require Carp if $] < 5.00450;
 
+use warnings::register;
+require strict;
+
 sub import {
     my $callpack = caller;
     my ($pack, @imports, $sym, $ch) = @_;
@@ -22,9 +27,10 @@ sub import {
            } 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");
+           } 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("'$ch$sym' is not a valid variable name under strict vars");
            }
        }
         *{"${callpack}::$sym"} =