sub is_immutable;
sub is_mutable { !$_[0]->is_immutable }
-sub _install_modifier_pp{
+sub _install_modifier {
my( $self, $type, $name, $code ) = @_;
my $into = $self->name;
my $original = $into->can($name)
- or $self->throw_error("The method '$name' is not found in the inheritance hierarchy for class $into");
+ or $self->throw_error("The method '$name' was not found in the inheritance hierarchy for $into");
my $modifier_table = $self->{modifiers}{$name};
if(!$modifier_table){
- my(@before, @after, @around, $cache, $modified);
+ my(@before, @after, $cache);
$cache = $original;
- $modified = sub {
+ my $around_only = ($type eq 'around');
+
+ my $modified = sub {
+ if($around_only) {
+ return $cache->(@_);
+ }
+
for my $c (@before) { $c->(@_) }
if(wantarray){ # list context
before => \@before,
after => \@after,
- around => \@around,
+ around => \my @around,
+ around_only => \$around_only,
cache => \$cache, # cache for around modifiers
};
}
if($type eq 'before'){
+ ${$modifier_table->{around_only}} = 0;
unshift @{$modifier_table->{before}}, $code;
}
elsif($type eq 'after'){
+ ${$modifier_table->{around_only}} = 0;
push @{$modifier_table->{after}}, $code;
}
else{ # around
return;
}
-sub _install_modifier {
- my ( $self, $type, $name, $code ) = @_;
-
- # load Data::Util first
- my $no_cmm_fast = do{
- local $@;
- eval q{ use Data::Util 0.55 () };
- $@;
- };
-
- my $impl;
- if($no_cmm_fast){
- $impl = \&_install_modifier_pp;
- }
- else{
- $impl = sub {
- my ( $self, $type, $name, $code ) = @_;
- my $into = $self->name;
-
- my $method = Mouse::Util::get_code_ref( $into, $name );
-
- if ( !$method || !Data::Util::subroutine_modifier($method) ) {
- unless ($method) {
- $method = $into->can($name)
- or Carp::confess("The method '$name' is not found in the inheritance hierarchy for class $into");
- }
- $method = Data::Util::modify_subroutine( $method,
- $type => [$code] );
-
- $self->add_method($name => $method);
- }
- else {
- Data::Util::subroutine_modifier( $method, $type => $code );
- $self->add_method($name => Mouse::Util::get_code_ref($into, $name));
- }
-
- return;
- };
- }
-
- # replace this method itself :)
- {
- no warnings 'redefine';
- *_install_modifier = $impl;
- }
-
- $self->$impl( $type, $name, $code );
-}
-
sub add_before_method_modifier {
my ( $self, $name, $code ) = @_;
$self->_install_modifier( 'before', $name, $code );
=head1 VERSION
-This document describes Mouse version 0.65
+This document describes Mouse version 0.67
=head1 METHODS