X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FMethod%2FConstructor.pm;h=82459c58a2fb984a3535dc061892099a932c237a;hp=aee0a7f4e18c25c737c132535c87abeeb5dcb0b8;hb=9dcd7d2378107301c0f815a407b3b4e55c2909f8;hpb=ca3bebbd17ab60180dd0e722f43fd29be9b80f06

diff --git a/lib/Mouse/Meta/Method/Constructor.pm b/lib/Mouse/Meta/Method/Constructor.pm
index aee0a7f..82459c5 100644
--- a/lib/Mouse/Meta/Method/Constructor.pm
+++ b/lib/Mouse/Meta/Method/Constructor.pm
@@ -5,9 +5,9 @@ use warnings;
 sub generate_constructor_method_inline {
     my ($class, $meta) = @_;
 
-    my @attrs = $meta->compute_all_applicable_attributes; # this one is using by evaled code
+    my @attrs = $meta->compute_all_applicable_attributes;
     my $buildall = $class->_generate_BUILDALL($meta);
-    my $buildargs = $class->_generate_BUILDARGS();
+    my $buildargs = $class->_generate_BUILDARGS($meta);
     my $processattrs = $class->_generate_processattrs($meta, \@attrs);
 
     my $code = <<"...";
@@ -21,8 +21,6 @@ sub generate_constructor_method_inline {
     }
 ...
 
-    warn $code if $ENV{DEBUG};
-
     local $@;
     my $res = eval $code;
     die $@ if $@;
@@ -32,106 +30,109 @@ sub generate_constructor_method_inline {
 sub _generate_processattrs {
     my ($class, $meta, $attrs) = @_;
     my @res;
-    for my $index (0..scalar(@$attrs)-1) {
+
+    for my $index (0 .. @$attrs - 1) {
         my $attr = $attrs->[$index];
-        my $from = $attr->init_arg;
         my $key  = $attr->name;
+        my $code = '';
 
-        my $set_value = do {
-            my @code;
+        if (defined $attr->init_arg) {
+            my $from = $attr->init_arg;
 
-            if ($attr->should_coerce) {
-                push @code, "my \$value = \$attr->coerce_constraint( \$args->{'$from'});";
+            $code .= "if (exists \$args->{'$from'}) {\n";
+
+            if ($attr->should_coerce && $attr->type_constraint) {
+                $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'};";
+                $code .= "my \$value = \$args->{'$from'};";
             }
 
             if ($attr->has_type_constraint) {
-                push @code, "\$attr->verify_type_constraint( \$value );";
+                $code .= "{local \$_ = \$value; unless (\$attrs[$index]->{find_type_constraint}->(\$_)) {";
+                $code .= "\$attrs[$index]->verify_type_constraint_error('$key', \$_, \$attrs[$index]->type_constraint)}}";
             }
 
-            push @code, "\$instance->{'$key'} = \$value;";
+            $code .= "\$instance->{'$key'} = \$value;";
 
             if ($attr->is_weak_ref) {
-                push @code, "weaken( \$instance->{'$key'} ) if ref( \$value );";
+                $code .= "Scalar::Util::weaken( \$instance->{'$key'} ) if ref( \$value );";
             }
 
-            if ( $attr->has_trigger ) {
-                push @code, "\$attr->trigger->( \$instance, \$value, \$attr );";
+            if ($attr->has_trigger) {
+                $code .= "\$attrs[$index]->{trigger}->( \$instance, \$value, \$attrs[$index] );";
             }
 
-            join "\n", @code;
-        };
+            $code .= "} else {";
+        }
 
-        my $make_default_value = do {
-            my @code;
+        if ($attr->has_default || $attr->has_builder) {
+            unless ($attr->is_lazy) {
+                my $default = $attr->default;
+                my $builder = $attr->builder;
 
-            if ( $attr->has_default || $attr->has_builder ) {
-                unless ( $attr->is_lazy ) {
-                    my $default = $attr->default;
-                    my $builder = $attr->builder;
+                $code .= "my \$value = ";
 
-                    push @code, "my \$value = ";
+                if ($attr->should_coerce && $attr->type_constraint) {
+                    $code .= "Mouse::TypeRegistry->typecast_constraints('".$attr->associated_class->name."', \$attrs[$index]->{find_type_constraint}, \$attrs[$index]->{type_constraint}, ";
+                }
 
-                    if ($attr->should_coerce) {
-                        push @code, "\$attr->coerce_constraint(";
+                    if ($attr->has_builder) {
+                        $code .= "\$instance->$builder";
                     }
-
-                        if ($attr->has_builder) {
-                            push @code, "\$instance->$builder";
-                        }
-                        elsif (ref($default) eq 'CODE') {
-                            push @code, "\$attr->default()->()";
-                        }
-                        else {
-                            push @code, "\$attr->default()";
-                        }
-
-                    if ($attr->should_coerce) {
-                        push @code, ");";
+                    elsif (ref($default) eq 'CODE') {
+                        $code .= "\$attrs[$index]->{default}->(\$instance)";
                     }
-                    else {
-                        push @code, ";";
+                    elsif (!defined($default)) {
+                        $code .= 'undef';
                     }
-
-                    if ($attr->has_type_constraint) {
-                        push @code, "\$attr->verify_type_constraint(\$value);";
+                    elsif ($default =~ /^\-?[0-9]+(?:\.[0-9]+)$/) {
+                        $code .= $default;
                     }
-
-                    push @code, "\$instance->{'$key'} = \$value;";
-
-                    if ($attr->is_weak_ref) {
-                        push @code, "weaken( \$instance->{'$key'} ) if ref( \$value );";
+                    else {
+                        $code .= "'$default'";
                     }
+
+                if ($attr->should_coerce) {
+                    $code .= ");";
                 }
-                join "\n", @code;
-            }
-            else {
-                if ( $attr->is_required ) {
-                    qq{Carp::confess("Attribute ($key) is required");};
-                } else {
-                    ""
+                else {
+                    $code .= ";";
                 }
-            }
-        };
-        my $code = <<"...";
-            {
-                my \$attr = \$attrs[$index];
-                if (exists(\$args->{'$from'})) {
-                    $set_value;
-                } else {
-                    $make_default_value;
+
+                if ($attr->has_type_constraint) {
+                    $code .= "{local \$_ = \$value; unless (\$attrs[$index]->{find_type_constraint}->(\$_)) {";
+                    $code .= "\$attrs[$index]->verify_type_constraint_error('$key', \$_, \$attrs[$index]->type_constraint)}}";
+                }
+
+                $code .= "\$instance->{'$key'} = \$value;";
+
+                if ($attr->is_weak_ref) {
+                    $code .= "Scalar::Util::weaken( \$instance->{'$key'} ) if ref( \$value );";
                 }
             }
-...
+        }
+        elsif ($attr->is_required) {
+            $code .= qq{Carp::confess("Attribute ($key) is required");};
+        }
+
+        $code .= "}" if defined $attr->init_arg;
+
         push @res, $code;
     }
+
     return join "\n", @res;
 }
 
 sub _generate_BUILDARGS {
-    <<'...';
+    my $self = shift;
+    my $meta = shift;
+
+    if ($meta->name->can('BUILDARGS') != Mouse::Object->can('BUILDARGS')) {
+        return '$class->BUILDARGS(@_)';
+    }
+
+    return <<'...';
     do {
         if ( scalar @_ == 1 ) {
             if ( defined $_[0] ) {
@@ -160,7 +161,7 @@ sub _generate_BUILDALL {
     no strict 'refs';
     for my $klass ($meta->linearized_isa) {
         if (*{ $klass . '::BUILD' }{CODE}) {
-            push  @code, qq{${klass}::BUILD->(\$instance, \$args);};
+            push  @code, qq{${klass}::BUILD(\$instance, \$args);};
         }
     }
     return join "\n", @code;