The lib/Cwd.pm diet part of

[p5sagit/p5-mst-13.2.git] / lib / base.pm

diff --git a/lib/base.pm b/lib/base.pm
index b8d210e..9b34398 100644 (file)
--- a/lib/base.pm
+++ b/lib/base.pm
@@ -22,15 +22,15 @@ it.  Multiple inheritance of %FIELDS is not supported.  The 'base'
 pragma will croak if multiple base classes have a %FIELDS hash.  See
 L<fields> for a description of this feature.
 
-When strict 'vars' is in scope I<base> also let you assign to @ISA
+When strict 'vars' is in scope, I<base> also lets you assign to @ISA
 without having to declare @ISA with the 'vars' pragma first.
 
 If any of the base classes are not loaded yet, I<base> silently
-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<require>s them (but it won't call the C<import> method).  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, I<base> will define $VERSION in the base package, setting it to
+the string C<-1, set by base.pm>.
 
 =head1 HISTORY
 
@@ -44,38 +44,33 @@ L<fields>
 
 package base;
 
-use 5.005_64;
-our $VERSION = "1.01";
+use 5.006_001;
+our $VERSION = "1.04";
 
 sub import {
     my $class = shift;
     my $fields_base;
     my $pkg = caller(0);
 
-    my @attrs;
-    my $isa = \@{"$pkg\::ISA"};
-
     foreach my $base (@_) {
-        if ($base =~ /^[-+]/) { #attribute
-            push @attrs, $base;
-            next;
-        }
        next if $pkg->isa($base);
-       push @$isa, $base;
-       unless (exists ${"$base\::"}{VERSION}) {
+        my $vglob;
+       if ($vglob = ${"$base\::"}{VERSION} and *$vglob{SCALAR}) {
+          $$vglob = "-1, set by base.pm" unless defined $$vglob;
+        } else {
            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 /;
+           die if $@ && $@ !~ /^Can't locate .*? at \(eval /;
            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};
+           ${"$base\::VERSION"} = "-1, set by base.pm" unless defined ${"$base\::VERSION"};
        }
+       push @{"$pkg\::ISA"}, $base;
 
        # A simple test like (defined %{"$base\::FIELDS"}) will
        # sometimes produce typo warnings because it would create
@@ -94,10 +89,6 @@ sub import {
        require fields;
        fields::inherit($pkg, $fields_base);
     }
-    if (@attrs) {
-        require attributes;
-        attributes::->import($pkg, $isa, @attrs);
-    }
 }
 
 1;