X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FMethod%2FConstructor.pm;h=c0cf03e9c43f3e094d552a5c0dc6725a7096eeb0;hb=e8ba7b267968d4ca0e94d03276ca4c33fed40482;hp=2de3802411b28c164cb08fa7522b405f0ace87f5;hpb=c12edd9ac9343d9853e4b9ca9f2254336e468ffc;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Method/Constructor.pm b/lib/Mouse/Meta/Method/Constructor.pm
index 2de3802..c0cf03e 100644
--- a/lib/Mouse/Meta/Method/Constructor.pm
+++ b/lib/Mouse/Meta/Method/Constructor.pm
@@ -36,52 +36,79 @@ sub _generate_processattrs {
         my $attr = $attrs->[$index];
         my $from = $attr->init_arg;
         my $key  = $attr->name;
+
         my $part1 = do {
             my @code;
+
+            push @code, "my \$value = \$args->{'$from'};";
+
             if ($attr->should_coerce) {
-                push @code, "\$args->{\$from} = \$attr->coerce_constraint( \$args->{\$from} );";
+                push @code, "\$value = \$attr->coerce_constraint( \$value );";
             }
+
             if ($attr->has_type_constraint) {
-                push @code, "\$attr->verify_type_constraint( \$args->{\$from} );";
+                push @code, "\$attr->verify_type_constraint( \$value );";
             }
-            push @code, "\$instance->{\$key} = \$args->{\$from};";
+
+            push @code, "\$instance->{'$key'} = \$value;";
+
             if ($attr->is_weak_ref) {
-                push @code, "weaken( \$instance->{\$key} ) if ref( \$instance->{\$key} );";
+                push @code, "weaken( \$instance->{'$key'} ) if ref( \$value );";
             }
+
             if ( $attr->has_trigger ) {
-                push @code, "\$attr->trigger->( \$instance, \$args->{\$from}, \$attr );";
+                push @code, "\$attr->trigger->( \$instance, \$value, \$attr );";
             }
+
             join "\n", @code;
         };
+
         my $part2 = 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_builder) {
-                        push @code, "my \$value = \$instance->$builder;";
-                    } elsif (ref($default) eq 'CODE') {
-                        push @code, "my \$value = \$attr->default()->();";
-                    } else {
-                        push @code, "my \$value = \$attr->default();";
+
+                    push @code, "my \$value = ";
+
+                    if ($attr->should_coerce) {
+                        push @code, "\$attr->coerce_constraint(";
                     }
+
+                        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, "\$value = \$attr->coerce_constraint(\$value);";
+                        push @code, ");";
                     }
+                    else {
+                        push @code, ";";
+                    }
+
                     if ($attr->has_type_constraint) {
                         push @code, "\$attr->verify_type_constraint(\$value);";
                     }
-                    push @code, "\$instance->{\$key} = \$value;";
+
+                    push @code, "\$instance->{'$key'} = \$value;";
+
                     if ($attr->is_weak_ref) {
-                        push @code, "weaken( \$instance->{\$key} ) if ref( \$instance->{\$key} );";
+                        push @code, "weaken( \$instance->{'$key'} ) if ref( \$value );";
                     }
                 }
                 join "\n", @code;
             }
             else {
                 if ( $attr->is_required ) {
-                    q{Carp::confess("Attribute (} . $attr->name . q{) is required");};
+                    qq{Carp::confess("Attribute ($key) is required");};
                 } else {
                     ""
                 }
@@ -90,9 +117,7 @@ sub _generate_processattrs {
         my $code = <<"...";
             {
                 my \$attr = \$attrs[$index];
-                my \$from = '$from';
-                my \$key  = '$key';
-                if (defined(\$from) && exists(\$args->{\$from})) {
+                if (exists(\$args->{'$from'})) {
                     $part1;
                 } else {
                     $part2;