use Sub::Exporter;
+use MRO::Compat;
use Class::MOP;
use Moose::Meta::Class;
};
},
super => sub {
- {
- our %SUPER_SLOT;
- no strict 'refs';
- $SUPER_SLOT{$CALLER} = \*{"${CALLER}::super"};
- }
- return subname 'Moose::super' => sub { };
+ # FIXME can be made into goto, might break caller() for existing code
+ return subname 'Moose::super' => sub { return unless our $SUPER_BODY; $SUPER_BODY->(our @SUPER_ARGS) }
},
+ #next => sub {
+ # return subname 'Moose::next' => sub { @_ = our @SUPER_ARGS; goto \&next::method };
+ #},
override => sub {
my $class = $CALLER;
return subname 'Moose::override' => sub ($&) {
};
},
inner => sub {
- {
- our %INNER_SLOT;
- no strict 'refs';
- $INNER_SLOT{$CALLER} = \*{"${CALLER}::inner"};
- }
- return subname 'Moose::inner' => sub { };
+ return subname 'Moose::inner' => sub {
+ my $pkg = caller();
+ our ( %INNER_BODY, %INNER_ARGS );
+
+ if ( my $body = $INNER_BODY{$pkg} ) {
+ my @args = @{ $INNER_ARGS{$pkg} };
+ local $INNER_ARGS{$pkg};
+ local $INNER_BODY{$pkg};
+ return $body->(@args);
+ } else {
+ return;
+ }
+ };
},
augment => sub {
my $class = $CALLER;
our $AUTHORITY = 'cpan:STEVAN';
use Moose::Meta::Method::Overriden;
+use Moose::Meta::Method::Augmented;
use base 'Class::MOP::Class';
|| confess "Cannot add an override method if a local method is already present";
$self->add_method($name => Moose::Meta::Method::Overriden->new(
- override => $method,
- class => $self,
- package => $_super_package, # need this for roles
- name => $name,
+ method => $method,
+ class => $self,
+ package => $_super_package, # need this for roles
+ name => $name,
));
}
my ($self, $name, $method) = @_;
(!$self->has_method($name))
|| confess "Cannot add an augment method if a local method is already present";
- my $super = $self->find_next_method_by_name($name);
- (defined $super)
- || confess "You cannot augment '$name' because it has no super method";
- my $_super_package = $super->package_name;
- # BUT!,... if this is an overriden method ....
- if ($super->isa('Moose::Meta::Method::Overriden')) {
- # we need to be sure that we actually
- # find the next method, which is not
- # an 'override' method, the reason is
- # that an 'override' method will not
- # be the one calling inner()
- my $real_super = $self->_find_next_method_by_name_which_is_not_overridden($name);
- $_super_package = $real_super->package_name;
- }
- $self->add_method($name => sub {
- my @args = @_;
- no warnings 'redefine';
- if ($Moose::INNER_SLOT{$_super_package}) {
- local *{$Moose::INNER_SLOT{$_super_package}} = sub {
- local *{$Moose::INNER_SLOT{$_super_package}} = sub {};
- $method->(@args);
- };
- return $super->body->(@args);
- }
- else {
- return $super->body->(@args);
- }
- });
+
+ $self->add_method($name => Moose::Meta::Method::Augmented->new(
+ method => $method,
+ class => $self,
+ name => $name,
+ ));
}
## Private Utility methods ...
--- /dev/null
+package Moose::Meta::Method::Augmented;
+
+use strict;
+use warnings;
+
+our $VERSION = '0.01';
+our $AUTHORITY = 'cpan:STEVAN';
+
+use base 'Moose::Meta::Method';
+
+use Sub::Name;
+
+use Carp qw(confess);
+
+sub new {
+ my ( $class, %args ) = @_;
+
+ # the package can be overridden by roles
+ # it is really more like body's compilation stash
+ # this is where we need to override the definition of super() so that the
+ # body of the code can call the right overridden version
+ my $name = $args{name};
+ my $meta = $args{class};
+
+ my $super = $meta->find_next_method_by_name($name);
+
+ (defined $super)
+ || confess "You cannot augment '$name' because it has no super method";
+
+ my $_super_package = $super->package_name;
+ # BUT!,... if this is an overriden method ....
+ if ($super->isa('Moose::Meta::Method::Overriden')) {
+ # we need to be sure that we actually
+ # find the next method, which is not
+ # an 'override' method, the reason is
+ # that an 'override' method will not
+ # be the one calling inner()
+ my $real_super = $meta->_find_next_method_by_name_which_is_not_overridden($name);
+ $_super_package = $real_super->package_name;
+ }
+
+ my $super_body = $super->body;
+
+ my $method = $args{method};
+
+ my $body = sub {
+ local $Moose::INNER_ARGS{$_super_package} = [ @_ ];
+ local $Moose::INNER_BODY{$_super_package} = $method;
+ $super_body->(@_);
+ };
+
+ # FIXME store additional attrs
+ $class->wrap($body);
+}
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+Moose::Meta::Method::Augmented - A Moose Method metaclass for augmented methods
+
+=head1 DESCRIPTION
+
+This class implements method augmenting logic for the L<Moose> C<augment> keyword.
+
+This involves setting up C<inner> for the superclass body, and dispatching to
+the superclass from the normal body.
+
+The subclass definition (the augmentation itself) will be invoked explicitly
+using the C<inner> keyword from the parent class's method definition.
+
+=head1 METHODS
+
+=over 4
+
+=item B<new>
+
+=back
+
+=head1 BUGS
+
+All complex software has bugs lurking in it, and this module is no
+exception. If you find a bug please either email me, or add the bug
+to cpan-RT.
+
+=head1 AUTHOR
+
+Stevan Little E<lt>stevan@iinteractive.comE<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright 2006-2008 by Infinity Interactive, Inc.
+
+L<http://www.iinteractive.com>
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself.
+
+=cut
use base 'Moose::Meta::Method';
+use Sub::Name;
+
use Carp qw(confess);
sub new {
my $super_body = $super->body;
- my $method = $args{override};
+ my $method = $args{method};
my $body = sub {
- my @args = @_;
- if ($Moose::SUPER_SLOT{$_super_package}) {
- no warnings 'redefine';
- # FIXME goto() to prevent additional stack frame?
- local *{$Moose::SUPER_SLOT{$_super_package}} = sub { $super_body->(@args) };
- return $method->(@args);
- } else {
- confess "Trying to call override modifier'd method without super()";
- }
+ local @Moose::SUPER_ARGS = @_;
+ local $Moose::SUPER_BODY = $super_body;
+ return $method->(@_);
};
+ # FIXME do we need this make sure this works for next::method?
+ # subname "${_super_package}::${name}", $method;
+
# FIXME store additional attrs
$class->wrap($body);
}
$meta->add_around_method_modifier($_, $code) for @_;
};
},
+ # see Moose.pm for discussion
super => sub {
- {
- no strict 'refs';
- $Moose::SUPER_SLOT{$CALLER} = \*{"${CALLER}::super"};
- }
- my $meta = _find_meta();
- return subname 'Moose::Role::super' => sub {};
+ return subname 'Moose::Role::super' => sub { return unless $Moose::SUPER_BODY; $Moose::SUPER_BODY->(@Moose::SUPER_ARGS) }
},
+ #next => sub {
+ # return subname 'Moose::Role::next' => sub { @_ = @Moose::SUPER_ARGS; goto \&next::method };
+ #},
override => sub {
my $meta = _find_meta();
return subname 'Moose::Role::override' => sub ($&) {
projects / gitmo/Moose.git / commitdiff