Remove Configure code that supported the old-style nested layout for ext/

[perl5.git] / lib / vars.pm

diff --git a/lib/vars.pm b/lib/vars.pm
index 233979d..6ca6bb4 100644 (file)
--- a/lib/vars.pm
+++ b/lib/vars.pm
@@ -2,46 +2,44 @@ package vars;
 
 use 5.006;
 
 
 use 5.006;
 

-our $VERSION = '1.01';
+our $VERSION = '1.03';

 
 use warnings::register;
 use strict qw(vars subs);
 
 sub import {
     my $callpack = caller;
 
 use warnings::register;
 use strict qw(vars subs);
 
 sub import {
     my $callpack = caller;

-    my ($pack, @imports) = @_;
+    my (undef, @imports) = @_;

     my ($sym, $ch);
     foreach (@imports) {
     my ($sym, $ch);
     foreach (@imports) {

-       # TODO: UTF-8 names: (the unpack is quite wrong,
-       # /^(.)(.*)/ would probably be better.)  While you
-       # are at it, until declaring empty package is made
-       # to work the * is too lenient.
-        ($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'))) {
-               # TODO: UTF-8 names: be careful to load the UTF-8
-               # machinery only if the symbol requires it.
-               require Carp;
-               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");
-            });

     }
 };
 
     }
 };
 


@@ -50,7 +48,7 @@ __END__
 
 =head1 NAME
 
 
 =head1 NAME
 

-vars - Perl pragma to predeclare global variable names (obsolete)
+vars - Perl pragma to predeclare global variable names

 
 =head1 SYNOPSIS
 
 
 =head1 SYNOPSIS
 


@@ -58,9 +56,10 @@ vars - Perl pragma to predeclare global variable names (obsolete)
 
 =head1 DESCRIPTION
 
 
 =head1 DESCRIPTION
 

-NOTE: For variables in the current package, 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>.
+NOTE: For use with variables in the current package for a single scope, the
+functionality provided by this pragma has been superseded by C<our>
+declarations, available in Perl v5.6.0 or later, and use of this pragma is
+discouraged.  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
 
 This will predeclare all the variables whose names are 
 in the list, allowing you to use them under "use strict", and