From: Tom Phoenix <rootbeer@teleport.com>
Date: Tue, 23 Jun 1998 05:37:09 +0000 (-0700)
Subject: Better diags for vars.pm
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=15313f9cd3ec9469f8bc8f7fed93c5d5de606948;p=p5sagit%2Fp5-mst-13.2.git

Better diags for vars.pm
	Message-ID: <Pine.GSO.3.96.980623052846.24075A-100000@user2.teleport.com>

p4raw-id: //depot/perl@1226
---

diff --git a/lib/vars.pm b/lib/vars.pm
index 5256d11..334af96 100644
--- a/lib/vars.pm
+++ b/lib/vars.pm
@@ -13,11 +13,20 @@ 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");
-	}
         ($ch, $sym) = unpack('a1a*', $sym);
+	if ($sym =~ tr/A-Za-Z_0-9//c) {
+	    # time for a more-detailed check-up
+	    if ($sym =~ /::/) {
+		require Carp;
+		Carp::croak("Can't declare another package's variables");
+	    } 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");
+	    }
+	}
         *{"${callpack}::$sym"} =
           (  $ch eq "\$" ? \$   {"${callpack}::$sym"}
            : $ch eq "\@" ? \@   {"${callpack}::$sym"}
@@ -26,7 +35,7 @@ sub import {
            : $ch eq "\&" ? \&   {"${callpack}::$sym"}
            : do {
 		require Carp;
-		Carp::croak("'$ch$sym' is not a valid variable name\n");
+		Carp::croak("'$ch$sym' is not a valid variable name");
 	     });
     }
 };