X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FRole.pm;h=e82690daa51aa3b3238507ef7a3557d3565a62ab;hb=05b9dc92e107117921170e662967d5d2101db21b;hp=95bdca80506de5774678f1d939cd7415b817a515;hpb=949ee85c1ccebed118189ac321fd4dbfbb95b769;p=gitmo%2FMouse.git diff --git a/lib/Mouse/Meta/Role.pm b/lib/Mouse/Meta/Role.pm index 95bdca8..e82690d 100644 --- a/lib/Mouse/Meta/Role.pm +++ b/lib/Mouse/Meta/Role.pm @@ -2,6 +2,7 @@ package Mouse::Meta::Role; use strict; use warnings; use Carp 'confess'; +use Mouse::Util; do { my %METACLASS_CACHE; @@ -107,7 +108,19 @@ sub apply { for my $name ($self->get_attribute_list) { next if $class->has_attribute($name); my $spec = $self->get_attribute($name); - Mouse::Meta::Attribute->create($class, $name, %$spec); + + my $metaclass = 'Mouse::Meta::Attribute'; + if ( my $metaclass_name = $spec->{metaclass} ) { + my $new_class = Mouse::Util::resolve_metaclass_alias( + 'Attribute', + $metaclass_name + ); + if ( $metaclass ne $new_class ) { + $metaclass = $new_class; + } + } + + $metaclass->create($class, $name, %$spec); } } else { # apply role to role @@ -188,7 +201,19 @@ sub combine_apply { for my $name ($self->get_attribute_list) { next if $class->has_attribute($name); my $spec = $self->get_attribute($name); - Mouse::Meta::Attribute->create($class, $name, %$spec); + + my $metaclass = 'Mouse::Meta::Attribute'; + if ( my $metaclass_name = $spec->{metaclass} ) { + my $new_class = Mouse::Util::resolve_metaclass_alias( + 'Attribute', + $metaclass_name + ); + if ( $metaclass ne $new_class ) { + $metaclass = $new_class; + } + } + + $metaclass->create($class, $name, %$spec); } } } else {