# Therefore leaving it in indefinitely.
use MRO::Compat;
-use Carp;
+use Carp ();
-our $VERSION = 1.0007;
+our $VERSION = 1.0008;
my $invalid_class = qr/(?: \b:\b | \:{3,} | \:\:$ )/x;
return if ( *{"${f_class}::$_"}{CODE} );
}
-
# require always returns true on success
- eval { require($file) } or do {
+ # ill-behaved modules might very well obliterate $_
+ eval { local $_; require($file) } or do {
$@ = "Invalid class name '$f_class'" if $f_class =~ $invalid_class;
if ($class->can('throw_exception')) {
$class->throw_exception($@);
} else {
- croak $@;
+ Carp::croak $@;
}
};
my $class = shift;
my $target = shift;
- my %isa = map { $_ => 1 } ($target, @{mro::get_linear_isa($target)} );
-
for (reverse @_) {
no strict 'refs';
- unless ($isa{$_}++) {
- unshift ( @{"${target}::ISA"}, $_ );
- }
+ unshift ( @{"${target}::ISA"}, $_ )
+ unless ($target eq $_ || $target->isa($_));
}
mro::set_mro($target, 'c3');