make native trait inlining work

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

diff --git a/lib/Moose/Meta/Method/Accessor/Native/Array/splice.pm b/lib/Moose/Meta/Method/Accessor/Native/Array/splice.pm
index f68db7a..caccb7f 100644 (file)
--- a/lib/Moose/Meta/Method/Accessor/Native/Array/splice.pm
+++ b/lib/Moose/Meta/Method/Accessor/Native/Array/splice.pm
@@ -15,7 +15,7 @@ with 'Moose::Meta::Method::Accessor::Native::Array::Writer' => {
             _minimum_arguments
             _inline_process_arguments
             _inline_check_arguments
-            _inline_optimized_set_new_value
+            _optimized_set_new_value
             _return_value
             )
     ]
@@ -26,35 +26,52 @@ sub _minimum_arguments { 1 }
 sub _adds_members { 1 }
 
 sub _inline_process_arguments {
-    return 'my $idx = shift;' . "\n" . 'my $len = @_ ? shift : undef;';
+    return (
+        'my $idx = shift;',
+        'my $len = @_ ? shift : undef;',
+    );
 }
 
 sub _inline_check_arguments {
     my $self = shift;
 
-    return
-          $self->_inline_check_var_is_valid_index('$idx') . "\n"
-        . $self->_inline_throw_error(q{'The length argument passed to splice must be an integer'})
-        . ' if defined $len && $len !~ /^-?\\d+$/;';
+    return (
+        $self->_inline_check_var_is_valid_index('$idx'),
+        'if (defined($len) && $len !~ /^-?\d+$/) {',
+            $self->_inline_throw_error(
+                '"The length argument passed to splice must be an integer"',
+            ) . ';',
+        '}',
+    );
 }
 
 sub _potential_value {
-    my ( $self, $slot_access ) = @_;
-
-    return "( do { my \@potential = \@{ ($slot_access) };"
-        . '@return = defined $len ? ( splice @potential, $idx, $len, @_ ) : ( splice @potential, $idx ); \\@potential } )';
+    my $self = shift;
+    my ($slot_access) = @_;
+
+    return '(do { '
+             . 'my @potential = @{ (' . $slot_access . ') }; '
+             . '@return = defined $len '
+                 . '? (splice @potential, $idx, $len, @_) '
+                 . ': (splice @potential, $idx); '
+                 . '\@potential;'
+         . '})';
 }
 
-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 "\@return = defined \$len ? ( splice \@{ ($slot_access) }, \$idx, \$len, \@_ ) : ( splice \@{ ($slot_access) }, \$idx )";
+    return '@return = defined $len '
+             . '? (splice @{ (' . $slot_access . ') }, $idx, $len, @_) '
+             . ': (splice @{ (' . $slot_access . ') }, $idx)';
 }
 
 sub _return_value {
-    my ($self, $slot_access) = @_;
+    my $self = shift;
+    my ($slot_access) = @_;
 
-    return 'return wantarray ? @return : $return[-1]';
+    return 'wantarray ? @return : $return[-1]';
 }
 
 no Moose::Role;