X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fvars.pm;h=39a15bd312bb88a039731ec9a969584a759df4c7;hb=b4b1f6091e7b2196e3cee1d4763595e9bae86880;hp=ca2a08dcf6c9572fa1936cd26cfaf9a3bb79f39f;hpb=014aafb8a06f901623bd13c6c881fb238a5469d1;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/vars.pm b/lib/vars.pm
index ca2a08d..39a15bd 100644
--- a/lib/vars.pm
+++ b/lib/vars.pm
@@ -9,6 +9,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 +25,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"} =
@@ -45,7 +49,7 @@ __END__
 
 =head1 NAME
 
-vars - Perl pragma to predeclare global variable names
+vars - Perl pragma to predeclare global variable names (obsolete)
 
 =head1 SYNOPSIS
 
@@ -53,6 +57,10 @@ vars - Perl pragma to predeclare global variable names
 
 =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>.
+
 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.