fix hash accessor generation (with a bit of a hack/:)

[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 b3db6d6..f74f619 100644 (file)
--- a/lib/Moose/Meta/Method/Accessor/Native/Hash/accessor.pm
+++ b/lib/Moose/Meta/Method/Accessor/Native/Hash/accessor.pm
@@ -3,10 +3,6 @@ package Moose::Meta::Method::Accessor::Native::Hash::accessor;
 use strict;
 use warnings;
 
-our $VERSION = '1.19';
-$VERSION = eval $VERSION;
-our $AUTHORITY = 'cpan:STEVAN';
-
 use Moose::Role;
 
 with 'Moose::Meta::Method::Accessor::Native::Hash::set' => {
@@ -15,8 +11,6 @@ with 'Moose::Meta::Method::Accessor::Native::Hash::set' => {
             _generate_method
             _minimum_arguments
             _maximum_arguments
-            _inline_check_arguments
-            _return_value
             )
     ]
     },
@@ -27,7 +21,9 @@ with 'Moose::Meta::Method::Accessor::Native::Hash::set' => {
             _minimum_arguments
             _maximum_arguments
             _inline_check_argument_count
+            _inline_check_arguments
             _inline_process_arguments
+            _return_value
             )
     ]
     };
@@ -36,30 +32,34 @@ sub _generate_method {
     my $self = shift;
 
     my $inv         = '$self';
-    my $slot_access = $self->_inline_get($inv);
+    my $slot_access = $self->_get_value($inv);
 
     return (
         'sub {',
-            $self->_inline_pre_body(@_),
             'my ' . $inv . ' = shift;',
             $self->_inline_curried_arguments,
-            $self->_inline_check_lazy($inv),
+            $self->_inline_check_lazy($inv, '$type_constraint', '$type_constraint_obj'),
             # get
             'if (@_ == 1) {',
+                # XXX: ugh, this is a hack - we need _return_value from
+                # both ::set and ::get, but we can only have one, so we pick
+                # the one from ::set and munge it to work for the ::get case
+                # this should be fixed in a better way
+                # -doy
+                'my @keys_idx = 0..$#_;',
                 $self->_inline_check_var_is_valid_key('$_[0]'),
                 $self->Moose::Meta::Method::Accessor::Native::Hash::get::_inline_return_value($slot_access),
             '}',
             # set
             'else {',
-                $self->_writer_core($inv, $slot_access),
-                $self->_inline_post_body(@_),
+                $self->_inline_writer_core($inv, $slot_access),
             '}',
         '}',
     );
 }
 
-sub _minimum_arguments {1}
-sub _maximum_arguments {2}
+sub _minimum_arguments { 1 }
+sub _maximum_arguments { 2 }
 
 no Moose::Role;