X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FMethod%2FAccessor.pm;h=7b0697eeb9565e2900b0a0ecbc2993d76b1ab637;hb=bbd059cd6d8708db41702f52b2ce5b978af430e6;hp=944adf82e4f36238ac5c1a914a09e1474af5ef66;hpb=5ef36adde3d619733607b9f5f1136524a00848df;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Method/Accessor.pm b/lib/Moose/Meta/Method/Accessor.pm index 944adf8..7b0697e 100644 --- a/lib/Moose/Meta/Method/Accessor.pm +++ b/lib/Moose/Meta/Method/Accessor.pm @@ -4,7 +4,7 @@ package Moose::Meta::Method::Accessor; use strict; use warnings; -our $VERSION = '0.85'; +our $VERSION = '1.00'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; @@ -25,16 +25,14 @@ sub _eval_code { my $type_constraint_obj = $attr->type_constraint; my $environment = { '$attr' => \$attr, - '$attr_name' => \$attr->name, '$meta' => \$self, '$type_constraint_obj' => \$type_constraint_obj, - '$type_constraint_name' => \($type_constraint_obj && $type_constraint_obj->name), '$type_constraint' => \($type_constraint_obj ? $type_constraint_obj->_compiled_type_constraint : undef), }; - #warn "code for $attr_name =>\n" . $source . "\n"; + #warn "code for " . $attr->name . " =>\n" . $source . "\n"; my ( $code, $e ) = $self->_compile_code( environment => $environment, code => $source ); $self->throw_error( @@ -48,9 +46,7 @@ sub _eval_code { sub _generate_accessor_method_inline { my $self = $_[0]; my $attr = $self->associated_attribute; - my $attr_name = $attr->name; my $inv = '$_[0]'; - my $slot_access = $self->_inline_access($inv, $attr_name); my $value_name = $self->_value_needs_copy ? '$val' : '$_[1]'; $self->_eval_code('sub { ' . "\n" @@ -60,8 +56,9 @@ sub _generate_accessor_method_inline { . $self->_inline_check_required . "\n" . $self->_inline_check_coercion($value_name) . "\n" . $self->_inline_check_constraint($value_name) . "\n" + . $self->_inline_get_old_value_for_trigger($inv, $value_name) . "\n" . $self->_inline_store($inv, $value_name) . "\n" - . $self->_inline_trigger($inv, $value_name) . "\n" + . $self->_inline_trigger($inv, $value_name, '@old') . "\n" . ' }' . "\n" . $self->_inline_check_lazy($inv) . "\n" . $self->_inline_post_body(@_) . "\n" @@ -72,9 +69,8 @@ sub _generate_accessor_method_inline { sub _generate_writer_method_inline { my $self = $_[0]; my $attr = $self->associated_attribute; - my $attr_name = $attr->name; my $inv = '$_[0]'; - my $slot_access = $self->_inline_get($inv, $attr_name); + my $slot_access = $self->_inline_get($inv); my $value_name = $self->_value_needs_copy ? '$val' : '$_[1]'; $self->_eval_code('sub { ' @@ -83,18 +79,18 @@ sub _generate_writer_method_inline { . $self->_inline_check_required . $self->_inline_check_coercion($value_name) . $self->_inline_check_constraint($value_name) + . $self->_inline_get_old_value_for_trigger($inv, $value_name) . "\n" . $self->_inline_store($inv, $value_name) . $self->_inline_post_body(@_) - . $self->_inline_trigger($inv, $value_name) + . $self->_inline_trigger($inv, $value_name, '@old') . ' }'); } sub _generate_reader_method_inline { my $self = $_[0]; my $attr = $self->associated_attribute; - my $attr_name = $attr->name; my $inv = '$_[0]'; - my $slot_access = $self->_inline_get($inv, $attr_name); + my $slot_access = $self->_inline_get($inv); $self->_eval_code('sub {' . $self->_inline_pre_body(@_) @@ -128,11 +124,10 @@ sub _inline_check_constraint { my ($self, $value) = @_; my $attr = $self->associated_attribute; - my $attr_name = $attr->name; return '' unless $attr->has_type_constraint; - my $type_constraint_name = $attr->type_constraint->name; + my $attr_name = quotemeta( $attr->name ); qq{\$type_constraint->($value) || } . $self->_inline_throw_error(qq{"Attribute ($attr_name) does not pass the type constraint because: " . \$type_constraint_obj->get_message($value)}, "data => $value") . ";"; } @@ -150,9 +145,10 @@ sub _inline_check_required { my $self = shift; my $attr = $self->associated_attribute; - my $attr_name = $attr->name; - return '' unless $attr->is_required; + + my $attr_name = quotemeta( $attr->name ); + return qq{(\@_ >= 2) || } . $self->_inline_throw_error(qq{"Attribute ($attr_name) is required, so cannot be set to undef"}) . ';' # defined $_[1] is not good enough } @@ -163,9 +159,7 @@ sub _inline_check_lazy { return '' unless $attr->is_lazy; - my $slot_access = $self->_inline_access($instance, $attr->name); - - my $slot_exists = $self->_inline_has($instance, $attr->name); + my $slot_exists = $self->_inline_has($instance); my $code = 'unless (' . $slot_exists . ') {' . "\n"; if ($attr->has_type_constraint) { @@ -182,25 +176,25 @@ sub _inline_check_lazy { } $code .= $self->_inline_check_coercion('$default') . "\n"; $code .= $self->_inline_check_constraint('$default') . "\n"; - $code .= ' ' . $self->_inline_init_slot($attr, $instance, $slot_access, '$default') . "\n"; + $code .= ' ' . $self->_inline_init_slot($attr, $instance, '$default') . "\n"; } else { - $code .= ' ' . $self->_inline_init_slot($attr, $instance, $slot_access, 'undef') . "\n"; + $code .= ' ' . $self->_inline_init_slot($attr, $instance, 'undef') . "\n"; } } else { if ($attr->has_default) { - $code .= ' ' . $self->_inline_init_slot($attr, $instance, $slot_access, ('$attr->default(' . $instance . ')')) . "\n"; + $code .= ' ' . $self->_inline_init_slot($attr, $instance, ('$attr->default(' . $instance . ')')) . "\n"; } elsif ($attr->has_builder) { $code .= ' if (my $builder = '.$instance.'->can($attr->builder)) { ' . "\n" - . ' ' . $self->_inline_init_slot($attr, $instance, $slot_access, ($instance . '->$builder')) + . ' ' . $self->_inline_init_slot($attr, $instance, ($instance . '->$builder')) . "\n } else {\n" . ' ' . $self->_inline_throw_error(q{sprintf "%s does not support builder method '%s' for attribute '%s'", ref(} . $instance . ') || '.$instance.', $attr->builder, $attr->name') . ';'. "\n }"; } else { - $code .= ' ' . $self->_inline_init_slot($attr, $instance, $slot_access, 'undef') . "\n"; + $code .= ' ' . $self->_inline_init_slot($attr, $instance, 'undef') . "\n"; } } $code .= "}\n"; @@ -208,12 +202,12 @@ sub _inline_check_lazy { } sub _inline_init_slot { - my ($self, $attr, $inv, $slot_access, $value) = @_; + my ($self, $attr, $inv, $value) = @_; if ($attr->has_initializer) { return ('$attr->set_initial_value(' . $inv . ', ' . $value . ');'); } else { - return ($slot_access . ' = ' . $value . ';'); + return $self->_inline_store($inv, $value); } } @@ -229,11 +223,26 @@ sub _inline_store { return $code; } +sub _inline_get_old_value_for_trigger { + my ( $self, $instance ) = @_; + + my $attr = $self->associated_attribute; + return '' unless $attr->has_trigger; + + my $mi = $attr->associated_class->get_meta_instance; + my $pred = $mi->inline_is_slot_initialized($instance, $attr->name); + + return + 'my @old = ' + . $pred . q{ ? } + . $self->_inline_get($instance) . q{ : ()} . ";\n"; +} + sub _inline_trigger { - my ($self, $instance, $value) = @_; + my ($self, $instance, $value, $old_value) = @_; my $attr = $self->associated_attribute; return '' unless $attr->has_trigger; - return sprintf('$attr->trigger->(%s, %s);', $instance, $value); + return sprintf('$attr->trigger->(%s, %s, %s);', $instance, $value, $old_value); } sub _inline_get { @@ -279,7 +288,9 @@ sub _inline_auto_deref { $sigil = '%'; } else { - $self->throw_error("Can not auto de-reference the type constraint '" . $type_constraint->name . "'", type_constraint => $type_constraint ); + $self->throw_error( "Can not auto de-reference the type constraint '" + . quotemeta( $type_constraint->name ) + . "'", type_constraint => $type_constraint ); } "(wantarray() ? $sigil\{ ( $ref_value ) || return } : ( $ref_value ) )"; @@ -306,9 +317,7 @@ L documentation. =head1 BUGS -All complex software has bugs lurking in it, and this module is no -exception. If you find a bug please either email me, or add the bug -to cpan-RT. +See L for details on reporting bugs. =head1 AUTHOR @@ -318,7 +327,7 @@ Yuval Kogman Enothingmuch@woobling.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006-2009 by Infinity Interactive, Inc. +Copyright 2006-2010 by Infinity Interactive, Inc. L