X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FClass.pm;h=be957020151edfcc50bd9fb6c4d8e5686d698933;hb=7778ab1ec4652cd0c12f7004ad300cf714a334f0;hp=51c7d76b892178121b914c9d1caca63f94523b42;hpb=793458491cfc640b71f04684e2644c7ceeac648e;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Class.pm b/lib/Mouse/Meta/Class.pm
index 51c7d76..be95702 100644
--- a/lib/Mouse/Meta/Class.pm
+++ b/lib/Mouse/Meta/Class.pm
@@ -1,7 +1,7 @@
 package Mouse::Meta::Class;
 use Mouse::Util qw/:meta/; # enables strict and warnings
 
-use Scalar::Util qw/blessed weaken/;
+use Scalar::Util ();
 
 use Mouse::Meta::Module;
 our @ISA = qw(Mouse::Meta::Module);
@@ -56,38 +56,48 @@ sub superclasses {
     if (@_) {
         foreach my $super(@_){
             Mouse::Util::load_class($super);
-
             my $meta = Mouse::Util::get_metaclass_by_name($super);
-            unless(defined $meta) {
-                # checks if $super is a foreign class (i.e. non-Mouse class)
-                my $mm = $super->can('meta');
-                if(!($mm && $mm == \&Mouse::Util::meta)) {
-                    if($super->can('new') or $super->can('DESTROY')) {
-                        $self->inherit_from_foreign_class($super);
-                    }
-                }
-                next;
-            }
-
-            if(Mouse::Util::is_a_metarole($meta)){
-                $self->throw_error("You cannot inherit from a Mouse Role ($super)");
-            }
-
-            # checks and fixes in metaclass compatiility
-            next if $self->isa(ref $meta); # _superclass_meta_is_compatible
+            next if $self->verify_superclass($super, $meta);
             $self->_reconcile_with_superclass_meta($meta);
         }
-        @{ $self->{superclasses} } = @_;
+        return @{ $self->{superclasses} } = @_;
     }
 
     return @{ $self->{superclasses} };
 }
 
+sub verify_superclass {
+    my($self, $super, $super_meta) = @_;
+
+    if(defined $super_meta) {
+        if(Mouse::Util::is_a_metarole($super_meta)){
+            $self->throw_error("You cannot inherit from a Mouse Role ($super)");
+        }
+    }
+    else {
+        # The metaclass of $super is not initialized.
+        # i.e. it might be Mouse::Object, a mixin package (e.g. Exporter),
+        # or a foreign class including Moose classes.
+
+        # checks if $super is a foreign class (i.e. non-Mouse class)
+        # see also Mouse::Foreign::Meta::Role::Class
+        my $mm = $super->can('meta');
+        if(!($mm && $mm == \&Mouse::Util::meta)) {
+            if($super->can('new') or $super->can('DESTROY')) {
+                $self->inherit_from_foreign_class($super);
+            }
+        }
+        return 1; # always ok
+    }
+
+    return $self->isa(ref $super_meta); # checks metaclass compatibility
+}
+
 sub inherit_from_foreign_class {
     my($class, $super) = @_;
     Carp::carp("You inherit from non-Mouse class ($super),"
         . " but it is unlikely to work correctly."
-        . " Please concider to use MouseX::Foreign");
+        . " Please consider using MouseX::Foreign");
     return;
 }
 
@@ -194,7 +204,7 @@ sub add_attribute {
 
     my($attr, $name);
 
-    if(blessed $_[0]){
+    if(Scalar::Util::blessed($_[0])){
         $attr = $_[0];
 
         $attr->isa('Mouse::Meta::Attribute')
@@ -225,7 +235,7 @@ sub add_attribute {
         }
     }
 
-    weaken( $attr->{associated_class} = $self );
+    Scalar::Util::weaken( $attr->{associated_class} = $self );
 
     # install accessors first
     $attr->install_accessors();
@@ -461,7 +471,7 @@ Mouse::Meta::Class - The Mouse class metaclass
 
 =head1 VERSION
 
-This document describes Mouse version 0.73
+This document describes Mouse version 0.76
 
 =head1 DESCRIPTION