X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod.pm;h=02bc341231838a19dc8cf1d964f46ab1001ed527;hb=ebce55398177423965f0582686a812fe79e20d70;hp=06123a61549ad21fcf4119e4841610c3bf83141e;hpb=864826055ffa48aba41ba1a016c09f24b51e85c4;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Method.pm b/lib/Class/MOP/Method.pm index 06123a6..02bc341 100644 --- a/lib/Class/MOP/Method.pm +++ b/lib/Class/MOP/Method.pm @@ -5,206 +5,73 @@ use strict; use warnings; use Carp 'confess'; -use Scalar::Util 'reftype', 'blessed'; -use B 'svref_2object'; +use Scalar::Util 'blessed'; -our $VERSION = '0.04'; +our $VERSION = '0.62'; 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; - -# introspection - -sub meta { - require Class::MOP::Class; - Class::MOP::Class->initialize(blessed($_[0]) || $_[0]); -} +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. +--------------------------------------------------------- +}; # construction -sub wrap { - my $class = shift; - my $code = shift; - ('CODE' eq (reftype($code) || '')) +sub wrap { + my ( $class, $code, %params ) = @_; + + ('CODE' eq ref($code)) || confess "You must supply a CODE reference to bless, not (" . ($code || 'undef') . ")"; - bless { - body => $code + + ($params{package_name} && $params{name}) + || confess "You must supply the package_name and name parameters $UPGRADE_ERROR_TEXT"; + + bless { + '&!body' => $code, + '$!package_name' => $params{package_name}, + '$!name' => $params{name}, } => blessed($class) || $class; } ## accessors -sub body { (shift)->{body} } +sub body { (shift)->{'&!body'} } # TODO - add associated_class # informational -# 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 package_name { + my $self = shift; + $self->{'$!package_name'} ||= (Class::MOP::get_code_info($self->body))[0]; } -# 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 name { + my $self = shift; + $self->{'$!name'} ||= (Class::MOP::get_code_info($self->body))[1]; } sub fully_qualified_name { - my $code = shift; - $code->package_name . '::' . $code->name; + my $code = shift; + $code->package_name . '::' . $code->name; } -package Class::MOP::Method::Wrapped; - -use strict; -use warnings; - -use Carp 'confess'; -use Scalar::Util 'reftype', 'blessed'; -use Sub::Name 'subname'; - -our $VERSION = '0.02'; -our $AUTHORITY = 'cpan:STEVAN'; - -use base 'Class::MOP::Method'; - # 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 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; -} - -sub get_original_method { - my $code = shift; - $code->{modifier_table}->{orig}; -} - -sub add_before_modifier { - my $code = shift; - my $modifier = shift; - unshift @{$code->{modifier_table}->{before}} => $modifier; - $_build_wrapped_method->($code->{modifier_table}); -} - -sub add_after_modifier { - my $code = shift; - my $modifier = shift; - push @{$code->{modifier_table}->{after}} => $modifier; - $_build_wrapped_method->($code->{modifier_table}); -} - -{ - # 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}); - } -} +# the Class::MOP bootstrap +# will create this for us +# - SL +# sub clone { ... } 1; @@ -212,23 +79,16 @@ __END__ =pod -=head1 NAME +=head1 NAME Class::MOP::Method - Method Meta Object -=head1 SYNOPSIS - - # ... more to come later maybe - =head1 DESCRIPTION -The Method Protocol is very small, since methods in Perl 5 are just -subroutines within the particular package. We provide a very basic +The Method Protocol is very small, since methods in Perl 5 are just +subroutines within the particular package. We provide a very basic introspection interface. -This also contains the Class::MOP::Method::Wrapped subclass, which -provides the features for before, after and around method modifiers. - =head1 METHODS =head2 Introspection @@ -237,7 +97,7 @@ provides the features for before, after and around method modifiers. =item B -This will return a B instance which is related +This will return a B instance which is related to this class. =back @@ -246,45 +106,40 @@ to this class. =over 4 -=item B - -=back - -=head2 Informational - -=over 4 - -=item B +=item B -=item B +This is the basic constructor, it returns a B +instance which wraps the given C<$code> reference. You can also +set the C and C attributes using the C<%params>. +If these are not set, then thier accessors will attempt to figure +it out using the C function. -=item B +=item B -=item B +This will make a copy of the object, allowing you to override +any values by stuffing them in C<%params>. =back -=head1 Class::MOP::Method::Wrapped METHODS - -=head2 Construction +=head2 Informational =over 4 -=item B +=item B -=item B +This returns the actual CODE reference of the particular instance. -=back +=item B -=head2 Modifiers +This returns the name of the CODE reference. -=over 4 +=item B -=item B +This returns the package name that the CODE reference is attached to. -=item B +=item B -=item B +This returns the fully qualified name of the CODE reference. =back @@ -292,16 +147,14 @@ to this class. Stevan Little Estevan@iinteractive.comE -Yuval Kogman Enothingmuch@woobling.comE - =head1 COPYRIGHT AND LICENSE -Copyright 2006 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