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=6a78407cbd5b6942e07a0b09989cfab8feb8be7d;hp=5820a02eeb5f90a07e649b24a7ee47e6b559753c;hb=506fb74dbff3e8f756230c643d8bff7b85ae9ca3;hpb=6e168432fa69bbe87ff0dd12e355a8b5d99a1a9c diff --git a/lib/Mouse/Meta/Method/Constructor.pm b/lib/Mouse/Meta/Method/Constructor.pm index 5820a02..6a78407 100644 --- a/lib/Mouse/Meta/Method/Constructor.pm +++ b/lib/Mouse/Meta/Method/Constructor.pm @@ -1,5 +1,5 @@ package Mouse::Meta::Method::Constructor; -use Mouse::Util qw(get_code_ref); # enables strict and warnings +use Mouse::Util qw(:meta); # enables strict and warnings sub _inline_slot{ my(undef, $self_var, $attr_name) = @_; @@ -60,6 +60,7 @@ sub _generate_processattrs { my $init_arg = $attr->init_arg; my $type_constraint = $attr->type_constraint; + my $is_weak_ref = $attr->is_weak_ref; my $need_coercion; my $instance_slot = $method_class->_inline_slot('$instance', $key); @@ -78,7 +79,7 @@ sub _generate_processattrs { $post_process .= "\$checks[$index]->($instance_slot)"; $post_process .= " or $attr_var->verify_type_constraint_error(q{$key}, $instance_slot, $constraint_var);\n"; } - if($attr->is_weak_ref){ + if($is_weak_ref){ $post_process .= "Scalar::Util::weaken($instance_slot) if ref $instance_slot;\n"; } @@ -126,6 +127,9 @@ sub _generate_processattrs { } $code .= "$instance_slot = $value;\n"; + if($is_weak_ref){ + $code .= "Scalar::Util::weaken($instance_slot);\n"; + } } } elsif ($attr->is_required) { @@ -177,7 +181,7 @@ sub _generate_BUILDALL { my @code; for my $class ($metaclass->linearized_isa) { - if (get_code_ref($class, 'BUILD')) { + if (Mouse::Util::get_code_ref($class, 'BUILD')) { unshift @code, qq{${class}::BUILD(\$instance, \$args);}; } } @@ -193,7 +197,7 @@ Mouse::Meta::Method::Constructor - A Mouse method generator for constructors =head1 VERSION -This document describes Mouse version 0.40_05 +This document describes Mouse version 0.40_09 =head1 SEE ALSO