X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod.pm;h=6bb65ad3b0019bf333d3fc64537758f5ad40b21c;hb=e00524a03329f89358767302ffc62cd15ec33571;hp=04f1312ec2b7d1fb86da9f449bf01de7320ccb80;hpb=b1897d4d804dc11f86868052ecb6997a04821df3;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Method.pm b/lib/Class/MOP/Method.pm index 04f1312..6bb65ad 100644 --- a/lib/Class/MOP/Method.pm +++ b/lib/Class/MOP/Method.pm @@ -5,206 +5,126 @@ use strict; use warnings; use Carp 'confess'; -use Scalar::Util 'reftype', 'blessed'; -use B 'svref_2object'; +use Scalar::Util 'weaken'; -our $VERSION = '0.04'; +our $VERSION = '0.83'; +$VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use base 'Class::MOP::Object'; # NOTE: -# if poked in the right way, +# if poked in the right way, # they should act like CODE refs. -use overload '&{}' => sub { $_[0]->{body} }, fallback => 1; +use overload '&{}' => sub { $_[0]->body }, fallback => 1; + +our $UPGRADE_ERROR_TEXT = q{ +--------------------------------------------------------- +NOTE: this error is likely not an error, but a regression +caused by the latest upgrade to Moose/Class::MOP. Consider +upgrading any MooseX::* modules to their latest versions +before spending too much time chasing this one down. +--------------------------------------------------------- +}; -# introspection +# construction -sub meta { - require Class::MOP::Class; - Class::MOP::Class->initialize(blessed($_[0]) || $_[0]); -} +sub wrap { + my ( $class, @args ) = @_; -# construction + unshift @args, 'body' if @args % 2 == 1; -sub wrap { - my $class = shift; - my $code = shift; - ('CODE' eq (reftype($code) || '')) + my %params = @args; + my $code = $params{body}; + + ('CODE' eq ref($code)) || confess "You must supply a CODE reference to bless, not (" . ($code || 'undef') . ")"; - bless { - body => $code - } => blessed($class) || $class; -} -## accessors + ($params{package_name} && $params{name}) + || confess "You must supply the package_name and name parameters $UPGRADE_ERROR_TEXT"; + + my $self = $class->_new(\%params); + + weaken($self->{associated_metaclass}) if $self->{associated_metaclass}; -sub body { (shift)->{body} } + return $self; +} + +sub _new { + my $class = shift; + my $params = @_ == 1 ? $_[0] : {@_}; + + my $self = bless { + 'body' => $params->{body}, + 'associated_metaclass' => $params->{associated_metaclass}, + 'package_name' => $params->{package_name}, + 'name' => $params->{name}, + } => $class; +} -# TODO - add associated_class +## accessors -# informational +sub associated_metaclass { shift->{'associated_metaclass'} } -# NOTE: -# this may not be the same name -# as the class you got it from -# This gets the package stash name -# associated with the actual CODE-ref -sub package_name { - my $code = (shift)->{body}; - svref_2object($code)->GV->STASH->NAME; +sub attach_to_class { + my ( $self, $class ) = @_; + $self->{associated_metaclass} = $class; + weaken($self->{associated_metaclass}); } -# NOTE: -# this may not be the same name -# as the method name it is stored -# with. This gets the name associated -# with the actual CODE-ref -sub name { - my $code = (shift)->{body}; - svref_2object($code)->GV->NAME; +sub detach_from_class { + my $self = shift; + delete $self->{associated_metaclass}; } sub fully_qualified_name { - my $code = shift; - $code->package_name . '::' . $code->name; + my $self = shift; + $self->package_name . '::' . $self->name; } -package Class::MOP::Method::Wrapped; +sub original_method { (shift)->{'original_method'} } -use strict; -use warnings; +sub _set_original_method { $_[0]->{'original_method'} = $_[1] } -use Carp 'confess'; -use Scalar::Util 'reftype', 'blessed'; -use Sub::Name 'subname'; - -our $VERSION = '0.02'; -our $AUTHORITY = 'cpan:STEVAN'; +# It's possible that this could cause a loop if there is a circular +# reference in here. That shouldn't ever happen in normal +# circumstances, since original method only gets set when clone is +# called. We _could_ check for such a loop, but it'd involve some sort +# of package-lexical variable, and wouldn't be terribly subclassable. +sub original_package_name { + my $self = shift; -use base 'Class::MOP::Method'; + $self->original_method + ? $self->original_method->original_package_name + : $self->package_name; +} -# NOTE: -# this ugly beast is the result of trying -# to micro optimize this as much as possible -# while not completely loosing maintainability. -# At this point it's "fast enough", after all -# you can't get something for nothing :) -my $_build_wrapped_method = sub { - my $modifier_table = shift; - my ($before, $after, $around) = ( - $modifier_table->{before}, - $modifier_table->{after}, - $modifier_table->{around}, - ); - if (@$before && @$after) { - $modifier_table->{cache} = sub { - $_->(@_) for @{$before}; - my @rval; - ((defined wantarray) ? - ((wantarray) ? - (@rval = $around->{cache}->(@_)) - : - ($rval[0] = $around->{cache}->(@_))) - : - $around->{cache}->(@_)); - $_->(@_) for @{$after}; - return unless defined wantarray; - return wantarray ? @rval : $rval[0]; - } - } - elsif (@$before && !@$after) { - $modifier_table->{cache} = sub { - $_->(@_) for @{$before}; - return $around->{cache}->(@_); - } - } - elsif (@$after && !@$before) { - $modifier_table->{cache} = sub { - my @rval; - ((defined wantarray) ? - ((wantarray) ? - (@rval = $around->{cache}->(@_)) - : - ($rval[0] = $around->{cache}->(@_))) - : - $around->{cache}->(@_)); - $_->(@_) for @{$after}; - return unless defined wantarray; - return wantarray ? @rval : $rval[0]; - } - } - else { - $modifier_table->{cache} = $around->{cache}; - } -}; +sub original_name { + my $self = shift; -sub wrap { - my $class = shift; - my $code = shift; - (blessed($code) && $code->isa('Class::MOP::Method')) - || confess "Can only wrap blessed CODE"; - my $modifier_table = { - cache => undef, - orig => $code, - before => [], - after => [], - around => { - cache => $code->body, - methods => [], - }, - }; - $_build_wrapped_method->($modifier_table); - my $method = $class->SUPER::wrap(sub { $modifier_table->{cache}->(@_) }); - $method->{modifier_table} = $modifier_table; - $method; + $self->original_method + ? $self->original_method->original_name + : $self->name; } -sub get_original_method { - my $code = shift; - $code->{modifier_table}->{orig}; -} +sub original_fully_qualified_name { + my $self = shift; -sub add_before_modifier { - my $code = shift; - my $modifier = shift; - unshift @{$code->{modifier_table}->{before}} => $modifier; - $_build_wrapped_method->($code->{modifier_table}); + $self->original_method + ? $self->original_method->original_fully_qualified_name + : $self->fully_qualified_name; } -sub add_after_modifier { - my $code = shift; - my $modifier = shift; - push @{$code->{modifier_table}->{after}} => $modifier; - $_build_wrapped_method->($code->{modifier_table}); +sub execute { + my $self = shift; + $self->body->(@_); } -{ - # NOTE: - # this is another possible canidate for - # optimization as well. There is an overhead - # associated with the currying that, if - # eliminated might make around modifiers - # more manageable. - my $compile_around_method = sub {{ - my $f1 = pop; - return $f1 unless @_; - my $f2 = pop; - push @_, sub { $f2->( $f1, @_ ) }; - redo; - }}; - - sub add_around_modifier { - my $code = shift; - my $modifier = shift; - unshift @{$code->{modifier_table}->{around}->{methods}} => $modifier; - $code->{modifier_table}->{around}->{cache} = $compile_around_method->( - @{$code->{modifier_table}->{around}->{methods}}, - $code->{modifier_table}->{orig}->body - ); - $_build_wrapped_method->($code->{modifier_table}); - } -} +# NOTE: +# the Class::MOP bootstrap +# will create this for us +# - SL +# sub clone { ... } 1; @@ -212,84 +132,128 @@ __END__ =pod -=head1 NAME +=head1 NAME Class::MOP::Method - Method Meta Object -=head1 SYNOPSIS +=head1 DESCRIPTION - # ... more to come later maybe +The Method Protocol is very small, since methods in Perl 5 are just +subroutines in a specific package. We provide a very basic +introspection interface. -=head1 DESCRIPTION +=head1 METHODS -The Method Protocol is very small, since methods in Perl 5 are just -subroutines within the particular package. Basically all we do is to -bless the subroutine. +=over 4 -Currently this package is largely unused. Future plans are to provide -some very simple introspection methods for the methods themselves. -Suggestions for this are welcome. +=item B<< Class::MOP::Method->wrap($code, %options) >> -=head1 METHODS +This is the constructor. It accepts a subroutine reference and a hash +of options. -=head2 Introspection +The options are: -=over 4 +=over 8 + +=item * name -=item B +The method name (without a package name). This is required. -This will return a B instance which is related -to this class. +=item * package_name + +The package name for the method. This is required. + +=item * associated_metaclass + +An optional L object. This is the metaclass for the +method's class. =back -=head2 Construction +=item B<< $metamethod->clone(%params) >> -=over 4 +This makes a shallow clone of the method object. In particular, +subroutine reference itself is shared between all clones of a given +method. -=item B +When a method is cloned, the original method object will be available +by calling C on the clone. -This simply blesses the C<&code> reference passed to it. +=item B<< $metamethod->body >> -=back +This returns a reference to the method's subroutine. -=head2 Informational +=item B<< $metamethod->name >> -=over 4 +This returns the method's name -=item B +=item B<< $metamethod->package_name >> -=item B +This returns the method's package name. -=item B +=item B<< $metamethod->fully_qualified_name >> -=item B +This returns the method's fully qualified name (package name and +method name). -=back +=item B<< $metamethod->associated_metaclass >> -=head1 Class::MOP::Method::Wrapped METHODS +This returns the L object for the method, if one +exists. -=head2 Construction +=item B<< $metamethod->original_method >> -=over 4 +If this method object was created as a clone of some other method +object, this returns the object that was cloned. -=item B +=item B<< $metamethod->original_name >> -This simply blesses the C<&code> reference passed to it. +This returns the method's original name, wherever it was first +defined. -=item B +If this method is a clone of a clone (of a clone, etc.), this method +returns the name from the I method in the chain of clones. -=back +=item B<< $metamethod->original_package_name >> -=head2 Modifiers +This returns the method's original package name, wherever it was first +defined. -=over 4 +If this method is a clone of a clone (of a clone, etc.), this method +returns the package name from the I method in the chain of +clones. + +=item B<< $metamethod->original_fully_qualified_name >> + +This returns the method's original fully qualified name, wherever it +was first defined. + +If this method is a clone of a clone (of a clone, etc.), this method +returns the fully qualified name from the I method in the chain +of clones. + +=item B<< $metamethod->attach_to_class($metaclass) >> -=item B +Given a L object, this method sets the associated +metaclass for the method. This will overwrite any existing associated +metaclass. -=item B +=item B<< $metamethod->detach_from_class >> -=item B +Removes any associated metaclass object for the method. + +=item B<< $metamethod->execute(...) >> + +This executes the method. Any arguments provided will be passed on to +the method itself. + +=item B<< Class::MOP::Method->meta >> + +This will return a L instance for this class. + +It should also be noted that L will actually bootstrap +this module by installing a number of attribute meta-objects into its +metaclass. =back @@ -297,16 +261,14 @@ This simply blesses the C<&code> reference passed to it. Stevan Little Estevan@iinteractive.comE -Yuval Kogman Enothingmuch@woobling.comE - =head1 COPYRIGHT AND LICENSE -Copyright 2006 by Infinity Interactive, Inc. +Copyright 2006-2009 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