use List::MoreUtils qw( any all uniq first_index );
use Scalar::Util 'weaken', 'blessed';
-our $VERSION = '1.14';
+our $VERSION = '1.19';
$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
use Moose::Meta::Class::Immutable::Trait;
use Moose::Meta::Method::Constructor;
use Moose::Meta::Method::Destructor;
+use Moose::Meta::Method::Meta;
+use Moose::Util;
+use Class::MOP::MiniTrait;
use base 'Class::MOP::Class';
+Class::MOP::MiniTrait::apply(__PACKAGE__, 'Moose::Meta::Object::Trait');
+
__PACKAGE__->meta->add_attribute('roles' => (
reader => 'roles',
default => sub { [] }
return $ANON_CLASSES{$cache_key};
}
+ $options{weaken} = !$cache_ok
+ unless exists $options{weaken};
+
my $new_class = $self->SUPER::create_anon_class(%options);
- $ANON_CLASSES{$cache_key} = $new_class
- if $cache_ok;
+ if ($cache_ok) {
+ $ANON_CLASSES{$cache_key} = $new_class;
+ weaken($ANON_CLASSES{$cache_key});
+ }
return $new_class;
}
+sub _meta_method_class { 'Moose::Meta::Method::Meta' }
+
sub _anon_cache_key {
# Makes something like Super::Class|Super::Class::2=Role|Role::1
return join '=' => (
delete $ANON_CLASSES{$cache_key};
$ANON_CLASSES{$new_cache_key} = $new_meta;
+ weaken($ANON_CLASSES{$new_cache_key});
return $new_meta;
}
);
}
-sub _find_common_base {
- my $self = shift;
- my ($meta1, $meta2) = map { Class::MOP::class_of($_) } @_;
- return unless defined $meta1 && defined $meta2;
-
- # FIXME? This doesn't account for multiple inheritance (not sure
- # if it needs to though). For example, if somewhere in $meta1's
- # history it inherits from both ClassA and ClassB, and $meta2
- # inherits from ClassB & ClassA, does it matter? And what crazy
- # fool would do that anyway?
-
- my %meta1_parents = map { $_ => 1 } $meta1->linearized_isa;
-
- return first { $meta1_parents{$_} } $meta2->linearized_isa;
-}
-
-sub _get_ancestors_until {
- my $self = shift;
- my ($start_name, $until_name) = @_;
-
- my @ancestor_names;
- for my $ancestor_name (Class::MOP::class_of($start_name)->linearized_isa) {
- last if $ancestor_name eq $until_name;
- push @ancestor_names, $ancestor_name;
- }
- return @ancestor_names;
-}
-
-sub _is_role_only_subclass {
- my $self = shift;
- my ($meta_name) = @_;
- my $meta = Class::MOP::Class->initialize($meta_name);
- my @parent_names = $meta->superclasses;
-
- # XXX: don't feel like messing with multiple inheritance here... what would
- # that even do?
- return unless @parent_names == 1;
- my ($parent_name) = @parent_names;
- my $parent_meta = Class::MOP::Class->initialize($parent_name);
-
- my @roles = $meta->can('calculate_all_roles_with_inheritance')
- ? $meta->calculate_all_roles_with_inheritance
- : ();
-
- # loop over all methods that are a part of the current class
- # (not inherited)
- for my $method ( $meta->_get_local_methods ) {
- # always ignore meta
- next if $method->name eq 'meta';
- # we'll deal with attributes below
- next if $method->can('associated_attribute');
- # if the method comes from a role we consumed, ignore it
- next if $meta->can('does_role')
- && $meta->does_role($method->original_package_name);
- # FIXME - this really isn't right. Just because a modifier is
- # defined in a role doesn't mean it isn't _also_ defined in the
- # subclass.
- next if $method->isa('Class::MOP::Method::Wrapped')
- && (
- (!scalar($method->around_modifiers)
- || any { $_->has_around_method_modifiers($method->name) } @roles)
- && (!scalar($method->before_modifiers)
- || any { $_->has_before_method_modifiers($method->name) } @roles)
- && (!scalar($method->after_modifiers)
- || any { $_->has_after_method_modifiers($method->name) } @roles)
- );
-
- return 0;
- }
-
- # loop over all attributes that are a part of the current class
- # (not inherited)
- # FIXME - this really isn't right. Just because an attribute is
- # defined in a role doesn't mean it isn't _also_ defined in the
- # subclass.
- for my $attr (map { $meta->get_attribute($_) } $meta->get_attribute_list) {
- next if any { $_->has_attribute($attr->name) } @roles;
-
- return 0;
- }
-
- return 1;
-}
-
-sub _can_fix_class_metaclass_incompatibility_by_role_reconciliation {
- my $self = shift;
- my ($super_meta) = @_;
-
- my $super_meta_name = $super_meta->_real_ref_name;
-
- return $self->_classes_differ_by_roles_only(
- blessed($self),
- $super_meta_name,
- 'Moose::Meta::Class',
- );
-}
-
-sub _can_fix_single_metaclass_incompatibility_by_role_reconciliation {
- my $self = shift;
- my ($metaclass_type, $super_meta) = @_;
-
- my $class_specific_meta_name = $self->$metaclass_type;
- return unless $super_meta->can($metaclass_type);
- my $super_specific_meta_name = $super_meta->$metaclass_type;
- my %metaclasses = $self->_base_metaclasses;
-
- return $self->_classes_differ_by_roles_only(
- $class_specific_meta_name,
- $super_specific_meta_name,
- $metaclasses{$metaclass_type},
- );
-}
-
-sub _classes_differ_by_roles_only {
- my $self = shift;
- my ( $self_meta_name, $super_meta_name, $expected_ancestor ) = @_;
-
- my $common_base_name
- = $self->_find_common_base( $self_meta_name, $super_meta_name );
-
- # If they're not both moose metaclasses, and the cmop fixing couldn't do
- # anything, there's nothing more we can do. The $expected_ancestor should
- # always be a Moose metaclass name like Moose::Meta::Class or
- # Moose::Meta::Attribute.
- return unless defined $common_base_name;
- return unless $common_base_name->isa($expected_ancestor);
-
- my @super_meta_name_ancestor_names
- = $self->_get_ancestors_until( $super_meta_name, $common_base_name );
- my @class_meta_name_ancestor_names
- = $self->_get_ancestors_until( $self_meta_name, $common_base_name );
-
- return
- unless all { $self->_is_role_only_subclass($_) }
- @super_meta_name_ancestor_names,
- @class_meta_name_ancestor_names;
-
- return 1;
-}
-
-sub _role_differences {
- my $self = shift;
- my ($class_meta_name, $super_meta_name) = @_;
- my @super_role_metas = $super_meta_name->meta->can('calculate_all_roles_with_inheritance')
- ? $super_meta_name->meta->calculate_all_roles_with_inheritance
- : ();
- my @role_metas = $class_meta_name->meta->can('calculate_all_roles_with_inheritance')
- ? $class_meta_name->meta->calculate_all_roles_with_inheritance
- : ();
- my @differences;
- for my $role_meta (@role_metas) {
- push @differences, $role_meta
- unless any { $_->name eq $role_meta->name } @super_role_metas;
- }
- return @differences;
-}
-
-sub _reconcile_roles_for_metaclass {
- my $self = shift;
- my ($class_meta_name, $super_meta_name) = @_;
-
- my @role_differences = $self->_role_differences(
- $class_meta_name, $super_meta_name,
- );
-
- # handle the case where we need to fix compatibility between a class and
- # its parent, but all roles in the class are already also done by the
- # parent
- # see t/050/054.t
- return Class::MOP::class_of($super_meta_name)
- unless @role_differences;
-
- return Moose::Meta::Class->create_anon_class(
- superclasses => [$super_meta_name],
- roles => \@role_differences,
- cache => 1,
- );
-}
-
-sub _can_fix_metaclass_incompatibility_by_role_reconciliation {
- my $self = shift;
- my ($super_meta) = @_;
-
- return 1 if $self->_can_fix_class_metaclass_incompatibility_by_role_reconciliation($super_meta);
-
- my %base_metaclass = $self->_base_metaclasses;
- for my $metaclass_type (keys %base_metaclass) {
- next unless defined $self->$metaclass_type;
- return 1 if $self->_can_fix_single_metaclass_incompatibility_by_role_reconciliation($metaclass_type, $super_meta);
- }
-
- return;
-}
-
-sub _can_fix_metaclass_incompatibility {
- my $self = shift;
- return 1 if $self->_can_fix_metaclass_incompatibility_by_role_reconciliation(@_);
- return $self->SUPER::_can_fix_metaclass_incompatibility(@_);
-}
-
sub _fix_class_metaclass_incompatibility {
my $self = shift;
my ($super_meta) = @_;
$self->SUPER::_fix_class_metaclass_incompatibility(@_);
- if ($self->_can_fix_class_metaclass_incompatibility_by_role_reconciliation($super_meta)) {
+ if ($self->_class_metaclass_can_be_made_compatible($super_meta)) {
($self->is_pristine)
|| confess "Can't fix metaclass incompatibility for "
. $self->name
. " because it is not pristine.";
my $super_meta_name = $super_meta->_real_ref_name;
- my $class_meta_subclass_meta = $self->_reconcile_roles_for_metaclass(blessed($self), $super_meta_name);
- my $new_self = $class_meta_subclass_meta->name->reinitialize(
+ my $class_meta_subclass_meta_name = Moose::Util::_reconcile_roles_for_metaclass(blessed($self), $super_meta_name);
+ my $new_self = $class_meta_subclass_meta_name->reinitialize(
$self->name,
);
- $self->_replace_self( $new_self, $class_meta_subclass_meta->name );
+ $self->_replace_self( $new_self, $class_meta_subclass_meta_name );
}
}
$self->SUPER::_fix_single_metaclass_incompatibility(@_);
- if ($self->_can_fix_single_metaclass_incompatibility_by_role_reconciliation($metaclass_type, $super_meta)) {
+ if ($self->_single_metaclass_can_be_made_compatible($super_meta, $metaclass_type)) {
($self->is_pristine)
|| confess "Can't fix metaclass incompatibility for "
. $self->name
. " because it is not pristine.";
my $super_meta_name = $super_meta->_real_ref_name;
- my $class_specific_meta_subclass_meta = $self->_reconcile_roles_for_metaclass($self->$metaclass_type, $super_meta->$metaclass_type);
+ my $class_specific_meta_subclass_meta_name = Moose::Util::_reconcile_roles_for_metaclass($self->$metaclass_type, $super_meta->$metaclass_type);
my $new_self = $super_meta->reinitialize(
$self->name,
- $metaclass_type => $class_specific_meta_subclass_meta->name,
+ $metaclass_type => $class_specific_meta_subclass_meta_name,
);
$self->_replace_self( $new_self, $super_meta_name );
}
}
-
sub _replace_self {
my $self = shift;
my ( $new_self, $new_class) = @_;
# We need to replace the cached metaclass instance or else when it goes
# out of scope Class::MOP::Class destroy's the namespace for the
# metaclass's class, causing much havoc.
+ my $weaken = Class::MOP::metaclass_is_weak( $self->name );
Class::MOP::store_metaclass_by_name( $self->name, $self );
- Class::MOP::weaken_metaclass( $self->name ) if $self->is_anon_class;
+ Class::MOP::weaken_metaclass( $self->name ) if $weaken;
}
sub _process_attribute {
projects / gitmo/Moose.git / blobdiff