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=0c9adb038416edfbf8479dd20167bbf17897345d;hb=00bbc132f9e1cb2b1a44aa287887cafa27a84577;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..0c9adb0 100644
--- a/lib/Moose/Meta/Method/Accessor/Native/Array/sort.pm
+++ b/lib/Moose/Meta/Method/Accessor/Native/Array/sort.pm
@@ -3,27 +3,35 @@ package Moose::Meta::Method::Accessor::Native::Array::sort;
 use strict;
 use warnings;
 
-our $VERSION = '1.13';
-$VERSION = eval $VERSION;
-our $AUTHORITY = 'cpan:STEVAN';
+use Params::Util ();
 
-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';
+
+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 (
+        'if (@_ && !Params::Util::_CODELIKE($_[0])) {',
+            $self->_inline_throw_error(
+                '"The argument passed to sort must be a code reference"',
+            ) . ';',
+        '}',
+    );
 }
 
 sub _return_value {
-    my $self        = shift;
-    my $slot_access = shift;
+    my $self = shift;
+    my ($slot_access) = @_;
 
-    return
-        "\$func ? sort { \$func->( \$a, \$b ) } \@{ ${slot_access} } : sort \@{ $slot_access }";
+    return '$_[0] '
+             . '? sort { $_[0]->($a, $b) } @{ (' . $slot_access . ') } '
+             . ': sort @{ (' . $slot_access . ') }';
 }
 
+no Moose::Role;
+
 1;