X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FClass.pm;h=cb5c4638dc053cc9dc552d5344a27d3c9b1fdd2f;hb=3c0a80878fdb1cf4f552c9abff0fc50fb51ad77a;hp=a6f9210ab7917a717b9deb547f575539748e7fcb;hpb=c1d5345a2dedc909590256182a1e77ea5f1566ef;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Class.pm b/lib/Class/MOP/Class.pm index a6f9210..cb5c463 100644 --- a/lib/Class/MOP/Class.pm +++ b/lib/Class/MOP/Class.pm @@ -12,15 +12,11 @@ use Carp 'confess'; use Scalar::Util 'blessed', 'reftype', 'weaken'; use Sub::Name 'subname'; -our $VERSION = '0.26'; +our $VERSION = '0.31'; our $AUTHORITY = 'cpan:STEVAN'; use base 'Class::MOP::Module'; -# Self-introspection - -sub meta { Class::MOP::Class->initialize(blessed($_[0]) || $_[0]) } - # Creation sub initialize { @@ -243,6 +239,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} . "';" @@ -313,8 +321,11 @@ sub get_method_map { $map->{$symbol}->body == $code; my ($pkg, $name) = Class::MOP::get_code_info($code); - next if ($pkg || '') ne $class_name && - ($name || '') ne '__ANON__'; + + next if ($pkg || '') ne $class_name || + (($name || '') ne '__ANON__' && ($pkg || '') ne $class_name); + + #warn "Checking $pkg against $class_name && $name against __ANON__"; $map->{$symbol} = $method_metaclass->wrap($code); } @@ -386,13 +397,55 @@ 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, %params) = @_; + + 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; + } + else { + $old_metaclass = $self->initialize(blessed($instance)); + } + + 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, $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 ($self->compute_all_applicable_attributes) { + $attr->initialize_instance_slot($meta_instance, $instance, \%params); + } + + $instance; +} + # Inheritance sub superclasses { @@ -457,17 +510,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: @@ -477,15 +525,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 @@ -826,6 +885,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{ @@ -835,29 +896,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; } @@ -1009,7 +1082,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 @@ -1022,8 +1096,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 @@ -1035,12 +1115,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. @@ -1064,9 +1141,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 @@ -1085,6 +1159,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 @@ -1117,18 +1198,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 @@ -1137,7 +1211,7 @@ duplicates removed. =item B -This returns a list of subclasses for this class. +This returns a list of subclasses for this class. =back @@ -1147,8 +1221,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 @@ -1202,7 +1281,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. @@ -1361,9 +1440,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