use strict;
use warnings FATAL => 'all';
-our $VERSION = '1.001002'; # 1.1.2
+our $VERSION = '1.002004'; # 1.2.4
$VERSION = eval $VERSION;
our %INFO;
warnings->import(FATAL => 'all');
return if $INFO{$target}; # already exported into this package
# get symbol table reference
- my $stash = do { no strict 'refs'; \%{"${target}::"} };
+ my $stash = _getstash($target);
# install before/after/around subs
foreach my $type (qw(before after around)) {
*{_getglob "${target}::${type}"} = sub {
require Class::Method::Modifiers;
push @{$INFO{$target}{modifiers}||=[]}, [ $type => @_ ];
+ return;
};
}
*{_getglob "${target}::requires"} = sub {
push @{$INFO{$target}{requires}||=[]}, @_;
+ return;
};
*{_getglob "${target}::with"} = sub {
$me->apply_roles_to_package($target, @_);
+ return;
};
# grab all *non-constant* (stash slot is not a scalarref) subs present
# in the symbol table and store their refaddrs (no need to forcibly
$me->_install_modifiers($to, $info->{modifiers});
- # only add does() method to classes and only if they don't have one
- if (not $INFO{$to} and not $to->can('does')) {
- *{_getglob "${to}::does"} = \&does_role;
- }
-
# copy our role list into the target's
@{$APPLIED_TO{$to}||={}}{keys %{$APPLIED_TO{$role}}} = ();
}
die "No roles supplied!" unless @roles;
+ _load_module($superclass);
{
my %seen;
$seen{$_}++ for @roles;
require MRO::Compat;
}
+ my %conflicts = %{$me->_composite_info_for(@roles)->{conflicts}};
+ if (keys %conflicts) {
+ my $fail =
+ join "\n",
+ map {
+ "Method name conflict for '$_' between roles "
+ ."'".join(' and ', sort values %{$conflicts{$_}})."'"
+ .", cannot apply these simultaneously to an object."
+ } keys %conflicts;
+ die $fail;
+ }
+
my @composable = map $me->_composable_package_for($_), reverse @roles;
*{_getglob("${new_name}::ISA")} = [ @composable, $superclass ];
do { my %h; @h{map @{$_->{requires}||[]}, @info} = (); keys %h }
);
- *{_getglob "${new_name}::does"} = \&does_role unless $new_name->can('does');
-
@{$APPLIED_TO{$new_name}||={}}{
map keys %{$APPLIED_TO{$_}}, @roles
} = ();
} keys %conflicts;
die $fail;
}
- delete $INFO{$to}{methods}; # reset since we're about to add methods
- $me->apply_role_to_package($to, $_) for @roles;
+
+ # the if guard here is essential since otherwise we accidentally create
+ # a $INFO for something that isn't a Role::Tiny (or Moo::Role) because
+ # autovivification hates us and wants us to die()
+ if ($INFO{$to}) {
+ delete $INFO{$to}{methods}; # reset since we're about to add methods
+ }
+
+ foreach my $role (@roles) {
+ $me->apply_single_role_to_package($to, $role);
+ }
$APPLIED_TO{$to}{join('|',@roles)} = 1;
}
sub _composite_info_for {
my ($me, @roles) = @_;
$COMPOSITE_INFO{join('|', sort @roles)} ||= do {
- _load_module($_) for @roles;
+ foreach my $role (@roles) {
+ _load_module($role);
+ }
my %methods;
foreach my $role (@roles) {
my $this_methods = $me->_concrete_methods_of($role);
return $composed_name if $COMPOSED{role}{$composed_name};
$me->_install_methods($composed_name, $role);
my $base_name = $composed_name.'::_BASE';
- *{_getglob("${composed_name}::ISA")} = [ $base_name ];
+ # Not using _getglob, since setting @ISA via the typeglob breaks
+ # inheritance on 5.10.0 if the stash has previously been accessed an
+ # then a method called on the class (in that order!), which
+ # ->_install_methods (with the help of ->_install_does) ends up doing.
+ { no strict 'refs'; @{"${composed_name}::ISA"} = ( $base_name ); }
my $modifiers = $INFO{$role}{modifiers}||[];
my @mod_base;
foreach my $modified (
my ($me, $role) = @_;
my $info = $INFO{$role};
# grab role symbol table
- my $stash = do { no strict 'refs'; \%{"${role}::"}};
+ my $stash = _getstash($role);
# reverse so our keys become the values (captured coderefs) in case
# they got copied or re-used since
- my $not_methods = { reverse %{$info->{not_methods}} };
+ my $not_methods = { reverse %{$info->{not_methods}||{}} };
$info->{methods} ||= +{
# grab all code entries that aren't in the not_methods list
map {
my $methods = $me->_concrete_methods_of($role);
# grab target symbol table
- my $stash = do { no strict 'refs'; \%{"${to}::"}};
+ my $stash = _getstash($to);
# determine already extant methods of target
my %has_methods;
no warnings 'once';
*{_getglob "${to}::${i}"} = $methods->{$i};
}
+
+ $me->_install_does($to);
}
sub _install_modifiers {
Class::Method::Modifiers::install_modifier(@args);
}
+my $FALLBACK = sub { 0 };
+sub _install_does {
+ my ($me, $to) = @_;
+
+ # only add does() method to classes
+ return if $INFO{$to};
+
+ # add does() only if they don't have one
+ *{_getglob "${to}::does"} = \&does_role unless $to->can('does');
+
+ return if ($to->can('DOES') and $to->can('DOES') != (UNIVERSAL->can('DOES') || 0));
+
+ my $existing = $to->can('DOES') || $to->can('isa') || $FALLBACK;
+ my $new_sub = sub {
+ my ($proto, $role) = @_;
+ Role::Tiny::does_role($proto, $role) or $proto->$existing($role);
+ };
+ no warnings 'redefine';
+ *{_getglob "${to}::DOES"} = $new_sub;
+}
+
sub does_role {
my ($proto, $role) = @_;
- return exists $APPLIED_TO{ref($proto)||$proto}{$role};
+ if ($] >= 5.010) {
+ require mro;
+ } else {
+ require MRO::Compat;
+ }
+ foreach my $class (@{mro::get_linear_isa(ref($proto)||$proto)}) {
+ return 1 if exists $APPLIED_TO{$class}{$role};
+ }
+ return 0;
}
1;
...
}
-will work for classes but to test a role, one must use ::does_role directly
+will work for classes but to test a role, one must use ::does_role directly.
+
+Additionally, Role::Tiny will override the standard Perl C<DOES> method
+for your class. However, if C<any> class in your class' inheritance
+heirarchy provides C<DOES>, then Role::Tiny will not override it.
=head1 METHODS
Mithaldu - Christian Walde (cpan:MITHALDU) <walde.christian@googlemail.com>
+ilmari - Dagfinn Ilmari Mannsåker (cpan:ILMARI) <ilmari@ilmari.org>
+
+tobyink - Toby Inkster (cpan:TOBYINK) <tobyink@cpan.org>
+
=head1 COPYRIGHT
Copyright (c) 2010-2012 the Role::Tiny L</AUTHOR> and L</CONTRIBUTORS>
projects / gitmo/Role-Tiny.git / blobdiff