X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FClass.pm;h=0cc4b71189be39042016975c5980e109b2d3dcc2;hp=ae69e32fb9fd1e5199ea870a8734e2fb13bf466d;hb=a17f63138ec09db5e362700f2ac72da67f104786;hpb=1e5823974a557bd35b4aa4a5c1d1aecf1e5483d2

diff --git a/lib/Mouse/Meta/Class.pm b/lib/Mouse/Meta/Class.pm
index ae69e32..0cc4b71 100644
--- a/lib/Mouse/Meta/Class.pm
+++ b/lib/Mouse/Meta/Class.pm
@@ -6,11 +6,11 @@ use Scalar::Util qw/blessed weaken/;
 use Mouse::Meta::Module;
 our @ISA = qw(Mouse::Meta::Module);
 
-sub method_metaclass()    { 'Mouse::Meta::Method'    }
-sub attribute_metaclass() { 'Mouse::Meta::Attribute' }
+sub method_metaclass;
+sub attribute_metaclass;
 
-sub constructor_class();
-sub destructor_class();
+sub constructor_class;
+sub destructor_class;
 
 sub _construct_meta {
     my($class, %args) = @_;
@@ -54,9 +54,16 @@ sub superclasses {
         foreach my $super(@_){
             Mouse::Util::load_class($super);
             my $meta = Mouse::Util::get_metaclass_by_name($super);
+
+            next if not defined $meta;
+
             if(Mouse::Util::is_a_metarole($meta)){
                 $self->throw_error("You cannot inherit from a Mouse Role ($super)");
             }
+
+            next if $self->isa(ref $meta); # _superclass_meta_is_compatible
+
+            $self->_reconcile_with_superclass_meta($meta);
         }
         @{ $self->{superclasses} } = @_;
     }
@@ -64,6 +71,32 @@ sub superclasses {
     return @{ $self->{superclasses} };
 }
 
+my @MetaClassTypes = qw(
+    attribute_metaclass
+    method_metaclass
+    constructor_class
+    destructor_class
+);
+
+sub _reconcile_with_superclass_meta {
+    my($self, $super_meta) = @_;
+
+    my @incompatibles;
+
+    foreach my $metaclass_type(@MetaClassTypes){
+        my $super_c = $super_meta->$metaclass_type();
+        my $self_c  = $self->$metaclass_type();
+
+        if(!$super_c->isa($self_c)){
+            push @incompatibles, ($metaclass_type => $super_c);
+        }
+    }
+
+    $super_meta->reinitialize($self, @incompatibles);
+    return;
+}
+
+
 sub find_method_by_name{
     my($self, $method_name) = @_;
     defined($method_name)
@@ -140,7 +173,7 @@ sub add_attribute {
     $self->{attributes}{$attr->name} = $attr;
     $attr->install_accessors();
 
-    if(_MOUSE_VERBOSE && !$attr->{associated_methods} && ($attr->{is} || '') ne 'bare'){
+    if(Mouse::Util::_MOUSE_VERBOSE && !$attr->{associated_methods} && ($attr->{is} || '') ne 'bare'){
         Carp::cluck(qq{Attribute (}.$attr->name.qq{) of class }.$self->name.qq{ has no associated methods (did you mean to provide an "is" argument?)});
     }
     return $attr;
@@ -148,21 +181,13 @@ sub add_attribute {
 
 sub compute_all_applicable_attributes {
     Carp::cluck('compute_all_applicable_attributes() has been deprecated')
-        if _MOUSE_VERBOSE;
+        if Mouse::Util::_MOUSE_VERBOSE;
     return shift->get_all_attributes(@_)
 }
 
 sub linearized_isa;
 
-sub new_object {
-    my $self = shift;
-    my %args = (@_ == 1 ? %{$_[0]} : @_);
-
-    my $object = bless {}, $self->name;
-
-    $self->_initialize_object($object, \%args);
-    return $object;
-}
+sub new_object;
 
 sub clone_object {
     my $class  = shift;
@@ -182,7 +207,7 @@ sub clone_instance {
     my ($class, $instance, %params) = @_;
 
     Carp::cluck('clone_instance has been deprecated. Use clone_object instead')
-        if _MOUSE_VERBOSE;
+        if Mouse::Util::_MOUSE_VERBOSE;
     return $class->clone_object($instance, %params);
 }
 
@@ -410,7 +435,7 @@ Mouse::Meta::Class - The Mouse class metaclass
 
 =head1 VERSION
 
-This document describes Mouse version 0.40_06
+This document describes Mouse version 0.40_07
 
 =head1 METHODS
 
@@ -493,8 +518,56 @@ metaclass.
 
 Throws an error with the given message.
 
+=head3 OTHER PUBLIC METHODS
+
+=head3 add_after_method_modifier
+
+=head3 add_around_method_modifier
+
+=head3 add_augment_method_modifier
+
+=head3 add_before_method_modifier
+
+=head3 add_override_method_modifier
+
+=head3 attribute_metaclass
+
+=head3 calculate_all_roles
+
+=head3 compute_all_applicable_attributes
+
+=head3 constructor_class
+
+=head3 create_anon_class
+
+=head3 destructor_class
+
+=head3 does_role
+
+=head3 find_attribute_by_name
+
+=head3 find_method_by_name
+
+=head3 get_all_method_names
+
+=head3 is_anon_class
+
+=head3 is_immutable
+
+=head3 is_mutable
+
+=head3 make_immutable
+
+=head3 make_mutable
+
+=head3 method_metaclass
+
+=head3 roles
+
 =head1 SEE ALSO
 
+L<Mouse::Meta::Module>
+
 L<Moose::Meta::Class>
 
 L<Class::MOP::Class>