X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FMethod%2FConstructor.pm;h=0df3eabd6250a63536b62ef2a7842a579e0816aa;hb=f2560fde38fb3827df7a380a5774e265b092a6fd;hp=2a9bf6c6677186a42e8b6daed4bdc29a5707bd90;hpb=0e503bd950b9880c383861e1e7ef40beef90937c;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Method/Constructor.pm b/lib/Mouse/Meta/Method/Constructor.pm
index 2a9bf6c..0df3eab 100644
--- a/lib/Mouse/Meta/Method/Constructor.pm
+++ b/lib/Mouse/Meta/Method/Constructor.pm
@@ -40,25 +40,26 @@ sub _generate_processattrs {
         my $set_value = do {
             my @code;
 
-            if ($attr->should_coerce) {
-                push @code, "my \$value = \$attrs[$index]->coerce_constraint( \$args->{'$from'});";
+            if ($attr->should_coerce && $attr->type_constraint) {
+                push @code, "my \$value = Mouse::TypeRegistry->typecast_constraints('".$attr->associated_class->name."', \$attrs[$index]->{find_type_constraint}, \$attrs[$index]->{type_constraint}, \$args->{'$from'});";
             }
             else {
                 push @code, "my \$value = \$args->{'$from'};";
             }
 
             if ($attr->has_type_constraint) {
-                push @code, "\$attrs[$index]->verify_type_constraint( \$value );";
+                push @code, "{local \$_ = \$value; unless (\$attrs[$index]->{find_type_constraint}->(\$_)) {";
+                push @code, "\$attrs[$index]->verify_type_constraint_error('$key', \$_, \$attrs[$index]->type_constraint)}}";
             }
 
             push @code, "\$instance->{'$key'} = \$value;";
 
             if ($attr->is_weak_ref) {
-                push @code, "weaken( \$instance->{'$key'} ) if ref( \$value );";
+                push @code, "Scalar::Util::weaken( \$instance->{'$key'} ) if ref( \$value );";
             }
 
             if ( $attr->has_trigger ) {
-                push @code, "\$attrs[$index]->trigger->( \$instance, \$value, \$attrs[$index] );";
+                push @code, "\$attrs[$index]->{trigger}->( \$instance, \$value, \$attrs[$index] );";
             }
 
             join "\n", @code;
@@ -74,14 +75,14 @@ sub _generate_processattrs {
 
                     push @code, "my \$value = ";
 
-                    if ($attr->should_coerce) {
-                        push @code, "\$attrs[$index]->coerce_constraint(";
+                    if ($attr->should_coerce && $attr->type_constraint) {
+                        push @code, "Mouse::TypeRegistry->typecast_constraints('".$attr->associated_class->name."', \$attrs[$index]->{find_type_constraint}, \$attrs[$index]->{type_constraint}, ";
                     }
                         if ($attr->has_builder) {
                             push @code, "\$instance->$builder";
                         }
                         elsif (ref($default) eq 'CODE') {
-                            push @code, "\$attrs[$index]->default()->(\$instance)";
+                            push @code, "\$attrs[$index]->{default}->(\$instance)";
                         }
                         elsif (!defined($default)) {
                             push @code, 'undef';
@@ -101,13 +102,14 @@ sub _generate_processattrs {
                     }
 
                     if ($attr->has_type_constraint) {
-                        push @code, "\$attrs[$index]->verify_type_constraint(\$value);";
+                        push @code, "{local \$_ = \$value; unless (\$attrs[$index]->{find_type_constraint}->(\$_)) {";
+                        push @code, "\$attrs[$index]->verify_type_constraint_error('$key', \$_, \$attrs[$index]->type_constraint)}}";
                     }
 
                     push @code, "\$instance->{'$key'} = \$value;";
 
                     if ($attr->is_weak_ref) {
-                        push @code, "weaken( \$instance->{'$key'} ) if ref( \$value );";
+                        push @code, "Scalar::Util::weaken( \$instance->{'$key'} ) if ref( \$value );";
                     }
                 }
                 join "\n", @code;