X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FMethod%2FAccessor%2FNative%2FArray%2Fshift.pm;h=53f9bedb46fdf5ebb2006d37ac2b4923a33fb08e;hb=bb8ef15197850184a45acade3e8f387fd6b63829;hp=3ed2feb45d5042a1a9129ead56f44cc96e20f52b;hpb=e32b74894c664aec6fba53a8926f82ea546b4232;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Method/Accessor/Native/Array/shift.pm b/lib/Moose/Meta/Method/Accessor/Native/Array/shift.pm
index 3ed2feb..53f9bed 100644
--- a/lib/Moose/Meta/Method/Accessor/Native/Array/shift.pm
+++ b/lib/Moose/Meta/Method/Accessor/Native/Array/shift.pm
@@ -3,38 +3,57 @@ package Moose::Meta::Method::Accessor::Native::Array::shift;
 use strict;
 use warnings;
 
-our $VERSION = '1.13';
+our $VERSION = '1.9900';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
-use base 'Moose::Meta::Method::Accessor::Native::Array::Writer';
+use Moose::Role;
+
+with 'Moose::Meta::Method::Accessor::Native::Array::Writer' => {
+    -excludes => [
+        qw(
+            _maximum_arguments
+            _inline_capture_return_value
+            _inline_optimized_set_new_value
+            _return_value
+            )
+    ]
+};
 
 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 }[ 1 .. \$#{ $slot_access } ] : () ]";
+    return '[ @{ (' . $slot_access . ') } > 1 '
+             . '? @{ (' . $slot_access . ') }[1..$#{ (' . $slot_access . ') }] '
+             . ': () ]';
 }
 
 sub _inline_capture_return_value {
-    my ( $self, $slot_access ) = @_;
+    my $self = shift;
+    my ($slot_access) = @_;
 
-    return "my \$old = ${slot_access}->[0];";
+    return 'my $old = ' . $slot_access . '->[0];';
 }
 
 sub _inline_optimized_set_new_value {
-    my ( $self, $inv, $new, $slot_access ) = @_;
+    my $self = shift;
+    my ($inv, $new, $slot_access) = @_;
 
-    return "shift \@{ $slot_access };";
+    return 'shift @{ (' . $slot_access . ') };';
 }
 
 sub _return_value {
-    my ( $self, $slot_access ) = @_;
+    my $self = shift;
+    my ($slot_access) = @_;
 
-    return 'return $old';
+    return '$old';
 }
 
+no Moose::Role;
+
 1;