X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FClass.pm;h=ced2a76865c3ef778971cb9e92a729d60dd3d685;hb=50bc108bca305ced4df63a569c9b5f3474f71914;hp=44cf3268fb0a62c23976d8ff43466af27b8c8b05;hpb=d022f632fd6a270c5a76667a2c2b50ae367ed359;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Class.pm b/lib/Moose/Meta/Class.pm index 44cf326..ced2a76 100644 --- a/lib/Moose/Meta/Class.pm +++ b/lib/Moose/Meta/Class.pm @@ -6,13 +6,18 @@ use warnings; use Class::MOP; -use Carp 'confess'; -use Scalar::Util 'weaken', 'blessed', 'reftype'; +use Carp (); +use List::Util qw( first ); +use List::MoreUtils qw( any all uniq ); +use Scalar::Util 'weaken', 'blessed'; -our $VERSION = '0.11'; +our $VERSION = '0.59'; +$VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use Moose::Meta::Method::Overriden; +use Moose::Meta::Method::Augmented; +use Moose::Error::Default; use base 'Class::MOP::Class'; @@ -21,20 +26,90 @@ __PACKAGE__->meta->add_attribute('roles' => ( default => sub { [] } )); +__PACKAGE__->meta->add_attribute('constructor_class' => ( + accessor => 'constructor_class', + default => 'Moose::Meta::Method::Constructor', +)); + +__PACKAGE__->meta->add_attribute('destructor_class' => ( + accessor => 'destructor_class', + default => 'Moose::Meta::Method::Destructor', +)); + +__PACKAGE__->meta->add_attribute('error_class' => ( + accessor => 'error_class', + default => 'Moose::Error::Default', +)); + + sub initialize { my $class = shift; my $pkg = shift; - $class->SUPER::initialize($pkg, - 'attribute_metaclass' => 'Moose::Meta::Attribute', - 'method_metaclass' => 'Moose::Meta::Method', - 'instance_metaclass' => 'Moose::Meta::Instance', - @_); -} + return Class::MOP::get_metaclass_by_name($pkg) + || $class->SUPER::initialize($pkg, + 'attribute_metaclass' => 'Moose::Meta::Attribute', + 'method_metaclass' => 'Moose::Meta::Method', + 'instance_metaclass' => 'Moose::Meta::Instance', + @_ + ); +} + +sub create { + my ($self, $package_name, %options) = @_; + + (ref $options{roles} eq 'ARRAY') + || $self->throw_error("You must pass an ARRAY ref of roles", data => $options{roles}) + if exists $options{roles}; + my $roles = delete $options{roles}; + + my $class = $self->SUPER::create($package_name, %options); + + if ($roles) { + Moose::Util::apply_all_roles( $class, @$roles ); + } + + return $class; +} + +sub check_metaclass_compatibility { + my $self = shift; + + if ( my @supers = $self->superclasses ) { + $self->_fix_metaclass_incompatibility(@supers); + } + + $self->SUPER::check_metaclass_compatibility(@_); +} + +my %ANON_CLASSES; + +sub create_anon_class { + my ($self, %options) = @_; + + my $cache_ok = delete $options{cache}; + + # something like Super::Class|Super::Class::2=Role|Role::1 + my $cache_key = join '=' => ( + join('|', sort @{$options{superclasses} || []}), + join('|', sort @{$options{roles} || []}), + ); + + if ($cache_ok && defined $ANON_CLASSES{$cache_key}) { + return $ANON_CLASSES{$cache_key}; + } + + my $new_class = $self->SUPER::create_anon_class(%options); + + $ANON_CLASSES{$cache_key} = $new_class + if $cache_ok; + + return $new_class; +} sub add_role { my ($self, $role) = @_; (blessed($role) && $role->isa('Moose::Meta::Role')) - || confess "Roles must be instances of Moose::Meta::Role"; + || $self->throw_error("Roles must be instances of Moose::Meta::Role", data => $role); push @{$self->roles} => $role; } @@ -47,9 +122,9 @@ sub calculate_all_roles { sub does_role { my ($self, $role_name) = @_; (defined $role_name) - || confess "You must supply a role name to look for"; + || $self->throw_error("You must supply a role name to look for"); foreach my $class ($self->class_precedence_list) { - next unless $class->can('meta'); + next unless $class->can('meta') && $class->meta->can('roles'); foreach my $role (@{$class->meta->roles}) { return 1 if $role->does_role($role_name); } @@ -60,9 +135,15 @@ sub does_role { sub excludes_role { my ($self, $role_name) = @_; (defined $role_name) - || confess "You must supply a role name to look for"; - foreach my $class ($self->class_precedence_list) { - next unless $class->can('meta'); + || $self->throw_error("You must supply a role name to look for"); + foreach my $class ($self->class_precedence_list) { + next unless $class->can('meta'); + # NOTE: + # in the pretty rare instance when a Moose metaclass + # is itself extended with a role, this check needs to + # be done since some items in the class_precedence_list + # might in fact be Class::MOP based still. + next unless $class->meta->can('roles'); foreach my $role (@{$class->meta->roles}) { return 1 if $role->excludes_role($role_name); } @@ -71,66 +152,114 @@ sub excludes_role { } sub new_object { - my ($class, %params) = @_; - my $self = $class->SUPER::new_object(%params); - foreach my $attr ($class->compute_all_applicable_attributes()) { - # FIXME: - # this does not accept undefined - # values, nor does it accept false - # values to be passed into the init-arg - next unless $params{$attr->init_arg} && $attr->can('has_trigger') && $attr->has_trigger; - $attr->trigger->($self, $params{$attr->init_arg}, $attr); + my $class = shift; + my $params = @_ == 1 ? $_[0] : {@_}; + my $self = $class->SUPER::new_object($params); + + foreach my $attr ( $class->compute_all_applicable_attributes() ) { + + next unless $attr->can('has_trigger') && $attr->has_trigger; + + my $init_arg = $attr->init_arg; + + next unless defined $init_arg; + + next unless exists $params->{$init_arg}; + + $attr->trigger->( + $self, + ( + $attr->should_coerce + ? $attr->get_read_method_ref->($self) + : $params->{$init_arg} + ), + $attr + ); } - return $self; + + return $self; } sub construct_instance { - my ($class, %params) = @_; + my $class = shift; + my $params = @_ == 1 ? $_[0] : {@_}; my $meta_instance = $class->get_meta_instance; # FIXME: # the code below is almost certainly incorrect # but this is foreign inheritence, so we might - # have to kludge it in the end. - my $instance = $params{'__INSTANCE__'} || $meta_instance->create_instance(); - foreach my $attr ($class->compute_all_applicable_attributes()) { - $attr->initialize_instance_slot($meta_instance, $instance, \%params) + # have to kludge it in the end. + my $instance = $params->{'__INSTANCE__'} || $meta_instance->create_instance(); + foreach my $attr ($class->compute_all_applicable_attributes()) { + $attr->initialize_instance_slot($meta_instance, $instance, $params); } return $instance; } - # FIXME: # This is ugly -sub get_method_map { +sub get_method_map { my $self = shift; - my $map = $self->{'%!methods'}; - + + my $current = Class::MOP::check_package_cache_flag($self->name); + + if (defined $self->{'_package_cache_flag'} && $self->{'_package_cache_flag'} == $current) { + return $self->{'methods'}; + } + + $self->{_package_cache_flag} = $current; + + my $map = $self->{'methods'}; + my $class_name = $self->name; my $method_metaclass = $self->method_metaclass; - - foreach my $symbol ($self->list_all_package_symbols('CODE')) { - - my $code = $self->get_package_symbol('&' . $symbol); - - next if exists $map->{$symbol} && - defined $map->{$symbol} && - $map->{$symbol}->body == $code; - - my $gv = B::svref_2object($code)->GV; - - my $pkg = $gv->STASH->NAME; - if ($pkg->can('meta') && $pkg->meta && $pkg->meta->isa('Moose::Meta::Role')) { + + my %all_code = $self->get_all_package_symbols('CODE'); + + foreach my $symbol (keys %all_code) { + my $code = $all_code{$symbol}; + + next if exists $map->{$symbol} && + defined $map->{$symbol} && + $map->{$symbol}->body == $code; + + my ($pkg, $name) = Class::MOP::get_code_info($code); + + if ($pkg->can('meta') + # NOTE: + # we don't know what ->meta we are calling + # here, so we need to be careful cause it + # just might blow up at us, or just complain + # loudly (in the case of Curses.pm) so we + # just be a little overly cautious here. + # - SL + && eval { no warnings; blessed($pkg->meta) } + && $pkg->meta->isa('Moose::Meta::Role')) { #my $role = $pkg->meta->name; #next unless $self->does_role($role); } else { - next if ($gv->STASH->NAME || '') ne $class_name && - ($gv->NAME || '') ne '__ANON__'; + + # NOTE: + # in 5.10 constant.pm the constants show up + # as being in the right package, but in pre-5.10 + # they show up as constant::__ANON__ so we + # make an exception here to be sure that things + # work as expected in both. + # - SL + unless ($pkg eq 'constant' && $name eq '__ANON__') { + next if ($pkg || '') ne $class_name || + (($name || '') ne '__ANON__' && ($pkg || '') ne $class_name); + } + } - - $map->{$symbol} = $method_metaclass->wrap($code); + + $map->{$symbol} = $method_metaclass->wrap( + $code, + package_name => $class_name, + name => $symbol + ); } - + return $map; } @@ -138,63 +267,37 @@ sub get_method_map { sub add_attribute { my $self = shift; - my $name = shift; - if (scalar @_ == 1 && ref($_[0]) eq 'HASH') { - # NOTE: - # if it is a HASH ref, we de-ref it. - # this will usually mean that it is - # coming from a role - $self->SUPER::add_attribute($name => %{$_[0]}); - } - else { - # otherwise we just pass the args - $self->SUPER::add_attribute($name => @_); - } + $self->SUPER::add_attribute( + (blessed $_[0] && $_[0]->isa('Class::MOP::Attribute') + ? $_[0] + : $self->_process_attribute(@_)) + ); } sub add_override_method_modifier { my ($self, $name, $method, $_super_package) = @_; + (!$self->has_method($name)) - || confess "Cannot add an override method if a local method is already present"; - # need this for roles ... - $_super_package ||= $self->name; - my $super = $self->find_next_method_by_name($name); - (defined $super) - || confess "You cannot override '$name' because it has no super method"; - $self->add_method($name => Moose::Meta::Method::Overriden->wrap(sub { - my @args = @_; - no strict 'refs'; - no warnings 'redefine'; - local *{$_super_package . '::super'} = sub { $super->(@args) }; - return $method->(@args); - })); + || $self->throw_error("Cannot add an override method if a local method is already present"); + + $self->add_method($name => Moose::Meta::Method::Overriden->new( + method => $method, + class => $self, + package => $_super_package, # need this for roles + name => $name, + )); } sub add_augment_method_modifier { - my ($self, $name, $method) = @_; + my ($self, $name, $method) = @_; (!$self->has_method($name)) - || confess "Cannot add an augment method if a local method is already present"; - my $super = $self->find_next_method_by_name($name); - (defined $super) - || confess "You cannot augment '$name' because it has no super method"; - my $_super_package = $super->package_name; - # BUT!,... if this is an overriden method .... - if ($super->isa('Moose::Meta::Method::Overriden')) { - # we need to be sure that we actually - # find the next method, which is not - # an 'override' method, the reason is - # that an 'override' method will not - # be the one calling inner() - my $real_super = $self->_find_next_method_by_name_which_is_not_overridden($name); - $_super_package = $real_super->package_name; - } - $self->add_method($name => sub { - my @args = @_; - no strict 'refs'; - no warnings 'redefine'; - local *{$_super_package . '::inner'} = sub { $method->(@args) }; - return $super->(@args); - }); + || $self->throw_error("Cannot add an augment method if a local method is already present"); + + $self->add_method($name => Moose::Meta::Method::Augmented->new( + method => $method, + class => $self, + name => $name, + )); } ## Private Utility methods ... @@ -202,105 +305,292 @@ sub add_augment_method_modifier { sub _find_next_method_by_name_which_is_not_overridden { my ($self, $name) = @_; foreach my $method ($self->find_all_methods_by_name($name)) { - return $method->{code} + return $method->{code} if blessed($method->{code}) && !$method->{code}->isa('Moose::Meta::Method::Overriden'); } return undef; } -sub _fix_metaclass_incompatability { +sub _fix_metaclass_incompatibility { my ($self, @superclasses) = @_; + foreach my $super (@superclasses) { - # don't bother if it does not have a meta. - next unless $super->can('meta'); - # get the name, make sure we take - # immutable classes into account - my $super_meta_name = ($super->meta->is_immutable - ? $super->meta->get_mutable_metaclass_name - : blessed($super->meta)); - # if it's meta is a vanilla Moose, - # then we can safely ignore it. - next if $super_meta_name eq 'Moose::Meta::Class'; - # but if we have anything else, - # we need to check it out ... - unless (# see if of our metaclass is incompatible - ($self->isa($super_meta_name) && - # and see if our instance metaclass is incompatible - $self->instance_metaclass->isa($super->meta->instance_metaclass)) && - # ... and if we are just a vanilla Moose - $self->isa('Moose::Meta::Class')) { - # re-initialize the meta ... - my $super_meta = $super->meta; - # NOTE: - # We might want to consider actually - # transfering any attributes from the - # original meta into this one, but in - # general you should not have any there - # at this point anyway, so it's very - # much an obscure edge case anyway - $self = $super_meta->reinitialize($self->name => ( - 'attribute_metaclass' => $super_meta->attribute_metaclass, - 'method_metaclass' => $super_meta->method_metaclass, - 'instance_metaclass' => $super_meta->instance_metaclass, - )); + next if $self->_superclass_meta_is_compatible($super); + + unless ( $self->is_pristine ) { + $self->throw_error( + "Cannot attempt to reinitialize metaclass for " + . $self->name + . ", it isn't pristine" ); } + + $self->_reconcile_with_superclass_meta($super); } - return $self; } -sub _apply_all_roles { - my ($self, @roles) = @_; - ($_->can('meta') && $_->meta->isa('Moose::Meta::Role')) - || confess "You can only consume roles, $_ is not a Moose role" - foreach @roles; - if (scalar @roles == 1) { - $roles[0]->meta->apply($self); +sub _superclass_meta_is_compatible { + my ($self, $super) = @_; + + my $super_meta = Class::MOP::Class->initialize($super) + or return 1; + + next unless $super_meta->isa("Class::MOP::Class"); + + my $super_meta_name + = $super_meta->is_immutable + ? $super_meta->get_mutable_metaclass_name + : ref($super_meta); + + return 1 + if $self->isa($super_meta_name) + and + $self->instance_metaclass->isa( $super_meta->instance_metaclass ); +} + +# I don't want to have to type this >1 time +my @MetaClassTypes = + qw( attribute_metaclass method_metaclass instance_metaclass + constructor_class destructor_class error_class ); + +sub _reconcile_with_superclass_meta { + my ($self, $super) = @_; + + my $super_meta = $super->meta; + + my $super_meta_name + = $super_meta->is_immutable + ? $super_meta->get_mutable_metaclass_name + : ref($super_meta); + + my $self_metaclass = ref $self; + + # If neither of these is true we have a more serious + # incompatibility that we just cannot fix (yet?). + if ( $super_meta_name->isa( ref $self ) + && all { $super_meta->$_->isa( $self->$_ ) } @MetaClassTypes ) { + $self->_reinitialize_with($super_meta); } - else { - # FIXME - # we should make a Moose::Meta::Role::Composite - # which is a smaller version of Moose::Meta::Role - # which does not use any package stuff - Moose::Meta::Role->combine( - map { $_->meta } @roles - )->apply($self); - } + elsif ( $self->_all_metaclasses_differ_by_roles_only($super_meta) ) { + $self->_reconcile_role_differences($super_meta); + } +} + +sub _reinitialize_with { + my ( $self, $new_meta ) = @_; + + my $new_self = $new_meta->reinitialize( + $self->name, + attribute_metaclass => $new_meta->attribute_metaclass, + method_metaclass => $new_meta->method_metaclass, + instance_metaclass => $new_meta->instance_metaclass, + ); + + $new_self->$_( $new_meta->$_ ) + for qw( constructor_class destructor_class error_class ); + + %$self = %$new_self; + + bless $self, ref $new_self; + + # 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. + Class::MOP::store_metaclass_by_name( $self->name, $self ); + Class::MOP::weaken_metaclass( $self->name ) if $self->is_anon_class; +} + +# In the more complex case, we share a common ancestor with our +# superclass's metaclass, but each metaclass (ours and the parent's) +# has a different set of roles applied. We reconcile this by first +# reinitializing into the parent class, and _then_ applying our own +# roles. +sub _all_metaclasses_differ_by_roles_only { + my ($self, $super_meta) = @_; + + for my $pair ( + [ ref $self, ref $super_meta ], + map { [ $self->$_, $super_meta->$_ ] } @MetaClassTypes + ) { + + next if $pair->[0] eq $pair->[1]; + + my $self_meta_meta = Class::MOP::Class->initialize( $pair->[0] ); + my $super_meta_meta = Class::MOP::Class->initialize( $pair->[1] ); + + my $common_ancestor + = _find_common_ancestor( $self_meta_meta, $super_meta_meta ); + + return unless $common_ancestor; + + return + unless _is_role_only_subclass_of( + $self_meta_meta, + $common_ancestor, + ) + && _is_role_only_subclass_of( + $super_meta_meta, + $common_ancestor, + ); + } + + return 1; +} + +# This, and some other functions, could be called as methods, but +# they're not for two reasons. One, we just end up ignoring the first +# argument, because we can't call these directly on one of the real +# arguments, because one of them could be a Class::MOP::Class object +# and not a Moose::Meta::Class. Second, only a completely insane +# person would attempt to subclass this stuff! +sub _find_common_ancestor { + my ($meta1, $meta2) = @_; + + # FIXME? This doesn't account for multiple inheritance (not sure + # if it needs to though). For example, is somewhere in $meta1's + # history it inherits from both ClassA and ClassB, and $meta + # 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 _is_role_only_subclass_of { + my ($meta, $ancestor) = @_; + + return 1 if $meta->name eq $ancestor; + + my @roles = _all_roles_until( $meta, $ancestor ); + + my %role_packages = map { $_->name => 1 } @roles; + + my $ancestor_meta = Class::MOP::Class->initialize($ancestor); + + my %shared_ancestors = map { $_ => 1 } $ancestor_meta->linearized_isa; + + for my $method ( $meta->get_all_methods() ) { + next if $method->name eq 'meta'; + next if $method->can('associated_attribute'); + + next + if $role_packages{ $method->original_package_name } + || $shared_ancestors{ $method->original_package_name }; + + return 0; + } + + # 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 ( $meta->get_all_attributes ) { + next if $shared_ancestors{ $attr->associated_class->name }; + + next if any { $_->has_attribute( $attr->name ) } @roles; + + return 0; + } + + return 1; +} + +sub _all_roles { + my $meta = shift; + + return _all_roles_until($meta); +} + +sub _all_roles_until { + my ($meta, $stop_at_class) = @_; + + return unless $meta->can('calculate_all_roles'); + + my @roles = $meta->calculate_all_roles; + + for my $class ( $meta->linearized_isa ) { + last if $stop_at_class && $stop_at_class eq $class; + + my $meta = Class::MOP::Class->initialize($class); + last unless $meta->can('calculate_all_roles'); + + push @roles, $meta->calculate_all_roles; + } + + return uniq @roles; +} + +sub _reconcile_role_differences { + my ($self, $super_meta) = @_; + + my $self_meta = $self->meta; + + my %roles; + + if ( my @roles = map { $_->name } _all_roles($self_meta) ) { + $roles{metaclass_roles} = \@roles; + } + + for my $thing (@MetaClassTypes) { + my $name = $self->$thing(); + + my $thing_meta = Class::MOP::Class->initialize($name); + + my @roles = map { $_->name } _all_roles($thing_meta) + or next; + + $roles{ $thing . '_roles' } = \@roles; + } + + $self->_reinitialize_with($super_meta); + + Moose::Util::MetaRole::apply_metaclass_roles( + for_class => $self->name, + %roles, + ); + + return $self; +} + +# NOTE: +# this was crap anyway, see +# Moose::Util::apply_all_roles +# instead +sub _apply_all_roles { + Carp::croak 'DEPRECATED: use Moose::Util::apply_all_roles($meta, @roles) instead' } sub _process_attribute { - my ($self, $name, %options) = @_; - if ($name =~ /^\+(.*)/) { - my $new_attr = $self->_process_inherited_attribute($1, %options); - $self->add_attribute($new_attr); + my ( $self, $name, @args ) = @_; + + @args = %{$args[0]} if scalar @args == 1 && ref($args[0]) eq 'HASH'; + + if (($name || '') =~ /^\+(.*)/) { + return $self->_process_inherited_attribute($1, @args); } else { - if ($options{metaclass}) { - Class::MOP::load_class($options{metaclass}); - $self->add_attribute($options{metaclass}->new($name, %options)); - } - else { - $self->add_attribute($name, %options); - } - } + return $self->_process_new_attribute($name, @args); + } +} + +sub _process_new_attribute { + my ( $self, $name, @args ) = @_; + + $self->attribute_metaclass->interpolate_class_and_new($name, @args); } sub _process_inherited_attribute { my ($self, $attr_name, %options) = @_; my $inherited_attr = $self->find_attribute_by_name($attr_name); (defined $inherited_attr) - || confess "Could not find an attribute by the name of '$attr_name' to inherit from"; - my $new_attr; + || $self->throw_error("Could not find an attribute by the name of '$attr_name' to inherit from", data => $attr_name); if ($inherited_attr->isa('Moose::Meta::Attribute')) { - $new_attr = $inherited_attr->clone_and_inherit_options(%options); + return $inherited_attr->clone_and_inherit_options(%options); } else { # NOTE: # kind of a kludge to handle Class::MOP::Attributes - $new_attr = Moose::Meta::Attribute::clone_and_inherit_options( - $inherited_attr, %options - ); - } - return $new_attr; + return $inherited_attr->Moose::Meta::Attribute::clone_and_inherit_options(%options); + } } ## ------------------------------------------------- @@ -308,51 +598,98 @@ sub _process_inherited_attribute { use Moose::Meta::Method::Constructor; use Moose::Meta::Method::Destructor; -{ - # NOTE: - # the immutable version of a - # particular metaclass is - # really class-level data so - # we don't want to regenerate - # it any more than we need to - my $IMMUTABLE_METACLASS; - sub make_immutable { - my $self = shift; - - $IMMUTABLE_METACLASS ||= Class::MOP::Immutable->new($self, { - read_only => [qw/superclasses/], - cannot_call => [qw/ - add_method - alias_method - remove_method - add_attribute - remove_attribute - add_package_symbol - remove_package_symbol - add_role - /], - memoize => { - class_precedence_list => 'ARRAY', - compute_all_applicable_attributes => 'ARRAY', - get_meta_instance => 'SCALAR', - get_method_map => 'SCALAR', - # maybe .... - calculate_all_roles => 'ARRAY', - } - }); - - $IMMUTABLE_METACLASS->make_metaclass_immutable( - $self, - constructor_class => 'Moose::Meta::Method::Constructor', - destructor_class => 'Moose::Meta::Method::Destructor', - inline_destructor => 1, - # NOTE: - # no need to do this, - # Moose always does it - inline_accessors => 0, - @_, - ) +# This could be done by using SUPER and altering ->options +# I am keeping it this way to make it more explicit. +sub create_immutable_transformer { + my $self = shift; + my $class = Class::MOP::Immutable->new($self, { + read_only => [qw/superclasses/], + cannot_call => [qw/ + add_method + alias_method + remove_method + add_attribute + remove_attribute + remove_package_symbol + add_role + /], + memoize => { + class_precedence_list => 'ARRAY', + linearized_isa => 'ARRAY', # FIXME perl 5.10 memoizes this on its own, no need? + get_all_methods => 'ARRAY', + #get_all_attributes => 'ARRAY', # it's an alias, no need, but maybe in the future + compute_all_applicable_attributes => 'ARRAY', + get_meta_instance => 'SCALAR', + get_method_map => 'SCALAR', + calculate_all_roles => 'ARRAY', + }, + # NOTE: + # this is ugly, but so are typeglobs, + # so whattayahgonnadoboutit + # - SL + wrapped => { + add_package_symbol => sub { + my $original = shift; + $self->throw_error("Cannot add package symbols to an immutable metaclass") + unless (caller(2))[3] eq 'Class::MOP::Package::get_package_symbol'; + goto $original->body; + }, + }, + }); + return $class; +} + +sub make_immutable { + my $self = shift; + $self->SUPER::make_immutable + ( + constructor_class => $self->constructor_class, + destructor_class => $self->destructor_class, + inline_destructor => 1, + # NOTE: + # no need to do this, + # Moose always does it + inline_accessors => 0, + @_, + ); +} + +our $error_level; + +sub throw_error { + my ( $self, @args ) = @_; + local $error_level = ($error_level || 0) + 1; + $self->raise_error($self->create_error(@args)); +} + +sub raise_error { + my ( $self, @args ) = @_; + die @args; +} + +sub create_error { + my ( $self, @args ) = @_; + + require Carp::Heavy; + + local $error_level = ($error_level || 0 ) + 1; + + if ( @args % 2 == 1 ) { + unshift @args, "message"; } + + my %args = ( metaclass => $self, last_error => $@, @args ); + + $args{depth} += $error_level; + + my $class = ref $self ? $self->error_class : "Moose::Error::Default"; + + Class::MOP::load_class($class); + + $class->new( + Carp::caller_info($args{depth}), + %args + ); } 1; @@ -367,12 +704,12 @@ Moose::Meta::Class - The Moose metaclass =head1 DESCRIPTION -This is a subclass of L with Moose specific +This is a subclass of L with Moose specific extensions. -For the most part, the only time you will ever encounter an -instance of this class is if you are doing some serious deep -introspection. To really understand this class, you need to refer +For the most part, the only time you will ever encounter an +instance of this class is if you are doing some serious deep +introspection. To really understand this class, you need to refer to the L documentation. =head1 METHODS @@ -381,59 +718,83 @@ to the L documentation. =item B +=item B + +Overrides original to accept a list of roles to apply to +the created class. + + my $metaclass = Moose::Meta::Class->create( 'New::Class', roles => [...] ); + +=item B + +Overrides original to support roles and caching. + + my $metaclass = Moose::Meta::Class->create_anon_class( + superclasses => ['Foo'], + roles => [qw/Some Roles Go Here/], + cache => 1, + ); + =item B +Override original to add default options for inlining destructor +and altering the Constructor metaclass. + +=item B + +Override original to lock C and memoize C + =item B We override this method to support the C attribute option. =item B -This provides some Moose specific extensions to this method, you -almost never call this method directly unless you really know what -you are doing. +This provides some Moose specific extensions to this method, you +almost never call this method directly unless you really know what +you are doing. This method makes sure to handle the moose weak-ref, type-constraint -and type coercion features. +and type coercion features. =item B -This accommodates Moose::Meta::Role::Method instances, which are -aliased, instead of added, but still need to be counted as valid +This accommodates Moose::Meta::Role::Method instances, which are +aliased, instead of added, but still need to be counted as valid methods. =item B -This will create an C method modifier for you, and install +This will create an C method modifier for you, and install it in the package. =item B -This will create an C method modifier for you, and install +This will create an C method modifier for you, and install it in the package. =item B =item B -This will return an array of C instances which are +This will return an array of C instances which are attached to this class. =item B -This takes an instance of C in C<$role>, and adds it +This takes an instance of C in C<$role>, and adds it to the list of associated roles. =item B -This will test if this class C a given C<$role_name>. It will -not only check it's local roles, but ask them as well in order to +This will test if this class C a given C<$role_name>. It will +not only check it's local roles, but ask them as well in order to cascade down the role hierarchy. =item B -This will test if this class C a given C<$role_name>. It will -not only check it's local roles, but ask them as well in order to +This will test if this class C a given C<$role_name>. It will +not only check it's local roles, but ask them as well in order to cascade down the role hierarchy. =item B @@ -441,11 +802,70 @@ cascade down the role hierarchy. This method does the same thing as L, but adds support for taking the C<$params> as a HASH ref. +=item B + +=item B + +These are the names of classes used when making a class +immutable. These default to L and +L respectively. These accessors are +read-write, so you can use them to change the class name. + +=item B + +The name of the class used to throw errors. This default to +L, which generates an error with a stacktrace +just like C. + +=item B + +Moose overrides this method from C and attempts to +fix some incompatibilities before doing the check. + +=item B + +Throws the error created by C using C + +=item B + +Creates an error message or object. + +The default behavior is C. + +If C is set uses C. Otherwise uses +C (a code reference or variant name), and calls the appropriate +C method. + +=item B + +Get or set the error builder. Defaults to C. + +=item B + +Get or set the error class. Has no default. + +=item B + +Creates an error using L + +=item B + +Creates an error using L + +=item B + +Calls C on the C parameter in C<%args>. Usable with C +to support custom error objects for your meta class. + +=item B + +Dies with an error object or string. + =back =head1 BUGS -All complex software has bugs lurking in it, and this module is no +All complex software has bugs lurking in it, and this module is no exception. If you find a bug please either email me, or add the bug to cpan-RT. @@ -455,12 +875,12 @@ Stevan Little Estevan@iinteractive.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006, 2007 by Infinity Interactive, Inc. +Copyright 2006-2008 by Infinity Interactive, Inc. L This library is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. +it under the same terms as Perl itself. =cut