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=dba5c8c8b1c21e0222f9115660476edf0ac62f41;hp=0cc4b71189be39042016975c5980e109b2d3dcc2;hb=733f404b1631c344ec33fc9b23a90558cf06d781;hpb=6b82419ec75280b7ec2bd39e574dba85c0df589e

diff --git a/lib/Mouse/Meta/Class.pm b/lib/Mouse/Meta/Class.pm
index 0cc4b71..dba5c8c 100644
--- a/lib/Mouse/Meta/Class.pm
+++ b/lib/Mouse/Meta/Class.pm
@@ -6,12 +6,19 @@ use Scalar::Util qw/blessed weaken/;
 use Mouse::Meta::Module;
 our @ISA = qw(Mouse::Meta::Module);
 
-sub method_metaclass;
 sub attribute_metaclass;
+sub method_metaclass;
 
 sub constructor_class;
 sub destructor_class;
 
+my @MetaClassTypes = qw(
+    attribute_metaclass
+    method_metaclass
+    constructor_class
+    destructor_class
+);
+
 sub _construct_meta {
     my($class, %args) = @_;
 
@@ -71,18 +78,11 @@ 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) = @_;
 
+    # find incompatible traits
     my @incompatibles;
-
     foreach my $metaclass_type(@MetaClassTypes){
         my $super_c = $super_meta->$metaclass_type();
         my $self_c  = $self->$metaclass_type();
@@ -92,11 +92,25 @@ sub _reconcile_with_superclass_meta {
         }
     }
 
-    $super_meta->reinitialize($self, @incompatibles);
+    my @roles;
+    foreach my $role($super_meta->meta->calculate_all_roles){
+        if(!$self->meta->does_role($role->name)){
+            push @roles, $role->name;
+        }
+    }
+
+    #print "reconcile($self vs. $super_meta; @roles; @incompatibles)\n";
+
+    require Mouse::Util::MetaRole;
+    Mouse::Util::MetaRole::apply_metaclass_roles(
+        for_class       => $self,
+        metaclass       => ref $super_meta,
+        metaclass_roles => \@roles,
+        @incompatibles,
+    );
     return;
 }
 
-
 sub find_method_by_name{
     my($self, $method_name) = @_;
     defined($method_name)
@@ -179,9 +193,9 @@ sub add_attribute {
     return $attr;
 }
 
-sub compute_all_applicable_attributes {
-    Carp::cluck('compute_all_applicable_attributes() has been deprecated')
-        if Mouse::Util::_MOUSE_VERBOSE;
+sub compute_all_applicable_attributes { # DEPRECATED
+    Carp::cluck('compute_all_applicable_attributes() has been deprecated. Use get_all_attributes() instead');
+
     return shift->get_all_attributes(@_)
 }
 
@@ -192,33 +206,41 @@ sub new_object;
 sub clone_object {
     my $class  = shift;
     my $object = shift;
-    my %params = (@_ == 1) ? %{$_[0]} : @_;
+    my $args   = $object->Mouse::Object::BUILDARGS(@_);
 
     (blessed($object) && $object->isa($class->name))
         || $class->throw_error("You must pass an instance of the metaclass (" . $class->name . "), not ($object)");
 
     my $cloned = bless { %$object }, ref $object;
-    $class->_initialize_object($cloned, \%params);
+    $class->_initialize_object($cloned, $args);
 
     return $cloned;
 }
 
-sub clone_instance {
+sub clone_instance { # DEPRECATED
     my ($class, $instance, %params) = @_;
 
-    Carp::cluck('clone_instance has been deprecated. Use clone_object instead')
-        if Mouse::Util::_MOUSE_VERBOSE;
+    Carp::cluck('clone_instance() has been deprecated. Use clone_object() instead');
+
     return $class->clone_object($instance, %params);
 }
 
-sub make_immutable {
-    my $self = shift;
-    my %args = (
+
+sub immutable_options {
+    my ( $self, @args ) = @_;
+
+    return (
         inline_constructor => 1,
         inline_destructor  => 1,
         constructor_name   => 'new',
-        @_,
+        @args,
     );
+}
+
+
+sub make_immutable {
+    my $self = shift;
+    my %args = $self->immutable_options(@_);
 
     $self->{is_immutable}++;
 
@@ -241,10 +263,14 @@ sub make_immutable {
     return 1;
 }
 
-sub make_mutable { not_supported }
+sub make_mutable {
+    my($self) = @_;
+    $self->{is_immutable} = 0;
+    return;
+}
 
-sub is_immutable {  $_[0]->{is_immutable} }
-sub is_mutable   { !$_[0]->{is_immutable} }
+sub is_immutable;
+sub is_mutable   { !$_[0]->is_immutable }
 
 sub _install_modifier_pp{
     my( $self, $type, $name, $code ) = @_;
@@ -318,7 +344,7 @@ sub _install_modifier {
     # load Class::Method::Modifiers first
     my $no_cmm_fast = do{
         local $@;
-        eval q{ require Class::Method::Modifiers::Fast };
+        eval q{ use Class::Method::Modifiers::Fast 0.041 () };
         $@;
     };
 
@@ -327,7 +353,7 @@ sub _install_modifier {
         $impl = \&_install_modifier_pp;
     }
     else{
-        my $install_modifier = Class::Method::Modifiers::Fast->can('_install_modifier');
+        my $install_modifier = Class::Method::Modifiers::Fast->can('install_modifier');
         $impl = sub {
             my ( $self, $type, $name, $code ) = @_;
             my $into = $self->name;
@@ -435,7 +461,7 @@ Mouse::Meta::Class - The Mouse class metaclass
 
 =head1 VERSION
 
-This document describes Mouse version 0.40_07
+This document describes Mouse version 0.49
 
 =head1 METHODS
 
@@ -518,52 +544,6 @@ 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>