stop using excludes within moose, since it's no longer necessary

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

diff --git a/lib/Moose/Meta/Method/Accessor/Native/Counter/reset.pm b/lib/Moose/Meta/Method/Accessor/Native/Counter/reset.pm
index 843e65a..f159623 100644 (file)
--- a/lib/Moose/Meta/Method/Accessor/Native/Counter/reset.pm
+++ b/lib/Moose/Meta/Method/Accessor/Native/Counter/reset.pm
@@ -3,40 +3,31 @@ package Moose::Meta::Method::Accessor::Native::Counter::reset;
 use strict;
 use warnings;
 
-our $VERSION = '1.15';
-$VERSION = eval $VERSION;
-our $AUTHORITY = 'cpan:STEVAN';
-
 use Moose::Role;
 
-with 'Moose::Meta::Method::Accessor::Native::Writer' => {
-    -excludes => [
-        qw(
-            _maximum_arguments
-            _inline_optimized_set_new_value
-            _return_value
-            )
-    ]
-};
+with 'Moose::Meta::Method::Accessor::Native::Writer';
 
 sub _maximum_arguments { 0 }
 
 sub _potential_value {
-    my ( $self, $slot_access ) = @_;
+    my $self = shift;
+    my ($slot_access) = @_;
 
-    return "\$attr->default(\$self)"
-}
+    my $attr = $self->associated_attribute;
 
-sub _inline_optimized_set_new_value {
-    my ( $self, $inv, $new, $slot_access ) = @_;
-
-    return "$slot_access = \$attr->default(\$self)";
+    return '(do { '
+             . join(' ', $attr->_inline_generate_default(
+                   '$self', '$default_for_reset'
+               )) . ' '
+             . '$default_for_reset; '
+         . '})';
 }
 
-sub _return_value {
-    my ( $self, $slot_access ) = @_;
+sub _inline_optimized_set_new_value {
+    my $self = shift;
+    my ($inv, $new, $slot_access) = @_;
 
-    return "return $slot_access;";
+    return $slot_access . ' = ' . $self->_potential_value . ';';
 }
 
 no Moose::Role;