refactor constructor inlining to reuse attribute code

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

diff --git a/lib/Moose/Meta/Method/Accessor/Native/Array/set.pm b/lib/Moose/Meta/Method/Accessor/Native/Array/set.pm
index e25c976..6860f10 100644 (file)
--- a/lib/Moose/Meta/Method/Accessor/Native/Array/set.pm
+++ b/lib/Moose/Meta/Method/Accessor/Native/Array/set.pm
@@ -3,7 +3,7 @@ package Moose::Meta::Method::Accessor::Native::Array::set;
 use strict;
 use warnings;
 
-our $VERSION = '1.15';
+our $VERSION = '1.19';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -15,6 +15,7 @@ with 'Moose::Meta::Method::Accessor::Native::Array::Writer' => {
             _minimum_arguments
             _maximum_arguments
             _inline_check_arguments
+            _inline_coerce_new_values
             _new_members
             _inline_optimized_set_new_value
             _return_value
@@ -35,24 +36,42 @@ sub _inline_check_arguments {
 sub _adds_members { 1 }
 
 sub _potential_value {
-    my ( $self, $slot_access ) = @_;
+    my $self = shift;
+    my ($slot_access) = @_;
 
-    return
-        "( do { my \@potential = \@{ $slot_access }; \$potential[ \$_[0] ] = \$_[1]; \\\@potential } )";
+    return '(do { '
+             . 'my @potential = @{ (' . $slot_access . ') }; '
+             . '$potential[$_[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_tc_obj->coerce($_[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 "${slot_access}->[ \$_[0] ] = \$_[1]";
+    return $slot_access . '->[$_[0]] = $_[1];';
 }
 
 sub _return_value {
-    my ( $self, $slot_access ) = @_;
+    my $self = shift;
+    my ($slot_access) = @_;
 
-    return "return ${slot_access}->[ \$_[0] ];";
+    return $slot_access . '->[$_[0]]';
 }
 
 no Moose::Role;