X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole%2FApplication%2FToRole.pm;h=844c4f283998aa8f88511c580be961f2ac1dac06;hb=75d2da3428d70afc00efb0f295fd0656a05d6b9f;hp=3210b6de860af3a51a6ac14acb42b322deaee729;hpb=6302a7e870c9ed9bce511891a74e5bdd140fcc74;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Role/Application/ToRole.pm b/lib/Moose/Meta/Role/Application/ToRole.pm index 3210b6d..844c4f2 100644 --- a/lib/Moose/Meta/Role/Application/ToRole.pm +++ b/lib/Moose/Meta/Role/Application/ToRole.pm @@ -6,16 +6,16 @@ use metaclass; use Scalar::Util 'blessed'; -our $VERSION = '0.73_02'; +our $VERSION = '0.77'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use base 'Moose::Meta::Role::Application'; sub apply { - my ($self, $role1, $role2) = @_; - $self->SUPER::apply($role1, $role2); - $role2->add_role($role1); + my ($self, $role1, $role2) = @_; + $self->SUPER::apply($role1, $role2); + $role2->add_role($role1); } sub check_role_exclusions { @@ -36,16 +36,16 @@ sub check_role_exclusions { sub check_required_methods { my ($self, $role1, $role2) = @_; foreach my $required_method_name ($role1->get_required_method_list) { - + next if $self->is_aliased_method($required_method_name); - + $role2->add_required_methods($required_method_name) unless $role2->find_method_by_name($required_method_name); } } sub check_required_attributes { - + } sub apply_attributes { @@ -95,10 +95,10 @@ sub apply_methods { } next; - } - - next if $self->is_method_excluded($method_name); - + } + + next if $self->is_method_excluded($method_name); + # it if it has one already if ($role2->has_method($method_name) && # and if they are not the same thing ... @@ -113,9 +113,9 @@ sub apply_methods { $method_name, $role1->get_method($method_name) ); - + } - + } }