X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FClass.pm;h=beaeee561fffc35b7022daaf7184b61db101c615;hb=95ecd6f132112c6763cdaf2e6bc72c39e9ab76b5;hp=ea36a4beed88297d2f8fa19959af62805b24e10f;hpb=8d59c7239b90bb75b0187decbed09c6952e2b4a5;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Class.pm b/lib/Mouse/Meta/Class.pm
index ea36a4b..beaeee5 100644
--- a/lib/Mouse/Meta/Class.pm
+++ b/lib/Mouse/Meta/Class.pm
@@ -48,7 +48,13 @@ sub superclasses {
     my $self = shift;
 
     if (@_) {
-        Mouse::load_class($_) for @_;
+        foreach my $super(@_){
+            Mouse::Util::load_class($super);
+            my $meta = Mouse::Util::get_metaclass_by_name($super);
+            if($meta && $meta->isa('Mouse::Meta::Role')){
+                $self->throw_error("You cannot inherit from a Mouse Role ($super)");
+            }
+        }
         @{ $self->{superclasses} } = @_;
     }
 
@@ -363,12 +369,8 @@ sub _install_modifier {
         $impl = sub {
             my ( $self, $type, $name, $code ) = @_;
             my $into = $self->name;
-            $install_modifier->(
-                $into,
-                $type,
-                $name,
-                $code
-            );
+            $install_modifier->($into, $type, $name, $code);
+
             $self->add_method($name => do{
                 no strict 'refs';
                 \&{ $into . '::' . $name };
@@ -450,8 +452,8 @@ sub does_role {
         || $self->throw_error("You must supply a role name to look for");
 
     for my $class ($self->linearized_isa) {
-        my $meta = Mouse::Util::get_metaclass_by_name($class);
-        next unless $meta && $meta->can('roles');
+        my $meta = Mouse::Util::get_metaclass_by_name($class)
+            or next;
 
         for my $role (@{ $meta->roles }) {
 
@@ -463,7 +465,6 @@ sub does_role {
 }
 
 1;
-
 __END__
 
 =head1 NAME