X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod.pm;h=56b3037cd3bc372288703b0d0a9911e92b157352;hb=127d39a79d936afd136ccfd8ff8271eea2bc0cbb;hp=386a8a12183d4e292310c88aff91b7f6af46bbbb;hpb=7855ddba257d675899620452f97912ccf69efb77;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Method.pm b/lib/Class/MOP/Method.pm index 386a8a1..56b3037 100644 --- a/lib/Class/MOP/Method.pm +++ b/lib/Class/MOP/Method.pm @@ -6,13 +6,17 @@ use warnings; use Carp 'confess'; use Scalar::Util 'reftype', 'blessed'; -use B 'svref_2object'; +#use B 'svref_2object'; -our $VERSION = '0.03'; +our $VERSION = '0.05'; our $AUTHORITY = 'cpan:STEVAN'; -use overload '&{}' => sub { $_[0]->{body} }, - fallback => 1; +use base 'Class::MOP::Object'; + +# NOTE: +# if poked in the right way, +# they should act like CODE refs. +use overload '&{}' => sub { $_[0]->body }, fallback => 1; # introspection @@ -29,191 +33,43 @@ sub wrap { ('CODE' eq (reftype($code) || '')) || confess "You must supply a CODE reference to bless, not (" . ($code || 'undef') . ")"; bless { - body => $code + '&!body' => $code } => blessed($class) || $class; } -sub body { (shift)->{body} } +## accessors + +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}; -# (blessed($code)) -# || confess "Can only ask the package name of a blessed CODE"; - svref_2object($code)->GV->STASH->NAME; + my $code = (shift)->body; + (Class::MOP::get_code_info($code))[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}; -# (blessed($code)) -# || confess "Can only ask the package name of a blessed CODE"; - svref_2object($code)->GV->NAME; + my $code = (shift)->body; + (Class::MOP::get_code_info($code))[1]; } sub fully_qualified_name { my $code = shift; -# (blessed($code)) -# || confess "Can only ask the package name of a blessed CODE"; $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.01'; - -our @ISA = ('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}; - } -}; - -my %MODIFIERS; - -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}->(@_) }); - $MODIFIERS{$method} = $modifier_table; - $method; -} - -sub get_original_method { - my $code = shift; - $MODIFIERS{$code}->{orig} - if exists $MODIFIERS{$code}; -} - -sub add_before_modifier { - my $code = shift; - my $modifier = shift; - (exists $MODIFIERS{$code}) - || confess "You must first wrap your method before adding a modifier"; - (blessed($code)) - || confess "Can only ask the package name of a blessed CODE"; - #('CODE' eq (reftype($code) || '')) - # || confess "You must supply a CODE reference for a modifier"; - unshift @{$MODIFIERS{$code}->{before}} => $modifier; - $_build_wrapped_method->($MODIFIERS{$code}); -} - -sub add_after_modifier { - my $code = shift; - my $modifier = shift; - (exists $MODIFIERS{$code}) - || confess "You must first wrap your method before adding a modifier"; - (blessed($code)) - || confess "Can only ask the package name of a blessed CODE"; - #('CODE' eq (reftype($code) || '')) - # || confess "You must supply a CODE reference for a modifier"; - push @{$MODIFIERS{$code}->{after}} => $modifier; - $_build_wrapped_method->($MODIFIERS{$code}); -} - -{ - # 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; - (exists $MODIFIERS{$code}) - || confess "You must first wrap your method before adding a modifier"; - (blessed($code)) - || confess "Can only ask the package name of a blessed CODE"; - #('CODE' eq (reftype($code) || '')) - # || confess "You must supply a CODE reference for a modifier"; - unshift @{$MODIFIERS{$code}->{around}->{methods}} => $modifier; - $MODIFIERS{$code}->{around}->{cache} = $compile_around_method->( - @{$MODIFIERS{$code}->{around}->{methods}}, - $MODIFIERS{$code}->{orig} - ); - $_build_wrapped_method->($MODIFIERS{$code}); - } -} - 1; __END__ @@ -224,19 +80,11 @@ __END__ 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. Basically all we do is to -bless the subroutine. - -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. +subroutines within the particular package. We provide a very basic +introspection interface. =head1 METHODS @@ -255,9 +103,10 @@ to this class. =over 4 -=item B +=item B -This simply blesses the C<&code> reference passed to it. +This is the basic constructor, it returns a B +instance which wraps the given C<$code> reference. =back @@ -267,37 +116,19 @@ This simply blesses the C<&code> reference passed to it. =item B -=item B - -=item B - -=item B - -=back - -=head1 Class::MOP::Method::Wrapped METHODS - -=head2 Construction - -=over 4 - -=item B - -This simply blesses the C<&code> reference passed to it. - -=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 @@ -305,11 +136,9 @@ 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-2008 by Infinity Interactive, Inc. L