X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FMethod%2FAccessor.pm;h=5bc0808875a1bcf4c3cba5fa86b984ae7c5aea0c;hp=d073cb58f69e99dcc61118134dcc116cb23b9f56;hb=d990f7911dfd6a36d1dcc072e7adb72bf0379349;hpb=c3797828b5fae171b01dbb08a9a752c610d8a7bf diff --git a/lib/Mouse/Meta/Method/Accessor.pm b/lib/Mouse/Meta/Method/Accessor.pm index d073cb5..5bc0808 100755 --- a/lib/Mouse/Meta/Method/Accessor.pm +++ b/lib/Mouse/Meta/Method/Accessor.pm @@ -1,9 +1,15 @@ package Mouse::Meta::Method::Accessor; -use Mouse::Util; # enables strict and warnings -use Scalar::Util qw(blessed); +use Mouse::Util qw(:meta); # enables strict and warnings +use warnings FATAL => 'recursion'; -sub _generate_accessor{ - my (undef, $attribute, $class, $type) = @_; + +sub _inline_slot{ + my(undef, $self_var, $attr_name) = @_; + return sprintf '%s->{q{%s}}', $self_var, $attr_name; +} + +sub _generate_accessor_any{ + my($method_class, $type, $attribute, $class) = @_; my $name = $attribute->name; my $default = $attribute->default; @@ -17,16 +23,13 @@ sub _generate_accessor{ my $compiled_type_constraint = defined($constraint) ? $constraint->_compiled_type_constraint : undef; my $self = '$_[0]'; - my $key = "q{$name}"; - my $slot = "$self\->{$key}"; + my $slot = $method_class->_inline_slot($self, $name);; - $type ||= 'accessor'; - - my $accessor = sprintf(qq{#line 1 "%s for %s (%s)"\n}, $type, $name, __FILE__) + my $accessor = sprintf(qq{package %s;\n#line 1 "%s-accessor for %s (%s)"\n}, $class->name, $type, $name, __FILE__) . "sub {\n"; - if ($type eq 'accessor' || $type eq 'writer') { - if($type eq 'accessor'){ + if ($type eq 'rw' || $type eq 'wo') { + if($type eq 'rw'){ $accessor .= 'if (scalar(@_) >= 2) {' . "\n"; } @@ -48,7 +51,7 @@ sub _generate_accessor{ $accessor .= "\n". '$compiled_type_constraint->('.$value.') or - $attribute->verify_type_constraint_error($name, '.$value.', $constraint);' . "\n"; + $attribute->_throw_type_constraint_error('.$value.', $constraint);' . "\n"; } # if there's nothing left to do for the attribute we can return during @@ -67,15 +70,14 @@ sub _generate_accessor{ $accessor .= "}\n"; } - elsif($type eq 'reader') { + elsif($type eq 'ro') { $accessor .= 'Carp::confess("Cannot assign a value to a read-only accessor") if scalar(@_) >= 2;' . "\n"; } else{ $class->throw_error("Unknown accessor type '$type'"); } - # XXX: an anon class can be a runtime created class - if ($attribute->is_lazy || $class->is_anon_class) { + if ($attribute->is_lazy) { my $value; if (defined $builder){ @@ -88,11 +90,24 @@ sub _generate_accessor{ $value = '$default'; } + $accessor .= "if(!exists $slot){\n"; if($should_coerce){ - $value = "\$constraint->coerce($value)"; + $accessor .= "$slot = \$constraint->coerce($value)"; } + elsif(defined $constraint){ + $accessor .= "my \$tmp = $value;\n"; - $accessor .= "$slot = $value if !exists $slot;\n"; + $accessor .= "\$compiled_type_constraint->(\$tmp)"; + $accessor .= " || \$attribute->_throw_type_constraint_error(\$tmp, \$constraint);\n"; + $accessor .= "$slot = \$tmp;\n"; + } + else{ + $accessor .= "$slot = $value;\n"; + } + if ($is_weak) { + $accessor .= "Scalar::Util::weaken($slot) if ref $slot;\n"; + } + $accessor .= "}\n"; } if ($should_deref) { @@ -109,7 +124,7 @@ sub _generate_accessor{ $accessor .= "return $slot;\n}\n"; - #print "# class ", $class->name, "\n", $accessor, "\n"; + #print $accessor, "\n"; my $code; my $e = do{ local $@; @@ -121,16 +136,20 @@ sub _generate_accessor{ return $code; } -sub _generate_reader{ +sub _generate_accessor{ my $class = shift; - return $class->_generate_accessor(@_, 'reader'); + return $class->_generate_accessor_any(rw => @_); } -sub _generate_writer{ +sub _generate_reader { my $class = shift; - return $class->_generate_accessor(@_, 'writer'); + return $class->_generate_accessor_any(ro => @_); } +sub _generate_writer { + my $class = shift; + return $class->_generate_accessor_any(wo => @_); +} sub _generate_predicate { my (undef, $attribute, $class) = @_; @@ -145,33 +164,24 @@ sub _generate_clearer { my (undef, $attribute, $class) = @_; my $slot = $attribute->name; - - return sub{ + return sub{ delete $_[0]->{$slot}; }; } -sub _generate_delegation{ - my (undef, $attribute, $class, $reader, $handle_name, $method_to_call) = @_; - - return sub { - my $instance = shift; - my $proxy = $instance->$reader(); - - my $error = !defined($proxy) ? ' is not defined' - : ref($proxy) && !blessed($proxy) ? qq{ is not an object (got '$proxy')} - : undef; - if ($error) { - $instance->meta->throw_error( - "Cannot delegate $handle_name to $method_to_call because " - . "the value of " - . $attribute->name - . $error - ); - } - $proxy->$method_to_call(@_); - }; -} +1; +__END__ +=head1 NAME -1; +Mouse::Meta::Method::Accessor - A Mouse method generator for accessors + +=head1 VERSION + +This document describes Mouse version 0.50_02 + +=head1 SEE ALSO + +L + +=cut