Add explicit return values for (almost) all native delegation mutating methods

[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 2197700..7338f56 100644 (file)
--- a/lib/Moose/Meta/Method/Accessor/Native/Hash/delete.pm
+++ b/lib/Moose/Meta/Method/Accessor/Native/Hash/delete.pm
@@ -9,21 +9,33 @@ our $AUTHORITY = 'cpan:STEVAN';
 
 use Moose::Role;
 
-with 'Moose::Meta::Method::Accessor::Native::Hash::Writer' =>
-    { -excludes => ['_inline_optimized_set_new_value'] };
+with 'Moose::Meta::Method::Accessor::Native::Hash::Writer' => {
+    -excludes => [
+        qw(
+            _inline_optimized_set_new_value
+            _return_value
+            )
+    ],
+};
 
 sub _adds_members { 0 }
 
 sub _potential_value {
     my ( $self, $slot_access ) = @_;
 
-    return "( do { my \%potential = %{ $slot_access }; delete \@potential{\@_}; \\\%potential; } )";
+    return "( do { my \%potential = %{ $slot_access }; \@return = delete \@potential{\@_}; \\\%potential; } )";
 }
 
 sub _inline_optimized_set_new_value {
     my ( $self, $inv, $new, $slot_access ) = @_;
 
-    return "delete \@{ $slot_access }{\@_}";
+    return "\@return = delete \@{ $slot_access }{\@_}";
+}
+
+sub _return_value {
+    my ( $self, $slot_access ) = @_;
+
+    return 'return wantarray ? @return : $return[-1];';
 }
 
 no Moose::Role;