Add support for Type in native traits

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

diff --git a/lib/Moose/Meta/Method/Accessor/Native/Writer.pm b/lib/Moose/Meta/Method/Accessor/Native/Writer.pm
index 12230ca..2b55aae 100644 (file)
--- a/lib/Moose/Meta/Method/Accessor/Native/Writer.pm
+++ b/lib/Moose/Meta/Method/Accessor/Native/Writer.pm
@@ -4,10 +4,7 @@ use strict;
 use warnings;
 
 use List::MoreUtils qw( any );
-
-our $VERSION = '1.19';
-$VERSION = eval $VERSION;
-our $AUTHORITY = 'cpan:STEVAN';
+use Moose::Util;
 
 use Moose::Role;
 
@@ -42,7 +39,7 @@ sub _inline_writer_core {
         $self->_inline_check_argument_count,
         $self->_inline_process_arguments($inv, $slot_access),
         $self->_inline_check_arguments('for writer'),
-        $self->_inline_check_lazy($inv, '$type_constraint', '$type_constraint_obj'),
+        $self->_inline_check_lazy($inv, '$type_constraint', '$type_coercion', '$type_message'),
     );
 
     if ($self->_return_value($slot_access)) {
@@ -54,7 +51,7 @@ sub _inline_writer_core {
     push @code, (
         $self->_inline_coerce_new_values,
         $self->_inline_copy_native_value(\$potential),
-        $self->_inline_tc_code($potential, '$type_constraint', '$type_constraint_obj'),
+        $self->_inline_tc_code($potential, '$type_constraint', '$type_coercion', '$type_message'),
         $self->_inline_get_old_value_for_trigger($inv, $old),
         $self->_inline_capture_return_value($slot_access),
         $self->_inline_set_new_value($inv, $potential, $slot_access),
@@ -83,18 +80,26 @@ sub _constraint_must_be_checked {
     my $attr = $self->associated_attribute;
 
     return $attr->has_type_constraint
-        && (!$self->_is_root_type( $attr->type_constraint )
-         || ( $attr->should_coerce && $attr->type_constraint->has_coercion)
-           );
+        && ( !$self->_is_root_type( $attr->type_constraint )
+        || ( $attr->should_coerce && $attr->type_constraint->has_coercion ) );
 }
 
 sub _is_root_type {
     my $self = shift;
-    my ($type) = @_;
-
-    my $name = $type->name;
-
-    return any { $name eq $_ } @{ $self->root_types };
+    my $type = shift;
+
+    if (
+        Moose::Util::does_role( $type, 'Type::Constraint::Role::Interface' ) )
+    {
+        require Type::Library::Builtins;
+        return
+            any { $type->is_same_type_as( Type::Library::Builtins::t($_) ) }
+        @{ $self->root_types };
+    }
+    else {
+        my $name = $type->name;
+        return any { $name eq $_ } @{ $self->root_types };
+    }
 }
 
 sub _inline_copy_native_value {
@@ -113,29 +118,17 @@ sub _inline_copy_native_value {
 around _inline_tc_code => sub {
     my $orig = shift;
     my $self = shift;
-    my ($value, $tc, $tc_obj, $for_lazy) = @_;
+    my ($value, $tc, $coercion, $message, $for_lazy) = @_;
 
     return unless $for_lazy || $self->_constraint_must_be_checked;
 
     return $self->$orig(@_);
 };
 
-sub _inline_check_coercion {
-    my $self = shift;
-    my ($value, $tc, $tc_obj) = @_;
-
-    my $attr = $self->associated_attribute;
-    return unless $attr->should_coerce && $attr->type_constraint->has_coercion;
-
-    # We want to break the aliasing in @_ in case the coercion tries to make a
-    # destructive change to an array member.
-    return $value . ' = ' . $tc_obj . '->coerce(' . $value . ');';
-}
-
 around _inline_check_constraint => sub {
     my $orig = shift;
     my $self = shift;
-    my ($value, $tc, $tc_obj, $for_lazy) = @_;
+    my ($value, $tc, $message, $for_lazy) = @_;
 
     return unless $for_lazy || $self->_constraint_must_be_checked;