X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod.pm;h=ecf7cc400667fb167c0078dd8fc00f188df7a437;hb=7f799c133722992988d27204b822520da65c54d3;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..ecf7cc4 100644 --- a/lib/Class/MOP/Method.pm +++ b/lib/Class/MOP/Method.pm @@ -5,238 +5,115 @@ use strict; use warnings; use Carp 'confess'; -use Scalar::Util 'reftype', 'blessed'; -use B 'svref_2object'; +use Scalar::Util 'weaken'; -our $VERSION = '0.03'; +our $VERSION = '0.65'; our $AUTHORITY = 'cpan:STEVAN'; -use overload '&{}' => sub { $_[0]->{body} }, - fallback => 1; +use base 'Class::MOP::Object'; -# introspection - -sub meta { - require Class::MOP::Class; - Class::MOP::Class->initialize(blessed($_[0]) || $_[0]); -} +# NOTE: +# if poked in the right way, +# they should act like CODE refs. +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) || '')) - || confess "You must supply a CODE reference to bless, not (" . ($code || 'undef') . ")"; - bless { - body => $code - } => blessed($class) || $class; -} +sub wrap { + my ( $class, @args ) = @_; -sub body { (shift)->{body} } + unshift @args, 'body' if @args % 2 == 1; -# informational + my %params = @args; + my $code = $params{body}; -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; -} - -sub name { - my $code = shift->{body}; -# (blessed($code)) -# || confess "Can only ask the package name of a blessed CODE"; - svref_2object($code)->GV->NAME; -} + ('CODE' eq ref($code)) + || confess "You must supply a CODE reference to bless, not (" . ($code || 'undef') . ")"; -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; -} + ($params{package_name} && $params{name}) + || confess "You must supply the package_name and name parameters $UPGRADE_ERROR_TEXT"; -package Class::MOP::Method::Wrapped; + my $self = (ref($class) || $class)->_new(\%params); -use strict; -use warnings; + weaken($self->{associated_metaclass}) if $self->{associated_metaclass}; -use Carp 'confess'; -use Scalar::Util 'reftype', 'blessed'; -use Sub::Name 'subname'; + return $self; +} -our $VERSION = '0.01'; +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; +} -our @ISA = ('Class::MOP::Method'); +## accessors -# 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 body { (shift)->{'body'} } -my %MODIFIERS; +sub associated_metaclass { shift->{'associated_metaclass'} } -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 attach_to_class { + my ( $self, $class ) = @_; + $self->{associated_metaclass} = $class; + weaken($self->{associated_metaclass}); } -sub get_original_method { - my $code = shift; - $MODIFIERS{$code}->{orig} - if exists $MODIFIERS{$code}; +sub detach_from_class { + my $self = shift; + delete $self->{associated_metaclass}; } -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 package_name { + my $self = shift; + $self->{'package_name'} ||= (Class::MOP::get_code_info($self->body))[0]; } -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}); +sub name { + my $self = shift; + $self->{'name'} ||= (Class::MOP::get_code_info($self->body))[1]; } -{ - # 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}); - } +sub fully_qualified_name { + my $code = shift; + $code->package_name . '::' . $code->name; } +# NOTE: +# the Class::MOP bootstrap +# will create this for us +# - SL +# sub clone { ... } + 1; __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. 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. +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. =head1 METHODS @@ -246,7 +123,7 @@ Suggestions for this are welcome. =item B -This will return a B instance which is related +This will return a B instance which is related to this class. =back @@ -255,9 +132,18 @@ to this class. =over 4 -=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 -This simply blesses the C<&code> reference passed to it. +This will make a copy of the object, allowing you to override +any values by stuffing them in C<%params>. =back @@ -267,37 +153,37 @@ This simply blesses the C<&code> reference passed to it. =item B -=item B +This returns the actual CODE reference of the particular instance. -=item B +=item B -=item B +This returns the name of the CODE reference. -=back +=item B -=head1 Class::MOP::Method::Wrapped METHODS - -=head2 Construction +The metaclass of the method -=over 4 +=item B -=item B +This returns the package name that the CODE reference is attached to. -This simply blesses the C<&code> reference passed to it. +=item B -=item B +This returns the fully qualified name of the CODE reference. =back -=head2 Modifiers +=head2 Metaclass =over 4 -=item B +=item B -=item B +Sets the associated metaclass -=item B +=item B + +Disassociates the method from the metaclass =back @@ -305,16 +191,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-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