refactor constructor inlining to reuse attribute code

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

diff --git a/lib/Moose/Meta/Method/Accessor/Native/Array/first.pm b/lib/Moose/Meta/Method/Accessor/Native/Array/first.pm
index 83f3e3d..5d4482b 100644 (file)
--- a/lib/Moose/Meta/Method/Accessor/Native/Array/first.pm
+++ b/lib/Moose/Meta/Method/Accessor/Native/Array/first.pm
@@ -4,12 +4,23 @@ use strict;
 use warnings;
 
 use List::Util ();
+use Params::Util ();
 
-our $VERSION = '1.14';
+our $VERSION = '1.19';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
-use base 'Moose::Meta::Method::Accessor::Native::Reader';
+use Moose::Role;
+
+with 'Moose::Meta::Method::Accessor::Native::Reader' => {
+    -excludes => [
+        qw(
+            _minimum_arguments
+            _maximum_arguments
+            _inline_check_arguments
+            )
+    ]
+};
 
 sub _minimum_arguments { 1 }
 
@@ -18,16 +29,22 @@ sub _maximum_arguments { 1 }
 sub _inline_check_arguments {
     my $self = shift;
 
-    return $self->_inline_throw_error(
-        q{'The argument passed to first 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 first must be a code reference"',
+            ) . ';',
+        '}',
+    );
 }
 
 sub _return_value {
-    my $self        = shift;
-    my $slot_access = shift;
+    my $self = shift;
+    my ($slot_access) = @_;
 
-    return "&List::Util::first( \$_[0], \@{ ${slot_access} } )";
+    return '&List::Util::first($_[0], @{ (' . $slot_access . ') })';
 }
 
+no Moose::Role;
+
 1;