use List::MoreUtils qw( any all uniq first_index );
use Scalar::Util 'weaken', 'blessed';
-our $VERSION = '0.89_01';
+our $VERSION = '0.93';
$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
);
}
+sub reinitialize {
+ my $self = shift;
+ my $pkg = shift;
+
+ my $meta = blessed $pkg ? $pkg : Class::MOP::class_of($pkg);
+
+ my %existing_classes;
+ if ($meta) {
+ %existing_classes = map { $_ => $meta->$_() } qw(
+ attribute_metaclass
+ method_metaclass
+ wrapped_method_metaclass
+ instance_metaclass
+ constructor_class
+ destructor_class
+ error_class
+ );
+ }
+
+ return $self->SUPER::reinitialize(
+ $pkg,
+ %existing_classes,
+ @_,
+ );
+}
+
sub _immutable_options {
my ( $self, @args ) = @_;
$self->SUPER::_immutable_options(
- allow_mutable_ancestors => 0,
inline_destructor => 1,
# Moose always does this when an attribute is created
push @{$self->roles} => $role;
}
-sub make_immutable {
- my $self = shift;
- my %args = @_;
-
- # we do this for metaclasses way too often to do this check for them
- if ( !$args{allow_mutable_ancestors}
- && !$self->name->isa('Class::MOP::Object') ) {
- my @superclasses = grep { $_ ne 'Moose::Object' && $_ ne $self->name }
- $self->linearized_isa;
-
- for my $superclass (@superclasses) {
- my $meta = Class::MOP::class_of($superclass);
-
- next unless $meta && $meta->isa('Moose::Meta::Class');
- next unless $meta->is_mutable;
- # This can happen when a base class role is applied via
- # Moose::Util::MetaRole::apply_base_class_roles. The parent is an
- # anon class and is still mutable, but that's okay.
- next if $meta->is_anon_class;
-
- Carp::cluck( "Calling make_immutable on "
- . $self->name
- . ", which has a mutable ancestor ($superclass)" );
- last;
- }
- }
-
- $self->SUPER::make_immutable(@_);
-}
-
sub role_applications {
my ($self) = @_;
sub _fix_metaclass_incompatibility {
my ($self, @superclasses) = @_;
- foreach my $super (@superclasses) {
- my $meta = Class::MOP::Class->initialize($super);
-
- my @all_supers = $meta->linearized_isa;
- shift @all_supers;
-
- my @super_metas_to_fix = ($meta);
-
- # We need to check & fix the immediate superclass. If its @ISA
- # contains a class without a metaclass instance, followed by a
- # class _with_ a metaclass instance, init a metaclass instance
- # for classes without one and fix compat up to and including
- # the class which was already initialized.
- my $idx = first_index { Class::MOP::class_of($_) } @all_supers;
-
- push @super_metas_to_fix,
- map { Class::MOP::Class->initialize($_) } @all_supers[ 0 .. $idx ]
- if $idx >= 0;
-
- foreach my $super_meta (@super_metas_to_fix) {
- $self->_fix_one_incompatible_metaclass($super_meta);
- }
- }
+ $self->_fix_one_incompatible_metaclass($_)
+ for map { Moose::Meta::Class->initialize($_) } @superclasses;
}
sub _fix_one_incompatible_metaclass {
my $super_meta_name
= $super_meta->is_immutable
- ? $super_meta->get_mutable_metaclass_name
+ ? $super_meta->_get_mutable_metaclass_name
: ref($super_meta);
return 1
my $super_meta_name
= $super_meta->is_immutable
- ? $super_meta->get_mutable_metaclass_name
+ ? $super_meta->_get_mutable_metaclass_name
: ref($super_meta);
my $self_metaclass = ref $self;
Also, since Moose always inlines attributes, it sets the
C<inline_accessors> option to false.
-It also accepts the additional C<allow_mutable_ancestors> option, to
-silence the warning you get when trying to make a class with mutable
-ancestors immutable.
-
=item B<< $metaclass->new_object(%params) >>
This overrides the parent's method in order to add support for
=head1 COPYRIGHT AND LICENSE
-Copyright 2006-2009 by Infinity Interactive, Inc.
+Copyright 2006-2010 by Infinity Interactive, Inc.
L<http://www.iinteractive.com>