More leniency to the \p and \P: now can have whitespace

[perl5.git] / lib / base.pm

diff --git a/lib/base.pm b/lib/base.pm
index 9a733ea..c6d8cca 100644 (file)
--- a/lib/base.pm
+++ b/lib/base.pm
@@ -30,7 +30,7 @@ C<require>s them.  Whether to C<require> a base class package is
 determined by the absence of a global $VERSION in the base package.
 If $VERSION is not detected even after loading it, <base> will
 define $VERSION in the base package, setting it to the string
-C<-1, defined by base.pm>.
+C<-1, set by base.pm>.
 
 =head1 HISTORY
 
@@ -43,27 +43,32 @@ L<fields>
 =cut
 
 package base;
-use vars qw($VERSION);
-$VERSION = "1.00";
+
+use 5.006_001;
+our $VERSION = "1.02";
 
 sub import {
     my $class = shift;
     my $fields_base;
+    my $pkg = caller(0);
 
     foreach my $base (@_) {
-       unless (exists ${"$base\::"}{VERSION}) {
+       next if $pkg->isa($base);
+       push @{"$pkg\::ISA"}, $base;
+        my $vglob;
+       unless (${*{"$base\::VERSION"}{SCALAR}}) {
            eval "require $base";
            # Only ignore "Can't locate" errors from our eval require.
            # Other fatal errors (syntax etc) must be reported.
            die if $@ && $@ !~ /^Can't locate .*? at \(eval /;
-           unless (defined %{"$base\::"}) {
+           unless (%{"$base\::"}) {
                require Carp;
                Carp::croak("Base class package \"$base\" is empty.\n",
                            "\t(Perhaps you need to 'use' the module ",
                            "which defines that package first.)");
            }
            ${"$base\::VERSION"} = "-1, set by base.pm"
-               unless exists ${"$base\::"}{VERSION};
+               unless ${*{"$base\::VERSION"}{SCALAR}};
        }
 
        # A simple test like (defined %{"$base\::FIELDS"}) will
@@ -79,8 +84,6 @@ sub import {
            }
        }
     }
-    my $pkg = caller(0);
-    push @{"$pkg\::ISA"}, @_;
     if ($fields_base) {
        require fields;
        fields::inherit($pkg, $fields_base);