refactor constructor inlining to reuse attribute code

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

diff --git a/lib/Moose/Meta/Method/Accessor/Native/Array/map.pm b/lib/Moose/Meta/Method/Accessor/Native/Array/map.pm
index 3013fe0..07c65f3 100644 (file)
--- a/lib/Moose/Meta/Method/Accessor/Native/Array/map.pm
+++ b/lib/Moose/Meta/Method/Accessor/Native/Array/map.pm
@@ -3,7 +3,9 @@ package Moose::Meta::Method::Accessor::Native::Array::map;
 use strict;
 use warnings;
 
-our $VERSION = '1.14';
+use Params::Util ();
+
+our $VERSION = '1.19';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -26,16 +28,20 @@ sub _maximum_arguments { 1 }
 sub _inline_check_arguments {
     my $self = shift;
 
-    return $self->_inline_throw_error(
-        q{'The argument passed to map must be a code reference'})
-        . q{if $_[0] && ( ref $_[0] || q{} ) ne 'CODE';};
+    return (
+        'if (!Params::Util::_CODELIKE($_[0])) {',
+            $self->_inline_throw_error(
+                '"The argument passed to map must be a code reference"',
+            ) . ';',
+        '}',
+    );
 }
 
 sub _return_value {
-    my $self        = shift;
-    my $slot_access = shift;
+    my $self = shift;
+    my ($slot_access) = @_;
 
-    return "map { \$_[0]->() } \@{ $slot_access }";
+    return 'map { $_[0]->() } @{ (' . $slot_access . ') }';
 }
 
 no Moose::Role;