Inline $from

[gitmo/Mouse.git] / lib / Mouse / Meta / Method / Constructor.pm

diff --git a/lib/Mouse/Meta/Method/Constructor.pm b/lib/Mouse/Meta/Method/Constructor.pm
index 1786d4e..433fc46 100644 (file)
--- a/lib/Mouse/Meta/Method/Constructor.pm
+++ b/lib/Mouse/Meta/Method/Constructor.pm
@@ -3,48 +3,53 @@ use strict;
 use warnings;
 
 sub generate_constructor_method_inline {
-    my ($class, $meta) = @_; 
+    my ($class, $meta) = @_;
+
+    my @attrs = $meta->compute_all_applicable_attributes; # this one is using by evaled code
     my $buildall = $class->_generate_BUILDALL($meta);
     my $buildargs = $class->_generate_BUILDARGS();
-    my $classname = $meta->name;
-    my $processattrs = $class->_generate_processattrs($meta);
+    my $processattrs = $class->_generate_processattrs($meta, \@attrs);
 
     my $code = <<"...";
     sub {
         my \$class = shift;
         my \$args = $buildargs;
-        my \$instance = bless {}, '$classname';
+        my \$instance = bless {}, \$class;
         $processattrs;
         $buildall;
         return \$instance;
     }
 ...
+
     warn $code if $ENV{DEBUG};
 
+    local $@;
     my $res = eval $code;
     die $@ if $@;
     $res;
 }
 
 sub _generate_processattrs {
-    my ($class, $meta, ) = @_;
-    my @attrs = $meta->compute_all_applicable_attributes;
+    my ($class, $meta, $attrs) = @_;
     my @res;
-    for my $attr (@attrs) {
+    for my $index (0..scalar(@$attrs)-1) {
+        my $attr = $attrs->[$index];
         my $from = $attr->init_arg;
         my $key  = $attr->name;
         my $part1 = do {
             my @code;
             if ($attr->should_coerce) {
-                push @code, "\$args->{\$from} = \$attr->coerce_constraint( \$args->{\$from} );";
+                push @code, "\$args->{'$from'} = \$attr->coerce_constraint( \$args->{'$from'} );";
             }
             if ($attr->has_type_constraint) {
-                push @code, "\$attr->verify_type_constraint( \$args->{\$from} );";
+                push @code, "\$attr->verify_type_constraint( \$args->{'$from'} );";
+            }
+            push @code, "\$instance->{'$key'} = \$args->{'$from'};";
+            if ($attr->is_weak_ref) {
+                push @code, "weaken( \$instance->{'$key'} ) if ref( \$instance->{'$key'} );";
             }
-            push @code, "\$instance->{\$key} = \$args->{\$from};";
-            push @code, "weaken( \$instance->{\$key} ) if ref( \$instance->{\$key} ) && \$attr->is_weak_ref;";
             if ( $attr->has_trigger ) {
-                push @code, "\$attr->trigger->( \$instance, \$args->{\$from}, \$attr );";
+                push @code, "\$attr->trigger->( \$instance, \$args->{'$from'}, \$attr );";
             }
             join "\n", @code;
         };
@@ -67,16 +72,16 @@ sub _generate_processattrs {
                     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( \$instance->{'$key'} );";
                     }
                 }
                 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 {
                     ""
                 }
@@ -84,10 +89,8 @@ sub _generate_processattrs {
         };
         my $code = <<"...";
             {
-                my \$attr = \$instance->meta->get_attribute_map->{'$key'};
-                my \$from = '$from';
-                my \$key  = '$key';
-                if (defined(\$from) && exists(\$args->{\$from})) {
+                my \$attr = \$attrs[$index];
+                if (exists(\$args->{'$from'})) {
                     $part1;
                 } else {
                     $part2;