X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FMethod%2FAccessor%2FNative%2FArray%2Fsort.pm;h=c3c5a138788ae037ae71287c16dc99ed63b352bc;hb=f4b86ac0e1fd7ff8a180f2f8332821170db5371e;hp=338ad1d89e27729f01e9d778bb297af4bd7b9e7c;hpb=910684ee2db21699bfff41b3b62b3728203024f9;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Method/Accessor/Native/Array/sort.pm b/lib/Moose/Meta/Method/Accessor/Native/Array/sort.pm
index 338ad1d..c3c5a13 100644
--- a/lib/Moose/Meta/Method/Accessor/Native/Array/sort.pm
+++ b/lib/Moose/Meta/Method/Accessor/Native/Array/sort.pm
@@ -3,19 +3,31 @@ package Moose::Meta::Method::Accessor::Native::Array::sort;
 use strict;
 use warnings;
 
-our $VERSION = '1.13';
+use Params::Util ();
+
+our $VERSION = '1.16';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
-use base 'Moose::Meta::Method::Accessor::Native::Array::Reader';
+use Moose::Role;
 
-sub _inline_process_arguments {
-    return 'my $func = shift if @_;';
-}
+with 'Moose::Meta::Method::Accessor::Native::Reader' => {
+    -excludes => [
+        qw(
+            _maximum_arguments
+            _inline_check_arguments
+            )
+    ]
+};
+
+sub _maximum_arguments { 1 }
 
 sub _inline_check_arguments {
-    return
-        q{die 'Argument must be a code reference' if $func && ( ref $func || q{} ) ne 'CODE';};
+    my $self = shift;
+
+    return $self->_inline_throw_error(
+        q{'The argument passed to sort must be a code reference'})
+        . q{ if @_ && ! Params::Util::_CODELIKE( $_[0] );};
 }
 
 sub _return_value {
@@ -23,7 +35,9 @@ sub _return_value {
     my $slot_access = shift;
 
     return
-        "\$func ? sort { \$func->( \$a, \$b ) } \@{ ${slot_access} } : sort \@{ $slot_access }";
+        "\$_[0] ? sort { \$_[0]->( \$a, \$b ) } \@{ ${slot_access} } : sort \@{ $slot_access }";
 }
 
+no Moose::Role;
+
 1;