X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FMethod%2FAccessor%2FNative%2FArray%2Finsert.pm;h=f815dc140fc314a5bae14f6d6b8802b19d04f60a;hb=00bbc132f9e1cb2b1a44aa287887cafa27a84577;hp=19674ac1132435ebf00d1563d8fa61708b5a2269;hpb=10bd99ecf3f1706d4452fa57e3f08a63b9f92a11;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Method/Accessor/Native/Array/insert.pm b/lib/Moose/Meta/Method/Accessor/Native/Array/insert.pm
index 19674ac..f815dc1 100644
--- a/lib/Moose/Meta/Method/Accessor/Native/Array/insert.pm
+++ b/lib/Moose/Meta/Method/Accessor/Native/Array/insert.pm
@@ -3,11 +3,9 @@ package Moose::Meta::Method::Accessor::Native::Array::insert;
 use strict;
 use warnings;
 
-our $VERSION = '1.14';
-$VERSION = eval $VERSION;
-our $AUTHORITY = 'cpan:STEVAN';
+use Moose::Role;
 
-use base 'Moose::Meta::Method::Accessor::Native::Array::Writer';
+with 'Moose::Meta::Method::Accessor::Native::Array::Writer';
 
 sub _minimum_arguments { 2 }
 
@@ -16,18 +14,44 @@ sub _maximum_arguments { 2 }
 sub _adds_members { 1 }
 
 sub _potential_value {
-    my ( $self, $slot_access ) = @_;
-
-    return
-        "( do { my \@potential = \@{ $slot_access }; splice \@potential, \$_[0], 0, \$_[1]; \\\@potential } )";
+    my $self = shift;
+    my ($slot_access) = @_;
+
+    return '(do { '
+             . 'my @potential = @{ (' . $slot_access . ') }; '
+             . 'splice @potential, $_[0], 0, $_[1]; '
+             . '\@potential; '
+         . '})';
 }
 
+# We need to override this because while @_ can be written to, we cannot write
+# directly to $_[1].
+sub _inline_coerce_new_values {
+    my $self = shift;
+
+    return unless $self->associated_attribute->should_coerce;
+
+    return unless $self->_tc_member_type_can_coerce;
+
+    return '@_ = ($_[0], $member_coercion->($_[1]));';
+};
+
 sub _new_members { '$_[1]' }
 
 sub _inline_optimized_set_new_value {
-    my ( $self, $inv, $new, $slot_access ) = @_;
+    my $self = shift;
+    my ($inv, $new, $slot_access) = @_;
 
-    return "splice \@{ $slot_access }, \$_[0], 0, \$_[1];";
+    return 'splice @{ (' . $slot_access . ') }, $_[0], 0, $_[1];';
 }
 
+sub _return_value {
+    my $self = shift;
+    my ($slot_access) = @_;
+
+    return $slot_access . '->[ $_[0] ]';
+}
+
+no Moose::Role;
+
 1;