X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FClass.pm;h=a3ac27d3f30455a7a679d778b79849f681e4a3cb;hb=9b522fc4b2f36a31ba00ddf00abf369c28c705c7;hp=c8a9dda1627f5439ce443532127b2f18a11ac3db;hpb=1a72091660e0f93c1927ad8e8d31892d42a91efe;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Class.pm b/lib/Class/MOP/Class.pm index c8a9dda..a3ac27d 100644 --- a/lib/Class/MOP/Class.pm +++ b/lib/Class/MOP/Class.pm @@ -9,18 +9,13 @@ 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.26'; +our $VERSION = '0.33'; our $AUTHORITY = 'cpan:STEVAN'; use base 'Class::MOP::Module'; -# Self-introspection - -sub meta { Class::MOP::Class->initialize(blessed($_[0]) || $_[0]) } - # Creation sub initialize { @@ -28,10 +23,8 @@ sub initialize { 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; - } - $class->construct_class_instance('package' => $package_name, @_); + return Class::MOP::get_metaclass_by_name($package_name) + || $class->construct_class_instance('package' => $package_name, @_); } sub reinitialize { @@ -110,7 +103,8 @@ sub construct_class_instance { # we can tell the first time the # methods are fetched # - SL - '$!_package_cache_flag' => undef, + '$!_package_cache_flag' => undef, + '$!_meta_instance' => undef, } => $class; } else { @@ -243,6 +237,18 @@ sub create { "(I found an uneven number of params in \@_)"; my (%options) = @_; + + (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}; my $code = "package $package_name;"; $code .= "\$$package_name\:\:VERSION = '" . $options{version} . "';" @@ -305,18 +311,34 @@ sub get_method_map { 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, + package_name => $class_name, + name => $symbol, + ); } return $map; @@ -346,7 +368,7 @@ sub construct_instance { # 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,11 +380,26 @@ 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; + # NOTE: + # just about any fiddling with @ISA or + # any fiddling with attributes will + # also fiddle with the symbol table + # and therefore invalidate the package + # cache, in which case we should blow + # away the meta-instance cache. Of course + # this will invalidate it more often then + # is probably needed, but better safe + # then sorry. + # - SL + $self->{'$!_meta_instance'} = undef + if defined $self->{'$!_package_cache_flag'} && + $self->{'$!_package_cache_flag'} == Class::MOP::check_package_cache_flag($self->name); + $self->{'$!_meta_instance'} ||= $self->instance_metaclass->new( + $self, + $self->compute_all_applicable_attributes() ); } @@ -386,45 +423,53 @@ sub clone_instance { my $meta_instance = $class->get_meta_instance(); my $clone = $meta_instance->clone_instance($instance); foreach my $attr ($class->compute_all_applicable_attributes()) { - if (exists $params{$attr->init_arg}) { - $meta_instance->set_slot_value($clone, $attr->name, $params{$attr->init_arg}); + if ( defined( my $init_arg = $attr->init_arg ) ) { + if (exists $params{$init_arg}) { + $attr->set_value($clone, $params{$init_arg}); + } } } return $clone; } sub rebless_instance { - my ($self, $instance, $new_metaclass) = @_; + my ($self, $instance, %params) = @_; - # it's okay (expected, even) to pass in a package name - unless (blessed $new_metaclass) { - $new_metaclass = $self->initialize($new_metaclass); + my $old_metaclass; + if ($instance->can('meta')) { + ($instance->meta->isa('Class::MOP::Class')) + || confess 'Cannot rebless instance if ->meta is not an instance of Class::MOP::Class'; + $old_metaclass = $instance->meta; } - my $meta_instance = $self->get_meta_instance(); - - # make sure we're reblessing into a subclass - my $is_subclass = 0; - for my $superclass ($new_metaclass->linearized_isa) { - if ($superclass eq $self->name) { - $is_subclass = 1; - last; - } + else { + $old_metaclass = $self->initialize(blessed($instance)); } - $is_subclass - || confess "You may rebless only into a subclass. (". $new_metaclass->name .") is not a subclass of (". $self->name .")."; + my $meta_instance = $self->get_meta_instance(); + + $self->name->isa($old_metaclass->name) + || confess "You may rebless only into a subclass of (". $old_metaclass->name ."), of which (". $self->name .") isn't."; # rebless! - $meta_instance->rebless_instance_structure($instance, $new_metaclass); - - # check and upgrade all attributes - my %params = map { $_->name => $_->get_value($instance) } - grep { $meta_instance->is_slot_initialized($instance, $_->name) } - $new_metaclass->compute_all_applicable_attributes; + $meta_instance->rebless_instance_structure($instance, $self); + + 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) + unless exists $params{$init_arg}; + } + else { + $attr->set_value($instance, $attr->get_value($instance)); + } + } + } - foreach my $attr ($new_metaclass->compute_all_applicable_attributes) { + foreach my $attr ($self->compute_all_applicable_attributes) { $attr->initialize_instance_slot($meta_instance, $instance, \%params); } + + $instance; } # Inheritance @@ -491,17 +536,12 @@ sub subclasses { 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: @@ -511,15 +551,26 @@ 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 @@ -532,17 +583,34 @@ sub add_method { my $body; if (blessed($method)) { $body = $method->body; + if ($method->package_name ne $self->name && + $method->name ne $method_name) { + warn "Hello there, got somethig for you." + . " Method says " . $method->package_name . " " . $method->name + . " Class says " . $self->name . " " . $method_name; + $method = $method->clone( + package_name => $self->name, + name => $method_name + ) if $method->can('clone'); + } } else { $body = $method; - ('CODE' eq (reftype($body) || '')) + ('CODE' eq ref($body)) || confess "Your code block must be a CODE reference"; - $method = $self->method_metaclass->wrap($body); + $method = $self->method_metaclass->wrap( + $body => ( + package_name => $self->name, + name => $method_name + ) + ); } $self->get_method_map->{$method_name} = $method; - - my $full_method_name = ($self->name . '::' . $method_name); - $self->add_package_symbol("&${method_name}" => subname $full_method_name => $body); + + my $full_method_name = ($self->name . '::' . $method_name); + $self->add_package_symbol("&${method_name}" => + Class::MOP::subname($full_method_name => $body) + ); $self->update_package_cache_flag; } @@ -577,7 +645,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 { @@ -585,7 +655,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 { @@ -593,7 +665,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: @@ -616,7 +690,7 @@ sub alias_method { || confess "You must define a method name"; my $body = (blessed($method) ? $method->body : $method); - ('CODE' eq (reftype($body) || '')) + ('CODE' eq ref($body)) || confess "Your code block must be a CODE reference"; $self->add_package_symbol("&${method_name}" => $body); @@ -860,6 +934,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{ @@ -869,29 +945,41 @@ 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', 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'; + goto $original->body; + }, + }, }); return $class; } @@ -1043,7 +1131,8 @@ 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. =back @@ -1056,8 +1145,14 @@ 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 This is a convience method for creating a new object of the class, and @@ -1069,12 +1164,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. @@ -1098,9 +1190,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 @@ -1119,6 +1208,13 @@ 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 + +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. You may pass in optional C<%params> which are like constructor +params and will override anything already defined in the instance. + =back =head2 Informational @@ -1151,18 +1247,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 @@ -1171,7 +1260,7 @@ duplicates removed. =item B -This returns a list of subclasses for this class. +This returns a list of subclasses for this class. =back @@ -1181,8 +1270,13 @@ 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 This will take a C<$method_name> and CODE reference to that @@ -1236,7 +1330,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. @@ -1395,9 +1489,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