bump version to 1.19

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

diff --git a/lib/Moose/Meta/Method/Accessor/Native/Hash/accessor.pm b/lib/Moose/Meta/Method/Accessor/Native/Hash/accessor.pm
index cd52e07..3d9b21e 100644 (file)
--- a/lib/Moose/Meta/Method/Accessor/Native/Hash/accessor.pm
+++ b/lib/Moose/Meta/Method/Accessor/Native/Hash/accessor.pm
@@ -3,14 +3,34 @@ package Moose::Meta::Method::Accessor::Native::Hash::accessor;
 use strict;
 use warnings;
 
-our $VERSION = '1.13';
+our $VERSION = '1.19';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
-use base qw(
-    Moose::Meta::Method::Accessor::Native::Hash::set
-    Moose::Meta::Method::Accessor::Native::Hash::get
-);
+use Moose::Role;
+
+with 'Moose::Meta::Method::Accessor::Native::Hash::set' => {
+    -excludes => [
+        qw(
+            _generate_method
+            _minimum_arguments
+            _maximum_arguments
+            _inline_check_arguments
+            _return_value
+            )
+    ]
+    },
+    'Moose::Meta::Method::Accessor::Native::Hash::get' => {
+    -excludes => [
+        qw(
+            _generate_method
+            _minimum_arguments
+            _maximum_arguments
+            _inline_check_argument_count
+            _inline_process_arguments
+            )
+    ]
+    };
 
 sub _generate_method {
     my $self = shift;
@@ -31,7 +51,7 @@ sub _generate_method {
     # get
     $code .= "\n" . 'if ( @_ == 1 ) {';
 
-    $code .= "\n" . $self->_inline_check_var_is_valid_index('$_[0]');
+    $code .= "\n" . $self->_inline_check_var_is_valid_key('$_[0]');
 
     $code
         .= "\n"
@@ -44,29 +64,9 @@ sub _generate_method {
     # set
     $code .= "\n" . '} else {';
 
-    $code .= "\n" . $self->_inline_check_argument_count;
-
-    $code
-        .= "\n"
-        . $self
-        ->Moose::Meta::Method::Accessor::Native::Hash::set::_inline_check_arguments;
-
-    my $potential_value = $self->_potential_value($slot_access);
-
-    $code .= "\n"
-        . $self->_inline_tc_code(
-        $potential_value,
-        $slot_access,
-        );
-
-    $code .= "\n" . $self->_inline_get_old_value_for_trigger($inv);
-    $code .= "\n" . $self->_inline_capture_return_value($slot_access);
-
-    $code
-        .= "\n" . $self->_inline_store( $inv, '[' . $potential_value . ']' );
+    $code .= "\n" . $self->_writer_core( $inv, $slot_access );
 
     $code .= "\n" . $self->_inline_post_body(@_);
-    $code .= "\n" . $self->_inline_trigger( $inv, $slot_access, '@old' );
 
     $code .= "\n}";
     $code .= "\n}";
@@ -74,18 +74,9 @@ sub _generate_method {
     return $code;
 }
 
-# If we get one argument we won't check the argument count
-sub _minimum_arguments {2}
+sub _minimum_arguments {1}
 sub _maximum_arguments {2}
 
-sub _adds_members {1}
-
-sub _potential_value {
-    my ( $self, $slot_access ) = @_;
-
-    return "%{ $slot_access, @_ }";
-}
-
-sub _new_members {'$_[1]'}
+no Moose::Role;
 
 1;