diff options
| author | Tom Phoenix <rootbeer@teleport.com> | 1998-06-22 22:37:09 -0700 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-06-28 17:12:56 +0000 |
| commit | 15313f9cd3ec9469f8bc8f7fed93c5d5de606948 (patch) | |
| tree | e52d27c7bd80c3d16ebd1485a64c71f2afb97ae6 /lib/vars.pm | |
| parent | 877622baf40bb04ea93c13070d881d4bff59d3df (diff) | |
| download | perl-15313f9cd3ec9469f8bc8f7fed93c5d5de606948.tar.gz | |
Better diags for vars.pm
Message-ID: <Pine.GSO.3.96.980623052846.24075A-100000@user2.teleport.com>
p4raw-id: //depot/perl@1226
Diffstat (limited to 'lib/vars.pm')
| -rw-r--r-- | lib/vars.pm | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/lib/vars.pm b/lib/vars.pm index 5256d1199f..334af9630a 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"); }); } }; |