X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fbase.pm;h=37f220f63a9641bc68eae51b062d49259587419a;hb=5fef21a34e2a36dc7c83d55110ccc5c57cc7d14d;hp=7fb3d2bcb97d6f05ba4bbe4843d7377cf6792658;hpb=c5be433b5c5658093bc9cae4434721a0b63e7a85;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/base.pm b/lib/base.pm
index 7fb3d2b..37f220f 100644
--- 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,15 +43,21 @@ L<fields>
 =cut
 
 package base;
-use vars qw($VERSION);
-$VERSION = "1.00";
+
+use 5.006_001;
+our $VERSION = "1.03";
 
 sub import {
     my $class = shift;
     my $fields_base;
+    my $pkg = caller(0);
 
     foreach my $base (@_) {
-	unless (exists ${"$base\::"}{VERSION}) {
+	next if $pkg->isa($base);
+        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.
@@ -62,9 +68,9 @@ sub import {
 			    "\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
@@ -79,8 +85,6 @@ sub import {
 	    }
 	}
     }
-    my $pkg = caller(0);
-    push @{"$pkg\::ISA"}, @_;
     if ($fields_base) {
 	require fields;
 	fields::inherit($pkg, $fields_base);