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=2de3802411b28c164cb08fa7522b405f0ace87f5;hp=b1db7d4bb471187b12ad1e29d54b2b4b6023d712;hb=c12edd9ac9343d9853e4b9ca9f2254336e468ffc;hpb=ba2da7f2095b0e42159b46bd0902b78e8e3d3321 diff --git a/lib/Mouse/Meta/Method/Constructor.pm b/lib/Mouse/Meta/Method/Constructor.pm index b1db7d4..2de3802 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,10 +30,10 @@ 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 { @@ -88,7 +89,7 @@ sub _generate_processattrs { }; my $code = <<"..."; { - my \$attr = \$meta->get_attribute('$key'); + my \$attr = \$attrs[$index]; my \$from = '$from'; my \$key = '$key'; if (defined(\$from) && exists(\$args->{\$from})) {