X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fbase.pm;h=9c2135bfb6b4e6bbf8fbfa3bc59b1bc5c50ab266;hb=6a93515622cf0655623a39a9eaff82a4b9b3268b;hp=04a8aa961eae95f255fe239fab0792077b176142;hpb=45e8908fe5b88f920ab544783f3013f36f56fd48;p=p5sagit%2Fp5-mst-13.2.git
diff --git a/lib/base.pm b/lib/base.pm
index 04a8aa9..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.04';
+$VERSION = '2.07';
# constant.pm is slow
sub SUCCESS () { 1 }
@@ -38,11 +38,26 @@ sub get_attr {
return $Fattr->{$_[0]};
}
-sub get_fields {
- # Shut up a possible typo warning.
- () = \%{$_[0].'::FIELDS'};
+if ($] < 5.009) {
+ *get_fields = sub {
+ # Shut up a possible typo warning.
+ () = \%{$_[0].'::FIELDS'};
+ my $f = \%{$_[0].'::FIELDS'};
- return \%{$_[0].'::FIELDS'};
+ # should be centralized in fields? perhaps
+ # fields::mk_FIELDS_be_OK. Peh. As long as %{ $package . '::FIELDS' }
+ # is used here anyway, it doesn't matter.
+ bless $f, 'pseudohash' if (ref($f) ne 'pseudohash');
+
+ return $f;
+ }
+}
+else {
+ *get_fields = sub {
+ # Shut up a possible typo warning.
+ () = \%{$_[0].'::FIELDS'};
+ return \%{$_[0].'::FIELDS'};
+ }
}
sub import {
@@ -63,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.
@@ -82,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");
@@ -137,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;
}
}
@@ -178,11 +192,22 @@ it, 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 supported, if two or more
+Multiple inheritance of fields is B supported, if two or more
base classes each have inheritable fields the 'base' pragma will
croak. See L, L and L 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.