X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FTypeConstraint%2FRole.pm;h=0db193007ccbde52cad38f34410387e7b78cbcf2;hb=a3319906531cef2b41a87138e75461ced7a3394b;hp=cb5c7d716fafcfd9514b781fac696de6ceb183bb;hpb=baf46b9edc7dc3665c7eaf9d1684b157efb09e1a;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/TypeConstraint/Role.pm b/lib/Moose/Meta/TypeConstraint/Role.pm index cb5c7d7..0db1930 100644 --- a/lib/Moose/Meta/TypeConstraint/Role.pm +++ b/lib/Moose/Meta/TypeConstraint/Role.pm @@ -7,7 +7,7 @@ use metaclass; use Scalar::Util 'blessed'; use Moose::Util::TypeConstraints (); -our $VERSION = '0.72_01'; +our $VERSION = '0.73_01'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; @@ -50,7 +50,7 @@ sub parents { Moose::Util::TypeConstraints::find_type_constraint($_) || __PACKAGE__->new( role => $_, name => "__ANON__" ) - } @{ $self->role->meta->get_roles }, + } @{ Class::MOP::class_of($self->role)->get_roles }, ); } @@ -68,7 +68,7 @@ sub equals { sub is_a_type_of { my ($self, $type_or_name) = @_; - $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name); + my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name); ($self->equals($type) || $self->is_subtype_of($type_or_name)); } @@ -78,7 +78,7 @@ sub is_subtype_of { if ( not ref $type_or_name_or_role ) { # it might be a role - return 1 if $self->role->meta->does_role( $type_or_name_or_role ); + return 1 if Class::MOP::class_of($self->role)->does_role( $type_or_name_or_role ); } my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name_or_role); @@ -88,7 +88,7 @@ sub is_subtype_of { if ( $type->isa(__PACKAGE__) ) { # if $type_or_name_or_role isn't a role, it might be the TC name of another ::Role type # or it could also just be a type object in this branch - return $self->role->meta->does_role( $type->role ); + return Class::MOP::class_of($self->role)->does_role( $type->role ); } else { # the only other thing we are a subtype of is Object $self->SUPER::is_subtype_of($type);