X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod.pm;h=cff21449c56d8d550bac1e449fb2d248ad91eb48;hb=92e250b0af746085306392cd25e053f3000ca3d3;hp=bbacdcfd9b418123d39947a9d755871854ec9491;hpb=b38f3848bc87e7e9cbffa5439cf386185c1bbc2b;p=gitmo%2FClass-MOP.git
diff --git a/lib/Class/MOP/Method.pm b/lib/Class/MOP/Method.pm
index bbacdcf..cff2144 100644
--- a/lib/Class/MOP/Method.pm
+++ b/lib/Class/MOP/Method.pm
@@ -5,57 +5,120 @@ use strict;
use warnings;
use Carp 'confess';
-use Scalar::Util 'reftype', 'blessed';
+use Scalar::Util 'weaken';
-our $VERSION = '0.07';
+our $VERSION = '0.69_01';
+$VERSION = eval $VERSION;
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;
+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, $code, %params ) = @_;
-
- ('CODE' eq (reftype($code) || ''))
+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";
-
- bless {
- '&!body' => $code,
- '$!package_name' => $params{package_name},
- '$!name' => $params{name},
- } => blessed($class) || $class;
+ || confess "You must supply the package_name and name parameters $UPGRADE_ERROR_TEXT";
+
+ my $self = (ref($class) || $class)->_new(\%params);
+
+ weaken($self->{associated_metaclass}) if $self->{associated_metaclass};
+
+ return $self;
+}
+
+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;
}
## accessors
-sub body { (shift)->{'&!body'} }
+sub body { (shift)->{'body'} }
-# TODO - add associated_class
+sub associated_metaclass { shift->{'associated_metaclass'} }
-# informational
+sub attach_to_class {
+ my ( $self, $class ) = @_;
+ $self->{associated_metaclass} = $class;
+ weaken($self->{associated_metaclass});
+}
-sub package_name {
+sub detach_from_class {
my $self = shift;
- $self->{'$!package_name'} ||= (Class::MOP::get_code_info($self->body))[0];
+ delete $self->{associated_metaclass};
}
-sub name {
+sub package_name { (shift)->{'package_name'} }
+
+sub name { (shift)->{'name'} }
+
+sub fully_qualified_name {
my $self = shift;
- $self->{'$!name'} ||= (Class::MOP::get_code_info($self->body))[1];
+ $self->package_name . '::' . $self->name;
}
-sub fully_qualified_name {
- my $code = shift;
- $code->package_name . '::' . $code->name;
+sub original_method { (shift)->{'original_method'} }
+
+sub _set_original_method { $_[0]->{'original_method'} = $_[1] }
+
+# 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;
+
+ $self->original_method
+ ? $self->original_method->original_package_name
+ : $self->package_name;
+}
+
+sub original_name {
+ my $self = shift;
+
+ $self->original_method
+ ? $self->original_method->original_name
+ : $self->name;
+}
+
+sub original_fully_qualified_name {
+ my $self = shift;
+
+ $self->original_method
+ ? $self->original_method->original_fully_qualified_name
+ : $self->fully_qualified_name;
}
# NOTE:
@@ -70,14 +133,14 @@ __END__
=pod
-=head1 NAME
+=head1 NAME
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. 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.
=head1 METHODS
@@ -88,7 +151,7 @@ introspection interface.
=item B
-This will return a B instance which is related
+This will return a B instance which is related
to this class.
=back
@@ -99,15 +162,15 @@ to this class.
=item B
-This is the basic constructor, it returns a B
-instance which wraps the given C<$code> reference. You can also
+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
+If these are not set, then thier accessors will attempt to figure
it out using the C function.
=item B
-This will make a copy of the object, allowing you to override
+This will make a copy of the object, allowing you to override
any values by stuffing them in C<%params>.
=back
@@ -124,6 +187,10 @@ This returns the actual CODE reference of the particular instance.
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.
@@ -132,6 +199,51 @@ This returns the package name that the CODE reference is attached to.
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 Metaclass
+
+=over 4
+
+=item B
+
+Sets the associated metaclass
+
+=item B
+
+Disassociates the method from the metaclass
+
=back
=head1 AUTHORS
@@ -145,7 +257,7 @@ 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