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

diff --git a/lib/Mouse/Meta/Method/Constructor.pm b/lib/Mouse/Meta/Method/Constructor.pm
index 433fc46..aee0a7f 100644
--- a/lib/Mouse/Meta/Method/Constructor.pm
+++ b/lib/Mouse/Meta/Method/Constructor.pm
@@ -36,45 +36,73 @@ sub _generate_processattrs {
         my $attr = $attrs->[$index];
         my $from = $attr->init_arg;
         my $key  = $attr->name;
-        my $part1 = do {
+
+        my $set_value = do {
             my @code;
+
             if ($attr->should_coerce) {
-                push @code, "\$args->{'$from'} = \$attr->coerce_constraint( \$args->{'$from'} );";
+                push @code, "my \$value = \$attr->coerce_constraint( \$args->{'$from'});";
             }
+            else {
+                push @code, "my \$value = \$args->{'$from'};";
+            }
+
             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 $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_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;";
+
                     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;
@@ -91,9 +119,9 @@ sub _generate_processattrs {
             {
                 my \$attr = \$attrs[$index];
                 if (exists(\$args->{'$from'})) {
-                    $part1;
+                    $set_value;
                 } else {
-                    $part2;
+                    $make_default_value;
                 }
             }
 ...
@@ -130,9 +158,9 @@ sub _generate_BUILDALL {
     push @code, q{no strict 'refs';};
     push @code, q{no warnings 'once';};
     no strict 'refs';
-    for my $class ($meta->linearized_isa) {
-        if (*{ $class . '::BUILD' }{CODE}) {
-            push  @code, qq{${class}::BUILD->(\$instance, \$args);};
+    for my $klass ($meta->linearized_isa) {
+        if (*{ $klass . '::BUILD' }{CODE}) {
+            push  @code, qq{${klass}::BUILD->(\$instance, \$args);};
         }
     }
     return join "\n", @code;