make native trait inlining work

[gitmo/Moose.git] / lib / Moose / Meta / Method / Accessor / Native / Array / pop.pm

diff --git a/lib/Moose/Meta/Method/Accessor/Native/Array/pop.pm b/lib/Moose/Meta/Method/Accessor/Native/Array/pop.pm
index f185152..6a91814 100644 (file)
--- a/lib/Moose/Meta/Method/Accessor/Native/Array/pop.pm
+++ b/lib/Moose/Meta/Method/Accessor/Native/Array/pop.pm
@@ -3,38 +3,55 @@ package Moose::Meta::Method::Accessor::Native::Array::pop;
 use strict;
 use warnings;
 
-our $VERSION = '1.14';
+our $VERSION = '1.19';
 $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
+            _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 }[ 0 .. \$#{ $slot_access } - 1 ] : () ]";
+    return '[ @{ (' . $slot_access . ') } > 1 '
+             . '? @{ (' . $slot_access . ') }[0..$#{ (' . $slot_access . ') } - 1] '
+             . ': () ]';
 }
 
 sub _inline_capture_return_value {
-    my ( $self, $slot_access ) = @_;
+    my $self = shift;
+    my ($slot_access) = @_;
 
-    return "my \$old = ${slot_access}->[-1];";
+    return 'my $old = ' . $slot_access . '->[-1];';
 }
 
-sub _inline_optimized_set_new_value {
-    my ( $self, $inv, $new, $slot_access ) = @_;
+sub _optimized_set_new_value {
+    my $self = shift;
+    my ($inv, $new, $slot_access) = @_;
 
-    return "pop \@{ $slot_access }";
+    return 'pop @{ (' . $slot_access . ') }';
 }
 
 sub _return_value {
-    my ( $self, $slot_access ) = @_;
+    my $self = shift;
+    my ($slot_access) = @_;
 
-    return 'return $old;';
+    return '$old';
 }
 
+no Moose::Role;
+
 1;