X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FMethod%2FAccessor%2FNative%2FArray%2Fpop.pm;h=63cb6642051126cb1e60f9fe0affdeb7c1756319;hb=00bbc132f9e1cb2b1a44aa287887cafa27a84577;hp=a16fb98b0f816f6496398696b8c779147dc61124;hpb=a7821be5fbdedff67afce753d73c580ae5ada592;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Method/Accessor/Native/Array/pop.pm b/lib/Moose/Meta/Method/Accessor/Native/Array/pop.pm
index a16fb98..63cb664 100644
--- a/lib/Moose/Meta/Method/Accessor/Native/Array/pop.pm
+++ b/lib/Moose/Meta/Method/Accessor/Native/Array/pop.pm
@@ -3,37 +3,44 @@ package Moose::Meta::Method::Accessor::Native::Array::pop;
 use strict;
 use warnings;
 
-our $VERSION = '1.13';
-$VERSION = eval $VERSION;
-our $AUTHORITY = 'cpan:STEVAN';
+use Moose::Role;
 
-use base 'Moose::Meta::Method::Accessor::Native::Array::Writer';
+with 'Moose::Meta::Method::Accessor::Native::Array::Writer';
 
 sub _maximum_arguments { 0 }
 
 sub _adds_members { 0 }
 
 sub _potential_value {
-    my ( $self, $slot_access ) = @_;
+    my $self = shift;
+    my ($slot_access) = @_;
 
-    return "( \@{ $slot_access } > 1 ? \@{ $slot_access }[ 0 .. \$#{ $slot_access } - 1 ] : () )";
+    return '[ @{ (' . $slot_access . ') } > 1 '
+             . '? @{ (' . $slot_access . ') }[0..$#{ (' . $slot_access . ') } - 1] '
+             . ': () ]';
 }
 
-sub _capture_old_value {
-    my ( $self, $slot_access ) = @_;
+sub _inline_capture_return_value {
+    my $self = shift;
+    my ($slot_access) = @_;
 
-    if ( $self->associated_attribute->has_trigger ) {
-        return 'my $old = $old[-1];';
-    }
-    else {
-        return "my \$old = $slot_access;";
-    }
+    return 'my $old = ' . $slot_access . '->[-1];';
+}
+
+sub _inline_optimized_set_new_value {
+    my $self = shift;
+    my ($inv, $new, $slot_access) = @_;
+
+    return 'pop @{ (' . $slot_access . ') };';
 }
 
 sub _return_value {
-    my ( $self, $instance, $old_value ) = @_;
+    my $self = shift;
+    my ($slot_access) = @_;
 
-    return 'return @{$old} ? $old->[-1] : undef;';
+    return '$old';
 }
 
+no Moose::Role;
+
 1;