X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FClass.pm;h=0686bd7df7340d92a9615fd94e1a9a2aa65f1022;hb=4edd0667cd0f156b04eda1a630033afb3fbab708;hp=2e51b9f5c300f077e663b18eb17a66f31b1de860;hpb=1a4705beda3d8970cbc37cc9d7a4e4619dd1eb8a;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Class.pm b/lib/Class/MOP/Class.pm index 2e51b9f..0686bd7 100644 --- a/lib/Class/MOP/Class.pm +++ b/lib/Class/MOP/Class.pm @@ -9,38 +9,33 @@ use Class::MOP::Instance; use Class::MOP::Method::Wrapped; use Carp 'confess'; -use Scalar::Util 'blessed', 'reftype', 'weaken'; -use Sub::Name 'subname'; +use Scalar::Util 'blessed', 'weaken'; -our $VERSION = '0.27'; +our $VERSION = '0.70_01'; +$VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use base 'Class::MOP::Module'; -# Self-introspection - -sub meta { Class::MOP::Class->initialize(blessed($_[0]) || $_[0]) } - # Creation sub initialize { - my $class = shift; - my $package_name = shift; - (defined $package_name && $package_name && !blessed($package_name)) - || confess "You must pass a package name and it cannot be blessed"; - if (defined(my $meta = Class::MOP::get_metaclass_by_name($package_name))) { - return $meta; + my $class = shift; + + my $package_name; + + if ( @_ % 2 ) { + $package_name = shift; + } else { + my %options = @_; + $package_name = $options{package}; } - $class->construct_class_instance('package' => $package_name, @_); -} -sub reinitialize { - my $class = shift; - my $package_name = shift; - (defined $package_name && $package_name && !blessed($package_name)) + (defined $package_name && $package_name && !ref($package_name)) || confess "You must pass a package name and it cannot be blessed"; - Class::MOP::remove_metaclass_by_name($package_name); - $class->construct_class_instance('package' => $package_name, @_); + + return Class::MOP::get_metaclass_by_name($package_name) + || $class->construct_class_instance(package => $package_name, @_); } # NOTE: (meta-circularity) @@ -51,8 +46,8 @@ sub reinitialize { # normal &construct_instance. sub construct_class_instance { my $class = shift; - my %options = @_; - my $package_name = $options{'package'}; + my $options = @_ == 1 ? $_[0] : {@_}; + my $package_name = $options->{package}; (defined $package_name && $package_name) || confess "You must pass a package name"; # NOTE: @@ -69,60 +64,28 @@ sub construct_class_instance { # we need to deal with the possibility # of class immutability here, and then # get the name of the class appropriately - $class = (blessed($class) + $class = (ref($class) ? ($class->is_immutable ? $class->get_mutable_metaclass_name() - : blessed($class)) + : ref($class)) : $class); # now create the metaclass my $meta; if ($class eq 'Class::MOP::Class') { no strict 'refs'; - $meta = bless { - # inherited from Class::MOP::Package - '$!package' => $package_name, - - # NOTE: - # since the following attributes will - # actually be loaded from the symbol - # table, and actually bypass the instance - # entirely, we can just leave these things - # listed here for reference, because they - # should not actually have a value associated - # with the slot. - '%!namespace' => \undef, - # inherited from Class::MOP::Module - '$!version' => \undef, - '$!authority' => \undef, - # defined in Class::MOP::Class - '@!superclasses' => \undef, - - '%!methods' => {}, - '%!attributes' => {}, - '$!attribute_metaclass' => $options{'attribute_metaclass'} || 'Class::MOP::Attribute', - '$!method_metaclass' => $options{'method_metaclass'} || 'Class::MOP::Method', - '$!instance_metaclass' => $options{'instance_metaclass'} || 'Class::MOP::Instance', - - ## uber-private variables - # NOTE: - # this starts out as undef so that - # we can tell the first time the - # methods are fetched - # - SL - '$!_package_cache_flag' => undef, - } => $class; + $meta = $class->_new($options) } else { # NOTE: # it is safe to use meta here because # class will always be a subclass of # Class::MOP::Class, which defines meta - $meta = $class->meta->construct_instance(%options) + $meta = $class->meta->construct_instance($options) } # and check the metaclass compatibility - $meta->check_metaclass_compatability(); + $meta->check_metaclass_compatibility(); Class::MOP::store_metaclass_by_name($package_name, $meta); @@ -134,7 +97,38 @@ sub construct_class_instance { $meta; } -sub reset_package_cache_flag { (shift)->{'$!_package_cache_flag'} = undef } +sub _new { + my $class = shift; + my $options = @_ == 1 ? $_[0] : {@_}; + + bless { + # inherited from Class::MOP::Package + 'package' => $options->{package}, + + # NOTE: + # since the following attributes will + # actually be loaded from the symbol + # table, and actually bypass the instance + # entirely, we can just leave these things + # listed here for reference, because they + # should not actually have a value associated + # with the slot. + 'namespace' => \undef, + # inherited from Class::MOP::Module + 'version' => \undef, + 'authority' => \undef, + # defined in Class::MOP::Class + 'superclasses' => \undef, + + 'methods' => {}, + 'attributes' => {}, + 'attribute_metaclass' => $options->{'attribute_metaclass'} || 'Class::MOP::Attribute', + 'method_metaclass' => $options->{'method_metaclass'} || 'Class::MOP::Method', + 'instance_metaclass' => $options->{'instance_metaclass'} || 'Class::MOP::Instance', + }, $class; +} + +sub reset_package_cache_flag { (shift)->{'_package_cache_flag'} = undef } sub update_package_cache_flag { my $self = shift; # NOTE: @@ -143,14 +137,14 @@ sub update_package_cache_flag { # to our cache as well. This avoids us # having to regenerate the method_map. # - SL - $self->{'$!_package_cache_flag'} = Class::MOP::check_package_cache_flag($self->name); + $self->{'_package_cache_flag'} = Class::MOP::check_package_cache_flag($self->name); } -sub check_metaclass_compatability { +sub check_metaclass_compatibility { my $self = shift; # this is always okay ... - return if blessed($self) eq 'Class::MOP::Class' && + return if ref($self) eq 'Class::MOP::Class' && $self->instance_metaclass eq 'Class::MOP::Instance'; my @class_list = $self->linearized_isa; @@ -165,22 +159,28 @@ sub check_metaclass_compatability { # get the name of the class appropriately my $meta_type = ($meta->is_immutable ? $meta->get_mutable_metaclass_name() - : blessed($meta)); + : ref($meta)); ($self->isa($meta_type)) - || confess $self->name . "->meta => (" . (blessed($self)) . ")" . + || confess $self->name . "->meta => (" . (ref($self)) . ")" . " is not compatible with the " . $class_name . "->meta => (" . ($meta_type) . ")"; # NOTE: # we also need to check that instance metaclasses - # are compatabile in the same the class. + # are compatibile in the same the class. ($self->instance_metaclass->isa($meta->instance_metaclass)) - || confess $self->name . "->meta => (" . ($self->instance_metaclass) . ")" . + || confess $self->name . "->meta->instance_metaclass => (" . ($self->instance_metaclass) . ")" . " is not compatible with the " . - $class_name . "->meta => (" . ($meta->instance_metaclass) . ")"; + $class_name . "->meta->instance_metaclass => (" . ($meta->instance_metaclass) . ")"; } } +# backwards compat for stevan's inability to spell ;) +sub check_metaclass_compatability { + my $self = shift; + $self->check_metaclass_compatibility(@_); +} + ## ANON classes { @@ -200,7 +200,7 @@ sub check_metaclass_compatability { sub is_anon_class { my $self = shift; no warnings 'uninitialized'; - $self->name =~ /^$ANON_CLASS_PREFIX/ ? 1 : 0; + $self->name =~ /^$ANON_CLASS_PREFIX/; } sub create_anon_class { @@ -217,8 +217,19 @@ sub check_metaclass_compatability { # really need to be handled explicitly sub DESTROY { my $self = shift; + + return if Class::MOP::in_global_destruction(); # it'll happen soon anyway and this just makes things more complicated + no warnings 'uninitialized'; return unless $self->name =~ /^$ANON_CLASS_PREFIX/; + # Moose does a weird thing where it replaces the metaclass for + # class when fixing metaclass incompatibility. In that case, + # we don't want to clean out the namespace now. We can detect + # that because Moose will explicitly update the singleton + # cache in Class::MOP. + my $current_meta = Class::MOP::get_metaclass_by_name($self->name); + return if $current_meta ne $self; + my ($serial_id) = ($self->name =~ /^$ANON_CLASS_PREFIX(\d+)/); no strict 'refs'; foreach my $key (keys %{$ANON_CLASS_PREFIX . $serial_id}) { @@ -232,31 +243,41 @@ sub check_metaclass_compatability { # creating classes with MOP ... sub create { - my $class = shift; - my $package_name = shift; - - (defined $package_name && $package_name) - || confess "You must pass a package name"; + my ( $class, @args ) = @_; - (scalar @_ % 2 == 0) - || confess "You much pass all parameters as name => value pairs " . - "(I found an uneven number of params in \@_)"; + unshift @args, 'package' if @args % 2 == 1; - my (%options) = @_; - - my $code = "package $package_name;"; - $code .= "\$$package_name\:\:VERSION = '" . $options{version} . "';" - if exists $options{version}; - $code .= "\$$package_name\:\:AUTHORITY = '" . $options{authority} . "';" - if exists $options{authority}; - - eval $code; - confess "creation of $package_name failed : $@" if $@; - - my $meta = $class->initialize($package_name); + my (%options) = @args; + my $package_name = $options{package}; + (ref $options{superclasses} eq 'ARRAY') + || confess "You must pass an ARRAY ref of superclasses" + if exists $options{superclasses}; + + (ref $options{attributes} eq 'ARRAY') + || confess "You must pass an ARRAY ref of attributes" + if exists $options{attributes}; + + (ref $options{methods} eq 'HASH') + || confess "You must pass an HASH ref of methods" + if exists $options{methods}; + + $class->SUPER::create(%options); + + my (%initialize_options) = @args; + delete @initialize_options{qw( + package + superclasses + attributes + methods + version + authority + )}; + my $meta = $class->initialize( $package_name => %initialize_options ); + + # FIXME totally lame $meta->add_method('meta' => sub { - $class->initialize(blessed($_[0]) || $_[0]); + $class->initialize(ref($_[0]) || $_[0]); }); $meta->superclasses(@{$options{superclasses}}) @@ -285,38 +306,58 @@ sub create { # all these attribute readers will be bootstrapped # away in the Class::MOP bootstrap section -sub get_attribute_map { $_[0]->{'%!attributes'} } -sub attribute_metaclass { $_[0]->{'$!attribute_metaclass'} } -sub method_metaclass { $_[0]->{'$!method_metaclass'} } -sub instance_metaclass { $_[0]->{'$!instance_metaclass'} } +sub get_attribute_map { $_[0]->{'attributes'} } +sub attribute_metaclass { $_[0]->{'attribute_metaclass'} } +sub method_metaclass { $_[0]->{'method_metaclass'} } +sub instance_metaclass { $_[0]->{'instance_metaclass'} } # FIXME: # this is a prime canidate for conversion to XS sub get_method_map { my $self = shift; - if (defined $self->{'$!_package_cache_flag'} && - $self->{'$!_package_cache_flag'} == Class::MOP::check_package_cache_flag($self->name)) { - return $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'} ||= {}; } - - my $map = $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); + 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); - next if ($pkg || '') ne $class_name && - ($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, + associated_metaclass => $self, + package_name => $class_name, + name => $symbol, + ); } return $map; @@ -326,6 +367,7 @@ sub get_method_map { sub new_object { my $class = shift; + # NOTE: # we need to protect the integrity of the # Class::MOP::Class singletons here, so we @@ -337,16 +379,17 @@ sub new_object { } sub construct_instance { - my ($class, %params) = @_; + my $class = shift; + my $params = @_ == 1 ? $_[0] : {@_}; my $meta_instance = $class->get_meta_instance(); my $instance = $meta_instance->create_instance(); foreach my $attr ($class->compute_all_applicable_attributes()) { - $attr->initialize_instance_slot($meta_instance, $instance, \%params); + $attr->initialize_instance_slot($meta_instance, $instance, $params); } # NOTE: # this will only work for a HASH instance type if ($class->is_anon_class) { - (reftype($instance) eq 'HASH') + (Scalar::Util::reftype($instance) eq 'HASH') || confess "Currently only HASH based instances are supported with instance of anon-classes"; # NOTE: # At some point we should make this official @@ -358,19 +401,32 @@ sub construct_instance { return $instance; } + sub get_meta_instance { - my $class = shift; - return $class->instance_metaclass->new( - $class, - $class->compute_all_applicable_attributes() + my $self = shift; + $self->{'_meta_instance'} ||= $self->create_meta_instance(); +} + +sub create_meta_instance { + my $self = shift; + + my $instance = $self->instance_metaclass->new( + associated_metaclass => $self, + attributes => [ $self->compute_all_applicable_attributes() ], ); + + $self->add_meta_instance_dependencies() + if $instance->is_dependent_on_superclasses(); + + return $instance; } sub clone_object { my $class = shift; my $instance = shift; (blessed($instance) && $instance->isa($class->name)) - || confess "You must pass an instance ($instance) of the metaclass (" . $class->name . ")"; + || confess "You must pass an instance of the metaclass (" . (ref $class ? $class->name : $class) . "), not ($instance)"; + # NOTE: # we need to protect the integrity of the # Class::MOP::Class singletons here, they @@ -382,7 +438,7 @@ sub clone_object { sub clone_instance { my ($class, $instance, %params) = @_; (blessed($instance)) - || confess "You can only clone instances, \$self is not a blessed instance"; + || confess "You can only clone instances, ($instance) is not a blessed instance"; my $meta_instance = $class->get_meta_instance(); my $clone = $meta_instance->clone_instance($instance); foreach my $attr ($class->compute_all_applicable_attributes()) { @@ -396,7 +452,7 @@ sub clone_instance { } sub rebless_instance { - my ($self, $instance) = @_; + my ($self, $instance, %params) = @_; my $old_metaclass; if ($instance->can('meta')) { @@ -405,7 +461,7 @@ sub rebless_instance { $old_metaclass = $instance->meta; } else { - $old_metaclass = $self->initialize(blessed($instance)); + $old_metaclass = $self->initialize(ref($instance)); } my $meta_instance = $self->get_meta_instance(); @@ -416,14 +472,14 @@ sub rebless_instance { # rebless! $meta_instance->rebless_instance_structure($instance, $self); - my %params; - foreach my $attr ( $self->compute_all_applicable_attributes ) { if ( $attr->has_value($instance) ) { if ( defined( my $init_arg = $attr->init_arg ) ) { - $params{$init_arg} = $attr->get_value($instance); - } else { - $attr->set_value($instance); + $params{$init_arg} = $attr->get_value($instance) + unless exists $params{$init_arg}; + } + else { + $attr->set_value($instance, $attr->get_value($instance)); } } } @@ -431,104 +487,96 @@ sub rebless_instance { foreach my $attr ($self->compute_all_applicable_attributes) { $attr->initialize_instance_slot($meta_instance, $instance, \%params); } -} - -sub get_attribute_values { - my ($self, $instance) = @_; - - return +{ - map { $_->name => $_->get_value($instance) } - grep { $_->has_value($instance) } - $self->>compute_all_applicable_attributes - }; -} - -sub get_init_args { - my ($self, $instance) = @_; - - return +{ - map { $_->init_arg => $_->get_value($instance) } - grep { $_->has_value($instance) } - grep { defined($_->init_arg) } - $self->compute_all_applicable_attributes - }; + + $instance; } # Inheritance sub superclasses { - my $self = shift; + my $self = shift; + my $var_spec = { sigil => '@', type => 'ARRAY', name => 'ISA' }; if (@_) { my @supers = @_; - @{$self->get_package_symbol('@ISA')} = @supers; + @{$self->get_package_symbol($var_spec)} = @supers; + + # NOTE: + # on 5.8 and below, we need to call + # a method to get Perl to detect + # a cycle in the class hierarchy + my $class = $self->name; + $class->isa($class); + # NOTE: # we need to check the metaclass # compatibility here so that we can # be sure that the superclass is # not potentially creating an issues # we don't know about - $self->check_metaclass_compatability(); + + $self->check_metaclass_compatibility(); + $self->update_meta_instance_dependencies(); } - @{$self->get_package_symbol('@ISA')}; + @{$self->get_package_symbol($var_spec)}; } sub subclasses { my $self = shift; my $super_class = $self->name; - my @derived_classes; - - my $find_derived_classes; - $find_derived_classes = sub { - my ($outer_class) = @_; - my $symbol_table_hashref = do { no strict 'refs'; \%{"${outer_class}::"} }; + if ( Class::MOP::HAVE_ISAREV() ) { + return @{ $super_class->mro::get_isarev() }; + } else { + my @derived_classes; - SYMBOL: - for my $symbol ( keys %$symbol_table_hashref ) { - next SYMBOL if $symbol !~ /\A (\w+):: \z/x; - my $inner_class = $1; + my $find_derived_classes; + $find_derived_classes = sub { + my ($outer_class) = @_; - next SYMBOL if $inner_class eq 'SUPER'; # skip '*::SUPER' + my $symbol_table_hashref = do { no strict 'refs'; \%{"${outer_class}::"} }; - my $class = - $outer_class - ? "${outer_class}::$inner_class" - : $inner_class; + SYMBOL: + for my $symbol ( keys %$symbol_table_hashref ) { + next SYMBOL if $symbol !~ /\A (\w+):: \z/x; + my $inner_class = $1; - if ( $class->isa($super_class) and $class ne $super_class ) { - push @derived_classes, $class; - } + next SYMBOL if $inner_class eq 'SUPER'; # skip '*::SUPER' - next SYMBOL if $class eq 'main'; # skip 'main::*' + my $class = + $outer_class + ? "${outer_class}::$inner_class" + : $inner_class; - $find_derived_classes->($class); - } - }; + if ( $class->isa($super_class) and $class ne $super_class ) { + push @derived_classes, $class; + } - my $root_class = q{}; - $find_derived_classes->($root_class); + next SYMBOL if $class eq 'main'; # skip 'main::*' - undef $find_derived_classes; + $find_derived_classes->($class); + } + }; - @derived_classes = sort { $a->isa($b) ? 1 : $b->isa($a) ? -1 : 0 } @derived_classes; + my $root_class = q{}; + $find_derived_classes->($root_class); - return @derived_classes; + undef $find_derived_classes; + + @derived_classes = sort { $a->isa($b) ? 1 : $b->isa($a) ? -1 : 0 } @derived_classes; + + return @derived_classes; + } } sub linearized_isa { - if (Class::MOP::IS_RUNNING_ON_5_10()) { - return @{ mro::get_linear_isa( (shift)->name ) }; - } - else { - my %seen; - return grep { !($seen{$_}++) } (shift)->class_precedence_list; - } + return @{ mro::get_linear_isa( (shift)->name ) }; } sub class_precedence_list { my $self = shift; + my $name = $self->name; unless (Class::MOP::IS_RUNNING_ON_5_10()) { # NOTE: @@ -538,19 +586,42 @@ sub class_precedence_list { # blow up otherwise. Yes, it's an ugly hack, better # suggestions are welcome. # - SL - ($self->name || return)->isa('This is a test for circular inheritance') + ($name || return)->isa('This is a test for circular inheritance') } - ( - $self->name, - map { - $self->initialize($_)->class_precedence_list() - } $self->superclasses() - ); + # if our mro is c3, we can + # just grab the linear_isa + if (mro::get_mro($name) eq 'c3') { + return @{ mro::get_linear_isa($name) } + } + else { + # NOTE: + # we can't grab the linear_isa for dfs + # since it has all the duplicates + # already removed. + return ( + $name, + map { + $self->initialize($_)->class_precedence_list() + } $self->superclasses() + ); + } } ## Methods +sub wrap_method_body { + my ( $self, %args ) = @_; + + ('CODE' eq ref $args{body}) + || confess "Your code block must be a CODE reference"; + + $self->method_metaclass->wrap( + package_name => $self->name, + %args, + ); +} + sub add_method { my ($self, $method_name, $method) = @_; (defined $method_name && $method_name) @@ -559,18 +630,29 @@ sub add_method { my $body; if (blessed($method)) { $body = $method->body; + if ($method->package_name ne $self->name) { + $method = $method->clone( + package_name => $self->name, + name => $method_name + ) if $method->can('clone'); + } } else { $body = $method; - ('CODE' eq (reftype($body) || '')) - || confess "Your code block must be a CODE reference"; - $method = $self->method_metaclass->wrap($body); + $method = $self->wrap_method_body( body => $body, name => $method_name ); } + + $method->attach_to_class($self); + $self->get_method_map->{$method_name} = $method; + + my $full_method_name = ($self->name . '::' . $method_name); + $self->add_package_symbol( + { sigil => '&', type => 'CODE', name => $method_name }, + Class::MOP::subname($full_method_name => $body) + ); - my $full_method_name = ($self->name . '::' . $method_name); - $self->add_package_symbol("&${method_name}" => subname $full_method_name => $body); - $self->update_package_cache_flag; + $self->update_package_cache_flag; # still valid, since we just added the method to the map, and if it was invalid before that then get_method_map updated it } { @@ -604,7 +686,9 @@ sub add_method { (defined $method_name && $method_name) || confess "You must pass in a method name"; my $method = $fetch_and_prepare_method->($self, $method_name); - $method->add_before_modifier(subname ':before' => $method_modifier); + $method->add_before_modifier( + Class::MOP::subname(':before' => $method_modifier) + ); } sub add_after_method_modifier { @@ -612,7 +696,9 @@ sub add_method { (defined $method_name && $method_name) || confess "You must pass in a method name"; my $method = $fetch_and_prepare_method->($self, $method_name); - $method->add_after_modifier(subname ':after' => $method_modifier); + $method->add_after_modifier( + Class::MOP::subname(':after' => $method_modifier) + ); } sub add_around_method_modifier { @@ -620,7 +706,9 @@ sub add_method { (defined $method_name && $method_name) || confess "You must pass in a method name"; my $method = $fetch_and_prepare_method->($self, $method_name); - $method->add_around_modifier(subname ':around' => $method_modifier); + $method->add_around_modifier( + Class::MOP::subname(':around' => $method_modifier) + ); } # NOTE: @@ -638,16 +726,9 @@ sub add_method { } sub alias_method { - my ($self, $method_name, $method) = @_; - (defined $method_name && $method_name) - || confess "You must define a method name"; - - my $body = (blessed($method) ? $method->body : $method); - ('CODE' eq (reftype($body) || '')) - || confess "Your code block must be a CODE reference"; + my $self = shift; - $self->add_package_symbol("&${method_name}" => $body); - $self->update_package_cache_flag; + $self->add_method(@_); } sub has_method { @@ -655,8 +736,7 @@ sub has_method { (defined $method_name && $method_name) || confess "You must define a method name"; - return 0 unless exists $self->get_method_map->{$method_name}; - return 1; + exists $self->get_method_map->{$method_name}; } sub get_method { @@ -680,9 +760,13 @@ sub remove_method { my $removed_method = delete $self->get_method_map->{$method_name}; - $self->remove_package_symbol("&${method_name}"); - - $self->update_package_cache_flag; + $self->remove_package_symbol( + { sigil => '&', type => 'CODE', name => $method_name } + ); + + $removed_method->detach_from_class if $removed_method; + + $self->update_package_cache_flag; # still valid, since we just removed the method from the map return $removed_method; } @@ -705,23 +789,21 @@ sub find_method_by_name { return; } -sub compute_all_applicable_methods { +sub get_all_methods { my $self = shift; - my (@methods, %seen_method); - foreach my $class ($self->linearized_isa) { - # fetch the meta-class ... - my $meta = $self->initialize($class); - foreach my $method_name ($meta->get_method_list()) { - next if exists $seen_method{$method_name}; - $seen_method{$method_name}++; - push @methods => { - name => $method_name, - class => $class, - code => $meta->get_method($method_name) - }; - } - } - return @methods; + my %methods = map { %{ $self->initialize($_)->get_method_map } } reverse $self->linearized_isa; + return values %methods; +} + +# compatibility +sub compute_all_applicable_methods { + return map { + { + name => $_->name, + class => $_->package_name, + code => $_, # sigh, overloading + }, + } shift->get_all_methods(@_); } sub find_all_methods_by_name { @@ -776,19 +858,91 @@ sub add_attribute { # name here so that we can properly detach # the old attr object, and remove any # accessors it would have generated - $self->remove_attribute($attribute->name) - if $self->has_attribute($attribute->name); + if ( $self->has_attribute($attribute->name) ) { + $self->remove_attribute($attribute->name); + } else { + $self->invalidate_meta_instances(); + } # then onto installing the new accessors - $attribute->install_accessors(); $self->get_attribute_map->{$attribute->name} = $attribute; + + # invalidate package flag here + my $e = do { local $@; eval { $attribute->install_accessors() }; $@ }; + if ( $e ) { + $self->remove_attribute($attribute->name); + die $e; + } + + return $attribute; +} + +sub update_meta_instance_dependencies { + my $self = shift; + + if ( $self->{meta_instance_dependencies} ) { + return $self->add_meta_instance_dependencies; + } +} + +sub add_meta_instance_dependencies { + my $self = shift; + + $self->remove_meta_instance_depdendencies; + + my @attrs = $self->compute_all_applicable_attributes(); + + my %seen; + my @classes = grep { not $seen{$_->name}++ } map { $_->associated_class } @attrs; + + foreach my $class ( @classes ) { + $class->add_dependent_meta_instance($self); + } + + $self->{meta_instance_dependencies} = \@classes; +} + +sub remove_meta_instance_depdendencies { + my $self = shift; + + if ( my $classes = delete $self->{meta_instance_dependencies} ) { + foreach my $class ( @$classes ) { + $class->remove_dependent_meta_instance($self); + } + + return $classes; + } + + return; + +} + +sub add_dependent_meta_instance { + my ( $self, $metaclass ) = @_; + push @{ $self->{dependent_meta_instances} }, $metaclass; +} + +sub remove_dependent_meta_instance { + my ( $self, $metaclass ) = @_; + my $name = $metaclass->name; + @$_ = grep { $_->name ne $name } @$_ for $self->{dependent_meta_instances}; +} + +sub invalidate_meta_instances { + my $self = shift; + $_->invalidate_meta_instance() for $self, @{ $self->{dependent_meta_instances} }; +} + +sub invalidate_meta_instance { + my $self = shift; + undef $self->{_meta_instance}; } sub has_attribute { my ($self, $attribute_name) = @_; (defined $attribute_name && $attribute_name) || confess "You must define an attribute name"; - exists $self->get_attribute_map->{$attribute_name} ? 1 : 0; + exists $self->get_attribute_map->{$attribute_name}; } sub get_attribute { @@ -809,6 +963,7 @@ sub remove_attribute { my $removed_attribute = $self->get_attribute_map->{$attribute_name}; return unless defined $removed_attribute; delete $self->get_attribute_map->{$attribute_name}; + $self->invalidate_meta_instances(); $removed_attribute->remove_accessors(); $removed_attribute->detach_from_class(); return $removed_attribute; @@ -819,19 +974,14 @@ sub get_attribute_list { keys %{$self->get_attribute_map}; } +sub get_all_attributes { + shift->compute_all_applicable_attributes(@_); +} + sub compute_all_applicable_attributes { my $self = shift; - my (@attrs, %seen_attr); - foreach my $class ($self->linearized_isa) { - # fetch the meta-class ... - my $meta = $self->initialize($class); - foreach my $attr_name ($meta->get_attribute_list()) { - next if exists $seen_attr{$attr_name}; - $seen_attr{$attr_name}++; - push @attrs => $meta->get_attribute($attr_name); - } - } - return @attrs; + my %attrs = map { %{ $self->initialize($_)->get_attribute_map } } reverse $self->linearized_isa; + return values %attrs; } sub find_attribute_by_name { @@ -845,6 +995,25 @@ sub find_attribute_by_name { return; } +# check if we can reinitialize +sub is_pristine { + my $self = shift; + + # if any local attr is defined + return if $self->get_attribute_list; + + # or any non-declared methods + if ( my @methods = values %{ $self->get_method_map } ) { + my $metaclass = $self->method_metaclass; + foreach my $method ( @methods ) { + return if $method->isa("Class::MOP::Method::Generated"); + # FIXME do we need to enforce this too? return unless $method->isa($metaclass); + } + } + + return 1; +} + ## Class closing sub is_mutable { 1 } @@ -869,16 +1038,36 @@ sub is_immutable { 0 } # the reference stored in $IMMUTABLE_TRANSFORMERS{$class} and ||= should DWIM { + my %IMMUTABLE_TRANSFORMERS; my %IMMUTABLE_OPTIONS; + + sub get_immutable_options { + my $self = shift; + return if $self->is_mutable; + confess "unable to find immutabilizing options" + unless exists $IMMUTABLE_OPTIONS{$self->name}; + my %options = %{$IMMUTABLE_OPTIONS{$self->name}}; + delete $options{IMMUTABLE_TRANSFORMER}; + return \%options; + } + + sub get_immutable_transformer { + my $self = shift; + if( $self->is_mutable ){ + my $class = ref $self || $self; + return $IMMUTABLE_TRANSFORMERS{$class} ||= $self->create_immutable_transformer; + } + confess "unable to find transformer for immutable class" + unless exists $IMMUTABLE_OPTIONS{$self->name}; + return $IMMUTABLE_OPTIONS{$self->name}->{IMMUTABLE_TRANSFORMER}; + } + sub make_immutable { my $self = shift; my %options = @_; - my $class = blessed $self || $self; - - $IMMUTABLE_TRANSFORMERS{$class} ||= $self->create_immutable_transformer; - my $transformer = $IMMUTABLE_TRANSFORMERS{$class}; + my $transformer = $self->get_immutable_transformer; $transformer->make_metaclass_immutable($self, \%options); $IMMUTABLE_OPTIONS{$self->name} = { %options, IMMUTABLE_TRANSFORMER => $transformer }; @@ -887,6 +1076,8 @@ sub is_immutable { 0 } print STDERR "# of Metaclass options: ", keys %IMMUTABLE_OPTIONS; print STDERR "# of Immutable transformers: ", keys %IMMUTABLE_TRANSFORMERS; } + + 1; } sub make_mutable{ @@ -896,29 +1087,48 @@ sub is_immutable { 0 } confess "unable to find immutabilizing options" unless ref $options; my $transformer = delete $options->{IMMUTABLE_TRANSFORMER}; $transformer->make_metaclass_mutable($self, $options); + 1; } } sub create_immutable_transformer { my $self = shift; my $class = Class::MOP::Immutable->new($self, { - read_only => [qw/superclasses/], - cannot_call => [qw/ + read_only => [qw/superclasses/], + cannot_call => [qw/ add_method alias_method remove_method add_attribute remove_attribute - add_package_symbol remove_package_symbol - /], - memoize => { + /], + memoize => { class_precedence_list => 'ARRAY', - linearized_isa => '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', - } + }, + # NOTE: + # this is ugly, but so are typeglobs, + # so whattayahgonnadoboutit + # - SL + wrapped => { + add_package_symbol => sub { + my $original = shift; + confess "Cannot add package symbols to an immutable metaclass" + unless (caller(2))[3] eq 'Class::MOP::Package::get_package_symbol'; + + # This is a workaround for a bug in 5.8.1 which thinks that + # goto $original->body + # is trying to go to a label + my $body = $original->body; + goto $body; + }, + }, }); return $class; } @@ -1039,12 +1249,6 @@ as we use a special reserved slot (C<__MOP__>) to store this. This initializes and returns returns a B object for a given a C<$package_name>. -=item B - -This removes the old metaclass, and creates a new one in it's place. -Do B use this unless you really know what you are doing, it could -very easily make a very large mess of your program. - =item B This will construct an instance of B, it is @@ -1053,7 +1257,7 @@ to use C once all the bootstrapping is done. This method is used internally by C and should never be called from outside of that method really. -=item B +=item B This method is called as the very last thing in the C method. This will check that the @@ -1070,7 +1274,42 @@ but in some cases you might want to use it, so it is here. =item B -Clear this flag, used in Moose. +Clears the package cache flag to announce to the internals that we need +to rebuild the method map. + +=item B + +Registers this class as dependent on its superclasses. + +Only superclasses from which this class inherits attributes will be added. + +=item B + +Unregisters this class from its superclasses. + +=item B + +Reregisters if necessary. + +=item B $metaclass + +Registers the class as having a meta instance dependent on this class. + +=item B $metaclass + +Remove the class from the list of dependent classes. + +=item B + +Clears the cached meta instance for this metaclass and all of the registered +classes with dependent meta instances. + +Called by C and C to recalculate the attribute +slots. + +=item B + +Used by C. =back @@ -1083,8 +1322,18 @@ to use them or not. =item B +Returns the class name of the instance metaclass, see L +for more information on the instance metaclasses. + =item B +Returns an instance of L to be used in the construction +of a new instance of the class. + +=item B + +Called by C if necessary. + =item B This is a convience method for creating a new object of the class, and @@ -1096,12 +1345,9 @@ would call a C this method like so: $class->meta->new_object(%params); } -Of course the ideal place for this would actually be in C -but that is considered bad style, so we do not do that. - =item B -This method is used to construct an instace structure suitable for +This method is used to construct an instance structure suitable for C-ing into your package of choice. It works in conjunction with the Attribute protocol to collect all applicable attributes. @@ -1125,9 +1371,6 @@ class would call a C this method like so: $self->meta->clone_object($self, %params); } -Of course the ideal place for this would actually be in C -but that is considered bad style, so we do not do that. - =item B This method is a compliment of C (which means if @@ -1146,24 +1389,12 @@ shallow cloning is outside the scope of the meta-object protocol. I think Yuval "nothingmuch" Kogman put it best when he said that cloning is too I to be part of the MOP. -=item B - -Returns the values of the C<$instance>'s fields keyed by the attribute names. - -=item B - -Returns a hash reference where the keys are all the attributes' Cs -and the values are the instance's fields. Attributes without an C -will be skipped. - -=item B +=item B This will change the class of C<$instance> to the class of the invoking C. You may only rebless the instance to a subclass of -itself. This limitation may be relaxed in the future. - -This can be useful in a number of situations, such as when you are writing -a program that doesn't know everything at object construction time. +itself. You may pass in optional C<%params> which are like constructor +params and will override anything already defined in the instance. =back @@ -1185,6 +1416,11 @@ This returns true if the class is still mutable. This returns true if the class has been made immutable. +=item B + +Checks whether the class has any data that will be lost if C is +called. + =back =head2 Inheritance Relationships @@ -1197,18 +1433,11 @@ This is a read-write attribute which represents the superclass relationships of the class the B instance is associated with. Basically, it can get and set the C<@ISA> for you. -B -Perl will occasionally perform some C<@ISA> and method caching, if -you decide to change your superclass relationship at runtime (which -is quite insane and very much not recommened), then you should be -aware of this and the fact that this module does not make any -attempt to address this issue. - =item B This computes the a list of all the class's ancestors in the same order -in which method dispatch will be done. This is similair to -what B does, but we don't remove duplicate names. +in which method dispatch will be done. This is similair to what +B does, but we don't remove duplicate names. =item B @@ -1217,7 +1446,7 @@ duplicates removed. =item B -This returns a list of subclasses for this class. +This returns a list of subclasses for this class. =back @@ -1227,12 +1456,31 @@ This returns a list of subclasses for this class. =item B +Returns a HASH ref of name to CODE reference mapping for this class. + =item B +Returns the class name of the method metaclass, see L +for more information on the method metaclasses. + +=item B + +Wrap a code ref (C<$attrs{body>) with C. + =item B -This will take a C<$method_name> and CODE reference to that -C<$method> and install it into the class's package. +This will take a C<$method_name> and CODE reference or meta method +objectand install it into the class's package. + +You are strongly encouraged to pass a meta method object instead of a +code reference. If you do so, that object gets stored as part of the +class's method map, providing more useful information about the method +for introspection. + +When you provide a method object, this method will clone that object +if the object's package name does not match the class name. This lets +us track the original source of any methods added from other classes +(notably Moose roles). B: This does absolutely nothing special to C<$method> @@ -1240,16 +1488,6 @@ other than use B to make sure it is tagged with the correct name, and therefore show up correctly in stack traces and such. -=item B - -This will take a C<$method_name> and CODE reference to that -C<$method> and alias the method into the class's package. - -B: -Unlike C, this will B try to name the -C<$method> using B, it only aliases the method in -the class's package. - =item B This just provides a simple way to check if the class implements @@ -1282,7 +1520,7 @@ C<$method_name>, or return undef if that method does not exist. The Class::MOP::Method is codifiable, so you can use it like a normal CODE reference, see L for more information. -=item B +=item B This will return a CODE reference of the specified C<$method_name>, or return undef if that method does not exist. @@ -1302,13 +1540,20 @@ methods. It does B provide a list of all applicable methods, including any inherited ones. If you want a list of all applicable methods, use the C method. +=item B + +This will traverse the inheritance heirachy and return a list of all +the applicable L objects for this class. + =item B -This will return a list of all the methods names this class will -respond to, taking into account inheritance. The list will be a list of -HASH references, each one containing the following information; method -name, the name of the class in which the method lives and a CODE -reference for the actual method. +Deprecated. + +This method returns a list of hashes describing the all the methods of the +class. + +Use L, which is easier/better/faster. This method predates +L. =item B @@ -1330,6 +1575,11 @@ This will return the first method to match a given C<$method_name> in the superclasses, this is basically equivalent to calling C, but it can be dispatched at runtime. +=item B + +B: This method is now deprecated. Just use C +instead. + =back =head2 Method Modifiers @@ -1441,9 +1691,14 @@ their own. See L for more details. =item B +Returns the class name of the attribute metaclass, see L +for more information on the attribute metaclasses. + =item B -=item B +This returns a HASH ref of name to attribute meta-object mapping. + +=item B This stores the C<$attribute_meta_object> (or creates one from the C<$attribute_name> and C<%attribute_spec>) in the B @@ -1498,11 +1753,12 @@ use the C method. =item B +=item B + This will traverse the inheritance heirachy and return a list of all -the applicable attributes for this class. It does not construct a -HASH reference like C because all -that same information is discoverable through the attribute -meta-object itself. +the applicable L objects for this class. + +C is an alias for consistency with C. =item B @@ -1527,6 +1783,15 @@ the L documentation. This method will reverse tranforamtion upon the class which made it immutable. +=item B + +Return a transformer suitable for making this class immutable or, if this +class is immutable, the transformer used to make it immutable. + +=item B + +If the class is immutable, return the options used to make it immutable. + =item B Create a transformer suitable for making this class immutable