From: Shawn M Moore <sartak@gmail.com>
Date: Tue, 9 Dec 2008 04:44:57 +0000 (+0000)
Subject: Make the constructor code easier to read
X-Git-Tag: 0.19~118
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7756897fd756804423cafb8f8806443b768269f0;p=gitmo%2FMouse.git

Make the constructor code easier to read
---

diff --git a/lib/Mouse/Meta/Method/Constructor.pm b/lib/Mouse/Meta/Method/Constructor.pm
index 82459c5..ba7b28b 100644
--- a/lib/Mouse/Meta/Method/Constructor.pm
+++ b/lib/Mouse/Meta/Method/Constructor.pm
@@ -42,28 +42,32 @@ sub _generate_processattrs {
             $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'});";
+                $code .= "my \$value = Mouse::TypeRegistry->typecast_constraints('".$attr->associated_class->name."', \$attrs[$index]->{find_type_constraint}, \$attrs[$index]->{type_constraint}, \$args->{'$from'});\n";
             }
             else {
-                $code .= "my \$value = \$args->{'$from'};";
+                $code .= "my \$value = \$args->{'$from'};\n";
             }
 
             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 .= "{
+                    local \$_ = \$value;
+                    unless (\$attrs[$index]->{find_type_constraint}->(\$_)) {
+                        \$attrs[$index]->verify_type_constraint_error('$key', \$_, \$attrs[$index]->type_constraint)
+                    }
+                }";
             }
 
-            $code .= "\$instance->{'$key'} = \$value;";
+            $code .= "\$instance->{'$key'} = \$value;\n";
 
             if ($attr->is_weak_ref) {
-                $code .= "Scalar::Util::weaken( \$instance->{'$key'} ) if ref( \$value );";
+                $code .= "Scalar::Util::weaken( \$instance->{'$key'} ) if ref( \$value );\n";
             }
 
             if ($attr->has_trigger) {
-                $code .= "\$attrs[$index]->{trigger}->( \$instance, \$value, \$attrs[$index] );";
+                $code .= "\$attrs[$index]->{trigger}->( \$instance, \$value, \$attrs[$index] );\n";
             }
 
-            $code .= "} else {";
+            $code .= "\n} else {\n";
         }
 
         if ($attr->has_default || $attr->has_builder) {
@@ -94,29 +98,33 @@ sub _generate_processattrs {
                     }
 
                 if ($attr->should_coerce) {
-                    $code .= ");";
+                    $code .= ");\n";
                 }
                 else {
-                    $code .= ";";
+                    $code .= ";\n";
                 }
 
                 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 .= "{
+                        local \$_ = \$value;
+                        unless (\$attrs[$index]->{find_type_constraint}->(\$_)) {
+                            \$attrs[$index]->verify_type_constraint_error('$key', \$_, \$attrs[$index]->type_constraint)
+                        }
+                    }";
                 }
 
-                $code .= "\$instance->{'$key'} = \$value;";
+                $code .= "\$instance->{'$key'} = \$value;\n";
 
                 if ($attr->is_weak_ref) {
-                    $code .= "Scalar::Util::weaken( \$instance->{'$key'} ) if ref( \$value );";
+                    $code .= "Scalar::Util::weaken( \$instance->{'$key'} ) if ref( \$value );\n";
                 }
             }
         }
         elsif ($attr->is_required) {
-            $code .= qq{Carp::confess("Attribute ($key) is required");};
+            $code .= "Carp::confess('Attribute ($key) is required');";
         }
 
-        $code .= "}" if defined $attr->init_arg;
+        $code .= "}\n" if defined $attr->init_arg;
 
         push @res, $code;
     }