X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FMethod%2FConstructor.pm;h=9d8fc18204fa7d5e236abad958d054a738acb736;hb=a62dcd43575e3069a70277082c7be85fb71322bf;hp=1442a061e1c486b6d91750d57073c278e282d83e;hpb=d344c3feeb1c99183a249e26ddfb0e790101f7b2;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Method/Constructor.pm b/lib/Moose/Meta/Method/Constructor.pm index 1442a06..9d8fc18 100644 --- a/lib/Moose/Meta/Method/Constructor.pm +++ b/lib/Moose/Meta/Method/Constructor.pm @@ -6,7 +6,7 @@ use warnings; use Scalar::Util 'blessed', 'weaken', 'looks_like_number'; -our $VERSION = '0.68'; +our $VERSION = '0.71_01'; our $AUTHORITY = 'cpan:STEVAN'; use base 'Moose::Meta::Method', @@ -117,7 +117,7 @@ sub associated_metaclass { (shift)->{'associated_metaclass'} } # this was changed in 0.41, but broke MooseX::Singleton, so try to catch # any other code using the original broken spelling -sub intialize_body { Moose->throw_error("Please correct the spelling of 'intialize_body' to 'initialize_body'") } +sub intialize_body { $_[0]->throw_error("Please correct the spelling of 'intialize_body' to 'initialize_body'") } sub initialize_body { my $self = shift; @@ -177,7 +177,7 @@ sub initialize_body { '@type_constraint_bodies' => \@type_constraint_bodies, }, ) or $self->throw_error("Could not eval the constructor :\n\n$source\n\nbecause :\n\n$@", error => $@, data => $source ); - + $self->{'body'} = $code; } @@ -190,7 +190,7 @@ sub _generate_BUILDARGS { return join("\n", 'do {', $self->_inline_throw_error('"Single parameters to new() must be a HASH ref"', 'data => $_[0]'), - ' if scalar @_ == 1 && defined $_[0] && ref($_[0]) ne q{HASH};', + ' if scalar @_ == 1 && !( defined $_[0] && ref $_[0] eq q{HASH} );', '(scalar @_ == 1) ? {%{$_[0]}} : {@_};', '}', ); @@ -221,7 +221,7 @@ sub _generate_triggers { . '$instance, ' . $self->meta_instance->inline_get_slot_value( '$instance', - ("'" . $attr->name . "'") + $attr->name, ) . ', ' . '$attrs->[' . $i . ']' @@ -319,7 +319,7 @@ sub _generate_slot_assignment { $source = ( $self->meta_instance->inline_set_slot_value( '$instance', - ("'" . $attr->name . "'"), + $attr->name, $value ) . ';' ); @@ -332,7 +332,7 @@ sub _generate_slot_assignment { "\n" . $self->meta_instance->inline_weaken_slot_value( '$instance', - ("'" . $attr->name . "'") + $attr->name ) . ' if ref ' . $value . ';' ); @@ -431,8 +431,6 @@ not particularly useful. =item B -=item B - =back =head1 AUTHORS