X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fbase.pm;h=3cb42f5bfa2ffde7b57f4500b06b853462e440f6;hb=f41820981f84708ef067a8bea41c79da755543c1;hp=e20a64bc9a4bbd113eb773b8742d3f16bc86dd5a;hpb=fb73857aa0bfa8ed43d4d2f972c564c70a57e0c4;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/base.pm b/lib/base.pm
index e20a64b..3cb42f5 100644
--- a/lib/base.pm
+++ b/lib/base.pm
@@ -5,7 +5,6 @@ base - Establish IS-A relationship with base class at compile time
 =head1 SYNOPSIS
 
     package Baz;
-
     use base qw(Foo Bar);
 
 =head1 DESCRIPTION
@@ -18,32 +17,76 @@ Roughly similar in effect to
 	push @ISA, qw(Foo Bar);
     }
 
+Will also initialize the %FIELDS hash if one of the base classes has
+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
+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>.
+
+=head1 HISTORY
+
 This module was introduced with Perl 5.004_04.
 
-=head1 BUGS
+=head1 SEE ALSO
 
-Needs proper documentation!
+L<fields>
 
 =cut
 
 package base;
 
+use 5.005_64;
+our $VERSION = "1.01";
+
 sub import {
     my $class = shift;
+    my $fields_base;
+    my $pkg = caller(0);
 
     foreach my $base (@_) {
-	unless (defined %{"$base\::"}) {
+	next if $pkg->isa($base);
+	push @{"$pkg\::ISA"}, $base;
+	unless (exists ${"$base\::"}{VERSION}) {
 	    eval "require $base";
-	    unless (defined %{"$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 (%{"$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};
 	}
+
+	# A simple test like (defined %{"$base\::FIELDS"}) will
+	# sometimes produce typo warnings because it would create
+	# the hash if it was not present before.
+	my $fglob;
+	if ($fglob = ${"$base\::"}{"FIELDS"} and *$fglob{HASH}) {
+	    if ($fields_base) {
+		require Carp;
+		Carp::croak("Can't multiply inherit %FIELDS");
+	    } else {
+		$fields_base = $base;
+	    }
+	}
+    }
+    if ($fields_base) {
+	require fields;
+	fields::inherit($pkg, $fields_base);
     }
-    
-    push @{caller(0) . '::ISA'}, @_;
 }
 
 1;