Allow overloading on arguments to native trait methods

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

diff --git a/lib/Moose/Meta/Method/Accessor/Native/String/substr.pm b/lib/Moose/Meta/Method/Accessor/Native/String/substr.pm
index 2dd8c42..4a48f1f 100644 (file)
--- a/lib/Moose/Meta/Method/Accessor/Native/String/substr.pm
+++ b/lib/Moose/Meta/Method/Accessor/Native/String/substr.pm
@@ -3,14 +3,38 @@ package Moose::Meta::Method::Accessor::Native::String::substr;
 use strict;
 use warnings;
 
-our $VERSION = '1.13';
+use Moose::Util ();
+
+our $VERSION = '1.14';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
-use base qw(
-    Moose::Meta::Method::Accessor::Native::String::Reader
-    Moose::Meta::Method::Accessor::Native::String::Writer
-);
+use Moose::Role;
+
+with 'Moose::Meta::Method::Accessor::Native::Reader' => {
+    -excludes => [
+        qw( _generate_method
+            _minimum_arguments
+            _maximum_arguments
+            _inline_process_arguments
+            _inline_check_arguments
+            _return_value
+            )
+    ]
+    },
+    'Moose::Meta::Method::Accessor::Native::Writer' => {
+    -excludes => [
+        qw(
+            _generate_method
+            _minimum_arguments
+            _maximum_arguments
+            _inline_process_arguments
+            _inline_check_arguments
+            _inline_optimized_set_new_value
+            _return_value
+            )
+    ]
+    };
 
 sub _generate_method {
     my $self = shift;
@@ -28,11 +52,11 @@ sub _generate_method {
 
     $code .= "\n" . 'if ( @_ == 1 || @_ == 2 ) {';
 
-    $code .= $self->_reader_core( $inv, $slot_access, @_ );
+    $code .= $self->_reader_core( $inv, $slot_access );
 
     $code .= "\n" . '} elsif ( @_ == 3 ) {';
 
-    $code .= $self->_writer_core( $inv, $slot_access, @_ );
+    $code .= $self->_writer_core( $inv, $slot_access );
 
     $code .= "\n" . $self->_inline_post_body(@_);
 
@@ -64,17 +88,17 @@ sub _inline_check_arguments {
     my $code
         = $self->_inline_throw_error(
         q{'The first argument passed to substr must be an integer'})
-        . q{ if ref $offset || $offset !~ /^-?\\d+$/;} . "\n"
+        . q{ unless $offset =~ /^-?\\d+$/;} . "\n"
         . $self->_inline_throw_error(
-        q{'The second argument passed to substr must be a positive integer'})
-        . q{ if ref $length || $offset !~ /^-?\\d+$/;};
+        q{'The second argument passed to substr must be an integer'})
+        . q{ unless $length =~ /^-?\\d+$/;};
 
     if ($for_writer) {
         $code
             .= "\n"
             . $self->_inline_throw_error(
             q{'The third argument passed to substr must be a string'})
-            . q{ unless defined $replacement && ! ref $replacement;};
+            . q{ unless Moose::Util::_STRINGLIKE($replacement);};
     }
 
     return $code;
@@ -90,7 +114,7 @@ sub _potential_value {
 sub _inline_optimized_set_new_value {
     my ( $self, $inv, $new, $slot_access ) = @_;
 
-    return "substr $slot_access, \$offset, \$length, \$replacement;";
+    return "substr $slot_access, \$offset, \$length, \$replacement";
 }
 
 sub _return_value {
@@ -101,4 +125,6 @@ sub _return_value {
     return "substr $slot_access, \$offset, \$length";
 }
 
+no Moose::Role;
+
 1;