make native trait inlining work

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

diff --git a/lib/Moose/Meta/Method/Accessor/Native/Reader.pm b/lib/Moose/Meta/Method/Accessor/Native/Reader.pm
index 957207c..5909153 100644 (file)
--- a/lib/Moose/Meta/Method/Accessor/Native/Reader.pm
+++ b/lib/Moose/Meta/Method/Accessor/Native/Reader.pm
@@ -16,49 +16,36 @@ requires '_return_value';
 sub _generate_method {
     my $self = shift;
 
-    my $inv = '$self';
-
-    my $code = 'sub {';
-    $code .= "\n" . $self->_inline_pre_body(@_);
-
-    $code .= "\n" . 'my $self = shift;';
-
-    $code .= "\n" . $self->_inline_curried_arguments;
-
+    my $inv         = '$self';
     my $slot_access = $self->_inline_get($inv);
 
-    $code .= "\n" . $self->_reader_core( $inv, $slot_access, @_ );
-
-    $code .= "\n}";
-
-    return $code;
+    return (
+        'sub {',
+            $self->_inline_pre_body(@_),
+            'my ' . $inv . ' = shift;',
+            $self->_inline_curried_arguments,
+            $self->_reader_core($inv, $slot_access, @_),
+        '}',
+    );
 }
 
 sub _reader_core {
-    my ( $self, $inv, $slot_access, @extra ) = @_;
-
-    my $code = q{};
-
-    $code .= "\n" . $self->_inline_check_argument_count;
-    $code .= "\n" . $self->_inline_process_arguments( $inv, $slot_access );
-    $code .= "\n" . $self->_inline_check_arguments;
-
-    $code .= "\n" . $self->_inline_check_lazy($inv);
-    $code .= "\n" . $self->_inline_post_body(@extra);
-    $code .= "\n" . $self->_inline_return_value($slot_access);
-
-    return $code;
+    my $self = shift;
+    my ($inv, $slot_access, @extra) = @_;
+
+    return (
+        $self->_inline_check_argument_count,
+        $self->_inline_process_arguments($inv, $slot_access),
+        $self->_inline_check_arguments,
+        $self->_inline_check_lazy($inv),
+        $self->_inline_post_body(@extra),
+        $self->_inline_return_value($slot_access),
+    );
 }
 
-sub _inline_process_arguments {q{}}
+sub _inline_process_arguments { return }
 
-sub _inline_check_arguments {q{}}
-
-sub _inline_return_value {
-    my ( $self, $slot_access ) = @_;
-
-    'return ' . $self->_return_value($slot_access) . ';';
-}
+sub _inline_check_arguments { return }
 
 no Moose::Role;