X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod.pm;h=77f52ff20adc3f09bc336753664c44a141aba3ef;hb=cacb672eae8fe9b02d53dc4e82c39091d401b4f8;hp=61b0d3a746dad36ea3b75f6e0a1e7538283bb144;hpb=ddc8edba62632d7708484acedf0884ff354e3579;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Method.pm b/lib/Class/MOP/Method.pm index 61b0d3a..77f52ff 100644 --- a/lib/Class/MOP/Method.pm +++ b/lib/Class/MOP/Method.pm @@ -5,167 +5,148 @@ use strict; use warnings; use Carp 'confess'; -use Scalar::Util 'reftype', 'blessed'; -use B 'svref_2object'; +use Scalar::Util 'weaken'; -our $VERSION = '0.02'; +our $VERSION = '0.72'; +$VERSION = eval $VERSION; +our $AUTHORITY = 'cpan:STEVAN'; -# introspection +use base 'Class::MOP::Object'; -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 new { +sub wrap { + my ( $class, @args ) = @_; + + unshift @args, 'body' if @args % 2 == 1; + + my %params = @args; + my $code = $params{body}; + + ('CODE' eq ref($code)) + || confess "You must supply a CODE reference to bless, not (" . ($code || 'undef') . ")"; + + ($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}; + + return $self; +} + +sub _new { my $class = shift; - my $code = shift; - ('CODE' eq (reftype($code) || '')) - || confess "You must supply a CODE reference to bless"; - bless $code => blessed($class) || $class; + my $params = @_ == 1 ? $_[0] : {@_}; + + my $self = bless { + 'body' => $params->{body}, + 'associated_metaclass' => $params->{associated_metaclass}, + 'package_name' => $params->{package_name}, + 'name' => $params->{name}, + } => $class; } -# informational +## accessors + +sub body { (shift)->{'body'} } + +sub associated_metaclass { shift->{'associated_metaclass'} } -sub package_name { - my $code = shift; - (blessed($code)) - || confess "Can only ask the package name of a blessed CODE"; - svref_2object($code)->GV->STASH->NAME; +sub attach_to_class { + my ( $self, $class ) = @_; + $self->{associated_metaclass} = $class; + weaken($self->{associated_metaclass}); } -sub name { - my $code = shift; - (blessed($code)) - || confess "Can only ask the package name of a blessed CODE"; - svref_2object($code)->GV->NAME; +sub detach_from_class { + my $self = shift; + delete $self->{associated_metaclass}; } -package Class::MOP::Method::Wrapped; +sub package_name { (shift)->{'package_name'} } -use strict; -use warnings; +sub name { (shift)->{'name'} } -use Carp 'confess'; -use Scalar::Util 'reftype', 'blessed'; +sub fully_qualified_name { + my $self = shift; + $self->package_name . '::' . $self->name; +} -our $VERSION = '0.01'; +sub original_method { (shift)->{'original_method'} } -our @ISA = ('Class::MOP::Method'); +sub _set_original_method { $_[0]->{'original_method'} = $_[1] } -my %MODIFIERS; +# 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; -sub wrap { - my $class = shift; - my $code = shift; - (blessed($code) && $code->isa('Class::MOP::Method')) - || confess "Can only wrap blessed CODE"; - my $modifier_table = { - orig => $code, - before => [], - after => [], - around => { - cache => $code, - methods => [], - }, - }; - my $method = $class->new(sub { - $_->(@_) for @{$modifier_table->{before}}; - my (@rlist, $rval); - if (defined wantarray) { - if (wantarray) { - @rlist = $modifier_table->{around}->{cache}->(@_); - } - else { - $rval = $modifier_table->{around}->{cache}->(@_); - } - } - else { - $modifier_table->{around}->{cache}->(@_); - } - $_->(@_) for @{$modifier_table->{after}}; - return unless defined wantarray; - return wantarray ? @rlist : $rval; - }); - $MODIFIERS{$method} = $modifier_table; - $method; + $self->original_method + ? $self->original_method->original_package_name + : $self->package_name; } -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; +sub original_name { + my $self = shift; + + $self->original_method + ? $self->original_method->original_name + : $self->name; } -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; +sub original_fully_qualified_name { + my $self = shift; + + $self->original_method + ? $self->original_method->original_fully_qualified_name + : $self->fully_qualified_name; } -{ - 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} - ); - } +sub execute { + my $self = shift; + $self->body->(@_); } +# 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 @@ -175,7 +156,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 @@ -184,13 +165,16 @@ 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. You must also set +the C and C attributes in C<%params>. -=item B +=item B -This wraps an existing method so that it can handle method modifiers. +This will make a copy of the object, allowing you to override +any values by stuffing them in C<%params>. =back @@ -198,35 +182,96 @@ This wraps an existing method so that it can handle method modifiers. =over 4 +=item B + +This returns the actual CODE reference of the particular instance. + =item B +This returns the name of the CODE reference. + +=item B + +The metaclass of the method + =item B +This returns the package name that the CODE reference is attached to. + +=item B + +This returns the fully qualified name of the CODE reference. + +=item B + +If this method object was created as a clone of some other method +object, this returns the object that was cloned. + +=item B + +This returns the original name of the CODE reference, wherever it was +first defined. + +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. + +=item B + +This returns the original package name that the CODE reference is +attached to, wherever it was first defined. + +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 + +This returns the original fully qualified name of the CODE reference, +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. + =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 -=head1 AUTHOR +=head2 Miscellaneous + +=over 4 + +=item B + +Executes the method. Be sure to pass in the instance, since the +method expects it. + +=back + +=head1 AUTHORS Stevan Little Estevan@iinteractive.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 -=cut \ No newline at end of file