X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod.pm;h=06123a61549ad21fcf4119e4841610c3bf83141e;hb=864826055ffa48aba41ba1a016c09f24b51e85c4;hp=f3ae077e211dbcb4934c9c2b56c0edb4586e019a;hpb=16e960bd460d404b809a1e5c24ba77405643342b;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Method.pm b/lib/Class/MOP/Method.pm index f3ae077..06123a6 100644 --- a/lib/Class/MOP/Method.pm +++ b/lib/Class/MOP/Method.pm @@ -8,7 +8,15 @@ use Carp 'confess'; use Scalar::Util 'reftype', 'blessed'; use B 'svref_2object'; -our $VERSION = '0.03'; +our $VERSION = '0.04'; +our $AUTHORITY = 'cpan:STEVAN'; + +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 @@ -24,29 +32,41 @@ sub wrap { my $code = shift; ('CODE' eq (reftype($code) || '')) || confess "You must supply a CODE reference to bless, not (" . ($code || 'undef') . ")"; - bless $code => blessed($class) || $class; + bless { + body => $code + } => blessed($class) || $class; } +## 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; - (blessed($code)) - || confess "Can only ask the package name of a blessed CODE"; + my $code = (shift)->{body}; svref_2object($code)->GV->STASH->NAME; } +# 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; - (blessed($code)) - || confess "Can only ask the package name of a blessed CODE"; + my $code = (shift)->{body}; svref_2object($code)->GV->NAME; } 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; } @@ -59,9 +79,10 @@ use Carp 'confess'; use Scalar::Util 'reftype', 'blessed'; use Sub::Name 'subname'; -our $VERSION = '0.01'; +our $VERSION = '0.02'; +our $AUTHORITY = 'cpan:STEVAN'; -our @ISA = ('Class::MOP::Method'); +use base 'Class::MOP::Method'; # NOTE: # this ugly beast is the result of trying @@ -118,59 +139,44 @@ my $_build_wrapped_method = sub { } }; -my %MODIFIERS; - sub wrap { my $class = shift; my $code = shift; (blessed($code) && $code->isa('Class::MOP::Method')) - || confess "Can only wrap blessed CODE"; + || confess "Can only wrap blessed CODE"; my $modifier_table = { cache => undef, orig => $code, before => [], after => [], around => { - cache => $code, + cache => $code->body, methods => [], }, }; $_build_wrapped_method->($modifier_table); my $method = $class->SUPER::wrap(sub { $modifier_table->{cache}->(@_) }); - $MODIFIERS{$method} = $modifier_table; + $method->{modifier_table} = $modifier_table; $method; } sub get_original_method { my $code = shift; - $MODIFIERS{$code}->{orig} - if exists $MODIFIERS{$code}; + $code->{modifier_table}->{orig}; } 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}); + unshift @{$code->{modifier_table}->{before}} => $modifier; + $_build_wrapped_method->($code->{modifier_table}); } 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}); + push @{$code->{modifier_table}->{after}} => $modifier; + $_build_wrapped_method->($code->{modifier_table}); } { @@ -191,18 +197,12 @@ sub add_after_modifier { 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} + 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->($MODIFIERS{$code}); + $_build_wrapped_method->($code->{modifier_table}); } } @@ -223,12 +223,11 @@ Class::MOP::Method - Method Meta Object =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. +subroutines within the particular package. We provide a very basic +introspection interface. -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. +This also contains the Class::MOP::Method::Wrapped subclass, which +provides the features for before, after and around method modifiers. =head1 METHODS @@ -249,14 +248,14 @@ to this class. =item B -This simply blesses the C<&code> reference passed to it. - =back =head2 Informational =over 4 +=item B + =item B =item B @@ -273,8 +272,6 @@ This simply blesses the C<&code> reference passed to it. =item B -This simply blesses the C<&code> reference passed to it. - =item B =back @@ -291,10 +288,12 @@ This simply blesses the C<&code> reference passed to it. =back -=head1 AUTHOR +=head1 AUTHORS Stevan Little Estevan@iinteractive.comE +Yuval Kogman Enothingmuch@woobling.comE + =head1 COPYRIGHT AND LICENSE Copyright 2006 by Infinity Interactive, Inc.