bump version to 1.25

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

diff --git a/lib/Moose/Meta/Method/Accessor/Native.pm b/lib/Moose/Meta/Method/Accessor/Native.pm
index 432800c..7fb6e9f 100644 (file)
--- a/lib/Moose/Meta/Method/Accessor/Native.pm
+++ b/lib/Moose/Meta/Method/Accessor/Native.pm
@@ -6,30 +6,17 @@ use warnings;
 use Carp qw( confess );
 use Scalar::Util qw( blessed weaken );
 
-our $VERSION = '1.13';
+our $VERSION = '1.25';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
-use base 'Moose::Meta::Method::Accessor', 'Moose::Meta::Method::Delegation';
+use Moose::Role;
 
-sub new {
+around new => sub {
+    my $orig = shift;
     my $class   = shift;
     my %options = @_;
 
-    die "Cannot instantiate a $class object directly"
-        if $class eq __PACKAGE__;
-
-    ( exists $options{attribute} )
-        || confess "You must supply an attribute to construct with";
-
-    ( blessed( $options{attribute} )
-            && $options{attribute}->isa('Class::MOP::Attribute') )
-        || confess
-        "You must supply an attribute which is a 'Class::MOP::Attribute' instance";
-
-    ( $options{package_name} && $options{name} )
-        || confess "You must supply the package_name and name parameters";
-
     exists $options{curried_arguments}
         || ( $options{curried_arguments} = [] );
 
@@ -38,25 +25,20 @@ sub new {
         || confess
         'You must supply a curried_arguments which is an ARRAY reference';
 
-    $options{delegate_to_method} = lc( ( split /::/, $class)[-1] );
-
     $options{definition_context} = $options{attribute}->definition_context;
 
-    my $self = $class->_new( \%options );
-
-    weaken( $self->{'attribute'} );
+    $options{accessor_type} = 'native';
 
-    $self->_initialize_body;
+    return $class->$orig(%options);
+};
 
-    return $self;
-}
-
-sub _new {
+around _new => sub {
+    shift;
     my $class = shift;
     my $options = @_ == 1 ? $_[0] : {@_};
 
     return bless $options, $class;
-}
+};
 
 sub root_types { (shift)->{'root_types'} }
 
@@ -68,16 +50,6 @@ sub _initialize_body {
     return;
 }
 
-sub _eval_environment {
-    my $self = shift;
-
-    my $env = $self->SUPER::_eval_environment;
-
-    $env->{'@curried'} = $self->curried_arguments;
-
-    return $env;
-}
-
 sub _inline_curried_arguments {
     my $self = shift;
 
@@ -125,6 +97,50 @@ sub _inline_check_argument_count {
 sub _minimum_arguments { 0 }
 sub _maximum_arguments { undef }
 
-sub _inline_check_arguments { q{} }
+override _inline_get => sub {
+    my ( $self, $instance ) = @_;
+
+    return $self->_slot_access_can_be_inlined
+        ? super()
+        : "${instance}->\$reader";
+};
+
+override _inline_store => sub {
+    my ( $self, $instance, $value ) = @_;
+
+    return $self->_slot_access_can_be_inlined
+        ? super()
+        : "${instance}->\$writer($value)";
+};
+
+override _eval_environment => sub {
+    my $self = shift;
+
+    my $env = super();
+
+    $env->{'@curried'} = $self->curried_arguments;
+
+    return $env if $self->_slot_access_can_be_inlined;
+
+    my $reader = $self->associated_attribute->get_read_method_ref;
+    $reader = $reader->body if blessed $reader;
+
+    $env->{'$reader'} = \$reader;
+
+    my $writer = $self->associated_attribute->get_write_method_ref;
+    $writer = $writer->body if blessed $writer;
+
+    $env->{'$writer'} = \$writer;
+
+    return $env;
+};
+
+sub _slot_access_can_be_inlined {
+    my $self = shift;
+
+    return $self->is_inline && $self->_instance_is_inlinable;
+}
+
+no Moose::Role;
 
 1;