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

diff --git a/lib/base.pm b/lib/base.pm
index 7fb3d2b..c6d8cca 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,20 @@ 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.
@@ -63,7 +68,7 @@ sub import {
 			    "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);