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=4312f5efbfe88e525aee527c29bbc20f1509c353;hp=712e955abbcfcca03b44e48ca6a4b564656ad039;hb=b06ce1f502945c13a52c503f1a651fe92c91c773;hpb=a25ca8d637c040b2f929b1a23dd62ff63d85f5d1 diff --git a/lib/Mouse/Meta/Method/Constructor.pm b/lib/Mouse/Meta/Method/Constructor.pm index 712e955..4312f5e 100644 --- a/lib/Mouse/Meta/Method/Constructor.pm +++ b/lib/Mouse/Meta/Method/Constructor.pm @@ -1,5 +1,10 @@ package Mouse::Meta::Method::Constructor; -use Mouse::Util; # enables strict and warnings +use Mouse::Util qw(get_code_ref); # enables strict and warnings + +sub _inline_slot{ + my(undef, $self_var, $attr_name) = @_; + return sprintf '%s->{q{%s}}', $self_var, $attr_name; +} sub _generate_constructor { my ($class, $metaclass, $args) = @_; @@ -42,7 +47,7 @@ sub _generate_constructor { } sub _generate_processattrs { - my ($class, $metaclass, $attrs) = @_; + my ($method_class, $metaclass, $attrs) = @_; my @res; my $has_triggers; @@ -57,7 +62,7 @@ sub _generate_processattrs { my $type_constraint = $attr->type_constraint; my $need_coercion; - my $instance_slot = "\$instance->{q{$key}}"; + my $instance_slot = $method_class->_inline_slot('$instance', $key); my $attr_var = "\$attrs[$index]"; my $constraint_var; @@ -172,10 +177,7 @@ sub _generate_BUILDALL { my @code; for my $class ($metaclass->linearized_isa) { - no strict 'refs'; - no warnings 'once'; - - if (*{ $class . '::BUILD' }{CODE}) { + if (get_code_ref($class, 'BUILD')) { unshift @code, qq{${class}::BUILD(\$instance, \$args);}; } } @@ -191,7 +193,7 @@ Mouse::Meta::Method::Constructor - A Mouse method generator for constructors =head1 VERSION -This document describes Mouse version 0.37_06 +This document describes Mouse version 0.40_01 =head1 SEE ALSO