# can't just ->can('can') because a sub-package Foo::Bar::Baz
# creates a 'Baz::' key in Foo::Bar's symbol table
return 1 if grep !/::$/, keys %{_getstash($_[0])||{}};
- require "${proto}.pm";
+ { local $@; require "${proto}.pm"; }
return 1;
}
+{ # \[] is REF, not SCALAR. \v1 is VSTRING (thanks to doy for that one)
+ my %reftypes = map +($_ => 1), qw(SCALAR REF VSTRING);
+ sub _is_scalar_ref { $reftypes{ref($_[0])} }
+}
+
sub import {
my $target = caller;
my $me = shift;
# install before/after/around subs
foreach my $type (qw(before after around)) {
*{_getglob "${target}::${type}"} = sub {
- require Class::Method::Modifiers;
+ { local $@; require Class::Method::Modifiers; }
push @{$INFO{$target}{modifiers}||=[]}, [ $type => @_ ];
};
}
die "Only one role supported at a time by with" if @_ > 1;
$me->apply_role_to_package($target, $_[0]);
};
- # grab all *non-constant* (ref eq 'SCALAR') subs present
+ # grab all *non-constant* (stash slot is not a scalarref) subs present
# in the symbol table and store their refaddrs (no need to forcibly
# inflate constant subs into real subs) - also add '' to here (this
# is used later)
@{$INFO{$target}{not_methods}={}}{
- '', map { *$_{CODE}||() } grep !(ref eq 'SCALAR'), values %$stash
+ '', map { *$_{CODE}||() } grep !ref($_), values %$stash
} = ();
# a role does itself
$APPLIED_TO{$target} = { $target => undef };
}
if ($] >= 5.010) {
- require mro;
+ { local $@; require mro; }
} else {
- require MRO::Compat;
+ { local $@; require MRO::Compat; }
}
my @composable = map $me->_composable_package_for($_), reverse @roles;
) {
push @mod_base, "sub ${modified} { shift->next::method(\@_) }";
}
- eval(my $code = join "\n", "package ${base_name};", @mod_base);
- die "Evaling failed: $@\nTrying to eval:\n${code}" if $@;
+ {
+ local $@;
+ eval(my $code = join "\n", "package ${base_name};", @mod_base);
+ die "Evaling failed: $@\nTrying to eval:\n${code}" if $@;
+ }
$me->_install_modifiers($composed_name, $modifiers);
$COMPOSED{role}{$composed_name} = 1;
return $composed_name;
my $code = *{$stash->{$_}}{CODE};
# rely on the '' key we added in import for "no code here"
exists $not_methods->{$code||''} ? () : ($_ => $code)
- } grep !(ref($stash->{$_}) eq 'SCALAR'), keys %$stash
+ } grep !ref($stash->{$_}), keys %$stash
};
};
}
# determine already extant methods of target
my %has_methods;
@has_methods{grep
- +((ref($stash->{$_}) eq 'SCALAR') || (*{$stash->{$_}}{CODE})),
+ +(ref($stash->{$_}) || *{$stash->{$_}}{CODE}),
keys %$stash
} = ();