X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FMethod%2FAccessor.pm;h=4dc2ac3b168c282202a4dba0d87668987dfb5004;hb=86850486e3e2425c803df63cb6f10ee89a8d4a76;hp=f5e897b6c03c252dcf721fc5b5f4d7fc54b4d1cb;hpb=909405b872b4290f67d9872a07880ffa7d89defc;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Method/Accessor.pm b/lib/Moose/Meta/Method/Accessor.pm index f5e897b..4dc2ac3 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.87'; +our $VERSION = '1.12'; $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,7 +46,6 @@ 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 $value_name = $self->_value_needs_copy ? '$val' : '$_[1]'; @@ -59,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" @@ -71,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 { ' @@ -82,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(@_) @@ -114,11 +111,40 @@ sub _value_needs_copy { return $attr->should_coerce; } -sub _generate_reader_method { shift->_generate_reader_method_inline(@_) } -sub _generate_writer_method { shift->_generate_writer_method_inline(@_) } -sub _generate_accessor_method { shift->_generate_accessor_method_inline(@_) } -sub _generate_predicate_method { shift->_generate_predicate_method_inline(@_) } -sub _generate_clearer_method { shift->_generate_clearer_method_inline(@_) } +sub _instance_is_inlinable { + my $self = shift; + return $self->associated_attribute->associated_class->instance_metaclass->is_inlinable; +} + +sub _generate_reader_method { + my $self = shift; + $self->_instance_is_inlinable ? $self->_generate_reader_method_inline(@_) + : $self->SUPER::_generate_reader_method(@_); +} + +sub _generate_writer_method { + my $self = shift; + $self->_instance_is_inlinable ? $self->_generate_writer_method_inline(@_) + : $self->SUPER::_generate_writer_method(@_); +} + +sub _generate_accessor_method { + my $self = shift; + $self->_instance_is_inlinable ? $self->_generate_accessor_method_inline(@_) + : $self->SUPER::_generate_accessor_method(@_); +} + +sub _generate_predicate_method { + my $self = shift; + $self->_instance_is_inlinable ? $self->_generate_predicate_method_inline(@_) + : $self->SUPER::_generate_predicate_method(@_); +} + +sub _generate_clearer_method { + my $self = shift; + $self->_instance_is_inlinable ? $self->_generate_clearer_method_inline(@_) + : $self->SUPER::_generate_clearer_method(@_); +} sub _inline_pre_body { '' } sub _inline_post_body { '' } @@ -127,11 +153,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") . ";"; } @@ -141,7 +166,7 @@ sub _inline_check_coercion { my $attr = $self->associated_attribute; - return '' unless $attr->should_coerce; + return '' unless $attr->should_coerce && $attr->type_constraint->has_coercion; return "$value = \$attr->type_constraint->coerce($value);"; } @@ -149,9 +174,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 } @@ -162,7 +188,7 @@ sub _inline_check_lazy { return '' unless $attr->is_lazy; - 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) { @@ -226,11 +252,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 { @@ -276,7 +317,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 ) )"; @@ -303,9 +346,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 @@ -315,7 +356,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