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=433fc46381766cdbab6241e3f8b1997d55a677fd;hp=b1db7d4bb471187b12ad1e29d54b2b4b6023d712;hb=95e0838c698351915133884105fcf5f43cc85a55;hpb=24ad3f66c198a2cad61e0d7c91c956b1926746f9 diff --git a/lib/Mouse/Meta/Method/Constructor.pm b/lib/Mouse/Meta/Method/Constructor.pm index b1db7d4..433fc46 100644 --- a/lib/Mouse/Meta/Method/Constructor.pm +++ b/lib/Mouse/Meta/Method/Constructor.pm @@ -5,9 +5,10 @@ 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 $buildall = $class->_generate_BUILDALL($meta); my $buildargs = $class->_generate_BUILDARGS(); - my $processattrs = $class->_generate_processattrs($meta); + my $processattrs = $class->_generate_processattrs($meta, \@attrs); my $code = <<"..."; sub { @@ -29,26 +30,26 @@ sub generate_constructor_method_inline { } 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};"; + push @code, "\$instance->{'$key'} = \$args->{'$from'};"; if ($attr->is_weak_ref) { - push @code, "weaken( \$instance->{\$key} ) if ref( \$instance->{\$key} );"; + push @code, "weaken( \$instance->{'$key'} ) if ref( \$instance->{'$key'} );"; } if ( $attr->has_trigger ) { - push @code, "\$attr->trigger->( \$instance, \$args->{\$from}, \$attr );"; + push @code, "\$attr->trigger->( \$instance, \$args->{'$from'}, \$attr );"; } join "\n", @code; }; @@ -71,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 { "" } @@ -88,10 +89,8 @@ sub _generate_processattrs { }; my $code = <<"..."; { - my \$attr = \$meta->get_attribute('$key'); - my \$from = '$from'; - my \$key = '$key'; - if (defined(\$from) && exists(\$args->{\$from})) { + my \$attr = \$attrs[$index]; + if (exists(\$args->{'$from'})) { $part1; } else { $part2;