X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FStrictConstructor%2FMeta%2FMethod%2FConstructor.pm;h=f72fa66b3fe06fc73e2a7cdb54cad08c9f9675f0;hb=5c3f24ed7e5aa011dd3d356bf9fcb076fd970a75;hp=7d2017c8f52d6700cbedd147c4e371dad521468b;hpb=c001451a92b1a0e8f33e4854d1694140cde35d53;p=gitmo%2FMooseX-StrictConstructor.git diff --git a/lib/MooseX/StrictConstructor/Meta/Method/Constructor.pm b/lib/MooseX/StrictConstructor/Meta/Method/Constructor.pm index 7d2017c..f72fa66 100644 --- a/lib/MooseX/StrictConstructor/Meta/Method/Constructor.pm +++ b/lib/MooseX/StrictConstructor/Meta/Method/Constructor.pm @@ -3,28 +3,32 @@ package MooseX::StrictConstructor::Meta::Method::Constructor; use strict; use warnings; +use Carp (); use Moose; extends 'Moose::Meta::Method::Constructor'; +# using sub _generate_BUILDALL ## no critic RequireArgUnpacking { my $self = shift; - my $calls = $self->SUPER::_generate_BUILDALL(@_); + my $source = $self->SUPER::_generate_BUILDALL(@_); + $source .= ";\n" if $source; - $calls .= <<'EOF'; - my %attrs = map { $_->name() => 1 } $self->meta()->compute_all_applicable_attributes(); + my @attrs = map { $_->name() . ' => 1,' } @{ $self->attributes() }; - my @bad = sort grep { ! $attrs{$_} } keys %params; + $source .= <<"EOF"; +my \%attrs = (@attrs); - if (@bad) - { - confess "Found unknown attribute(s) passed to the constructor: @bad"; - } +my \@bad = sort grep { ! \$attrs{\$_} } keys \%params; + +if (\@bad) { + Carp::confess "Found unknown attribute(s) passed to the constructor: \@bad"; +} EOF - return $calls; + return $source; };