make native trait inlining work

[gitmo/Moose.git] / lib / Moose / Meta / Method / Accessor / Native / Hash / delete.pm

diff --git a/lib/Moose/Meta/Method/Accessor/Native/Hash/delete.pm b/lib/Moose/Meta/Method/Accessor/Native/Hash/delete.pm
index 5c7ae78..f530b41 100644 (file)
--- a/lib/Moose/Meta/Method/Accessor/Native/Hash/delete.pm
+++ b/lib/Moose/Meta/Method/Accessor/Native/Hash/delete.pm
@@ -12,7 +12,7 @@ use Moose::Role;
 with 'Moose::Meta::Method::Accessor::Native::Hash::Writer' => {
     -excludes => [
         qw(
-            _inline_optimized_set_new_value
+            _optimized_set_new_value
             _return_value
             )
     ],
@@ -21,21 +21,28 @@ with 'Moose::Meta::Method::Accessor::Native::Hash::Writer' => {
 sub _adds_members { 0 }
 
 sub _potential_value {
-    my ( $self, $slot_access ) = @_;
-
-    return "( do { my \%potential = %{ ($slot_access) }; \@return = delete \@potential{\@_}; \\\%potential; } )";
+    my $self = shift;
+    my ($slot_access) = @_;
+
+    return '(do { '
+             . 'my %potential = %{ (' . $slot_access . ') }; '
+             . '@return = delete @potential{@_}; '
+             . '\%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 = delete \@{ ($slot_access) }{\@_}";
+    return '@return = delete @{ (' . $slot_access . ') }{@_}';
 }
 
 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;