Refactoring the /Can't return (?:array|hash) to scalar context/ croak

[perl5.git] / lib / vars.pm

diff --git a/lib/vars.pm b/lib/vars.pm
index f6125fb..a0151b8 100644 (file)
--- a/lib/vars.pm
+++ b/lib/vars.pm
@@ -12,32 +12,34 @@ sub import {
     my ($pack, @imports) = @_;
     my ($sym, $ch);
     foreach (@imports) {
-        ($ch, $sym) = unpack('a1a*', $_);
-       if ($sym =~ tr/A-Za-z_0-9//c) {
-           # time for a more-detailed check-up
-           if ($sym =~ /^\w+[[{].*[]}]$/) {
-               require Carp;
-               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') &&
-                      # 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");
+        if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) {
+           if ($sym =~ /\W/) {
+               # time for a more-detailed check-up
+               if ($sym =~ /^\w+[[{].*[]}]$/) {
+                   require Carp;
+                   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'))) {
+                   require Carp;
+                   Carp::croak("'$_' is not a valid variable name under strict vars");
+               }
            }
+           $sym = "${callpack}::$sym" unless $sym =~ /::/;
+           *$sym =
+               (  $ch eq "\$" ? \$$sym
+                : $ch eq "\@" ? \@$sym
+                : $ch eq "\%" ? \%$sym
+                : $ch eq "\*" ? \*$sym
+                : $ch eq "\&" ? \&$sym 
+                : do {
+                    require Carp;
+                    Carp::croak("'$_' is not a valid variable name");
+                });
+       } else {
+           require Carp;
+           Carp::croak("'$_' is not a valid variable name");
        }
-       $sym = "${callpack}::$sym" unless $sym =~ /::/;
-        *$sym =
-          (  $ch eq "\$" ? \$$sym
-           : $ch eq "\@" ? \@$sym
-           : $ch eq "\%" ? \%$sym
-           : $ch eq "\*" ? \*$sym
-           : $ch eq "\&" ? \&$sym
-           : do {
-               require Carp;
-               Carp::croak("'$_' is not a valid variable name");
-            });
     }
 };