X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fbase.pm;h=9c2135bfb6b4e6bbf8fbfa3bc59b1bc5c50ab266;hb=6a93515622cf0655623a39a9eaff82a4b9b3268b;hp=cc0d3c6e6dd35151f71ddd57618331f0bbab5b9b;hpb=20a6717b3f0310570b661870c2455994a4ab8016;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/base.pm b/lib/base.pm
index cc0d3c6..9c2135b 100644
--- a/lib/base.pm
+++ b/lib/base.pm
@@ -2,7 +2,7 @@ package base;
 
 use strict 'vars';
 use vars qw($VERSION);
-$VERSION = '2.05';
+$VERSION = '2.07';
 
 # constant.pm is slow
 sub SUCCESS () { 1 }
@@ -78,7 +78,7 @@ sub import {
 	      unless defined ${$base.'::VERSION'};
         }
         else {
-            local $SIG{__DIE__} = 'IGNORE';
+            local $SIG{__DIE__};
             eval "require $base";
             # Only ignore "Can't locate" errors from our eval require.
             # Other fatal errors (syntax etc) must be reported.
@@ -97,7 +97,7 @@ ERROR
         push @{"$inheritor\::ISA"}, $base;
 
         if ( has_fields($base) || has_attr($base) ) {
-	    # No multiple fields inheritence *suck*
+	    # No multiple fields inheritance *suck*
 	    if ($fields_base) {
 		require Carp;
 		Carp::croak("Can't multiply inherit %FIELDS");
@@ -152,10 +152,9 @@ sub inherit_fields {
         }
     }
 
-    unless( keys %$bfields ) {
-        foreach my $idx (1..$#{$battr}) {
-            $dattr->[$idx] = $battr->[$idx] & INHERITED;
-        }
+    foreach my $idx (1..$#{$battr}) {
+	next if defined $dattr->[$idx];
+	$dattr->[$idx] = $battr->[$idx] & INHERITED;
     }
 }
 
@@ -193,11 +192,22 @@ it, <base> will define $VERSION in the base package, setting it to the string
 C<-1, set by base.pm>.
 
 Will also initialize the fields if one of the base classes has it.
-Multiple inheritence of fields is B<NOT> supported, if two or more
+Multiple inheritance of fields is B<NOT> supported, if two or more
 base classes each have inheritable fields the 'base' pragma will
 croak.  See L<fields>, L<public> and L<protected> for a description of
 this feature.
 
+=head1 DIAGNOSTICS
+
+=over 4
+
+=item Base class package "%s" is empty.
+
+base.pm was unable to require the base package, because it was not
+found in your path.
+
+=back
+
 =head1 HISTORY
 
 This module was introduced with Perl 5.004_04.