X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FMethod%2FAccessor.pm;h=a4aaa1ce4b038928ad298e864f49a0f6d656b72e;hb=8b5074ce1a5038824f1e1177cd00d1bcfec5a9fb;hp=e429d99796830b47bbaa5f28d9abaded58542cfd;hpb=ae8d63f2f6822aac9504be657b8074cade5eda10;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Method/Accessor.pm b/lib/Moose/Meta/Method/Accessor.pm index e429d99..a4aaa1c 100644 --- a/lib/Moose/Meta/Method/Accessor.pm +++ b/lib/Moose/Meta/Method/Accessor.pm @@ -4,43 +4,49 @@ package Moose::Meta::Method::Accessor; use strict; use warnings; -use Carp 'confess'; - -our $VERSION = '0.12'; +our $VERSION = '0.97'; +$VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use base 'Moose::Meta::Method', 'Class::MOP::Method::Accessor'; -## Inline method generators +sub _error_thrower { + my $self = shift; + ( ref $self && $self->associated_attribute ) || $self->SUPER::_error_thrower(); +} sub _eval_code { - my ( $self, $code ) = @_; + my ( $self, $source ) = @_; # NOTE: # set up the environment - my $attr = $self->associated_attribute; - my $attr_name = $attr->name; - - my $type_constraint_obj = $attr->type_constraint; - my $type_constraint_name = $type_constraint_obj && $type_constraint_obj->name; - my $type_constraint = $type_constraint_obj + my $attr = $self->associated_attribute; + my $type_constraint_obj = $attr->type_constraint; + my $environment = { + '$attr' => \$attr, + '$meta' => \$self, + '$type_constraint_obj' => \$type_constraint_obj, + '$type_constraint' => \($type_constraint_obj ? $type_constraint_obj->_compiled_type_constraint - : undef; + : undef), + }; + + #warn "code for " . $attr->name . " =>\n" . $source . "\n"; + my ( $code, $e ) = $self->_compile_code( environment => $environment, code => $source ); - #warn "code for $attr_name =>\n" . $code . "\n"; - my $sub = eval $code; - confess "Could not create writer for '$attr_name' because $@ \n code: $code" if $@; - return $sub; + $self->throw_error( + "Could not create writer for '${\$self->associated_attribute->name}' because $e \n code: $source", + error => $e, data => $source ) + if $e; + return $code; } -sub generate_accessor_method_inline { +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" @@ -48,48 +54,48 @@ sub generate_accessor_method_inline { . 'if (scalar(@_) >= 2) {' . "\n" . $self->_inline_copy_value . "\n" . $self->_inline_check_required . "\n" - . $self->_inline_check_coercion . "\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 . "\n" + . $self->_inline_check_lazy($inv) . "\n" . $self->_inline_post_body(@_) . "\n" . 'return ' . $self->_inline_auto_deref($self->_inline_get($inv)) . "\n" . ' }'); } -sub generate_writer_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 { ' . $self->_inline_pre_body(@_) . $self->_inline_copy_value . $self->_inline_check_required - . $self->_inline_check_coercion + . $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 { +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(@_) - . 'confess "Cannot assign a value to a read-only accessor" if @_ > 1;' - . $self->_inline_check_lazy + . $self->_inline_throw_error('"Cannot assign a value to a read-only accessor"', 'data => \@_') . ' if @_ > 1;' + . $self->_inline_check_lazy($inv) . $self->_inline_post_body(@_) . 'return ' . $self->_inline_auto_deref( $slot_access ) . ';' . '}'); @@ -105,97 +111,90 @@ 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_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 _inline_pre_body { '' } sub _inline_post_body { '' } 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; - - # FIXME - # This sprintf is insanely annoying, we should - # fix it someday - SL - return sprintf <<'EOF', $value, $attr_name, $value, $value, -$type_constraint->(%s) - || confess "Attribute (%s) does not pass the type constraint because: " - . $type_constraint_obj->get_message(%s); -EOF + + 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") . ";"; } sub _inline_check_coercion { - my $attr = (shift)->associated_attribute; - + my ($self, $value) = @_; + + my $attr = $self->associated_attribute; + return '' unless $attr->should_coerce; - return '$val = $attr->type_constraint->coerce($_[1]);' + return "$value = \$attr->type_constraint->coerce($value);"; } sub _inline_check_required { - my $attr = (shift)->associated_attribute; + my $self = shift; + my $attr = $self->associated_attribute; - my $attr_name = $attr->name; - return '' unless $attr->is_required; - return qq{defined(\$_[1]) || confess "Attribute ($attr_name) is required, so cannot be set to undef";} + + 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 } sub _inline_check_lazy { - my $self = $_[0]; + my ($self, $instance) = @_; + my $attr = $self->associated_attribute; return '' unless $attr->is_lazy; - my $inv = '$_[0]'; - my $slot_access = $self->_inline_access($inv, $attr->name); - - my $slot_exists = $self->_inline_has($inv, $attr->name); + my $slot_exists = $self->_inline_has($instance); my $code = 'unless (' . $slot_exists . ') {' . "\n"; if ($attr->has_type_constraint) { if ($attr->has_default || $attr->has_builder) { if ($attr->has_default) { - $code .= ' my $default = $attr->default(' . $inv . ');'."\n"; - } + $code .= ' my $default = $attr->default(' . $instance . ');'."\n"; + } elsif ($attr->has_builder) { $code .= ' my $default;'."\n". - ' if(my $builder = '.$inv.'->can($attr->builder)){ '."\n". - ' $default = '.$inv.'->$builder; '. "\n } else {\n" . - ' confess(Scalar::Util::blessed('.$inv.')." does not support builder method '. - '\'".$attr->builder."\' for attribute \'" . $attr->name . "\'");'. "\n }"; + ' if(my $builder = '.$instance.'->can($attr->builder)){ '."\n". + ' $default = '.$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 }"; } - $code .= ' $default = $type_constraint_obj->coerce($default);'."\n" if $attr->should_coerce; - $code .= ' ($type_constraint->($default))' . - ' || confess "Attribute (" . $attr_name . ") does not pass the type constraint ("' . - ' . $type_constraint_name . ") with " . (defined($default) ? overload::StrVal($default) : "undef");' - . "\n"; - $code .= ' ' . $self->_inline_init_slot($attr, $inv, $slot_access, '$default') . "\n"; - } + $code .= $self->_inline_check_coercion('$default') . "\n"; + $code .= $self->_inline_check_constraint('$default') . "\n"; + $code .= ' ' . $self->_inline_init_slot($attr, $instance, '$default') . "\n"; + } else { - $code .= ' ' . $self->_inline_init_slot($attr, $inv, $slot_access, 'undef') . "\n"; + $code .= ' ' . $self->_inline_init_slot($attr, $instance, 'undef') . "\n"; } } else { if ($attr->has_default) { - $code .= ' ' . $self->_inline_init_slot($attr, $inv, $slot_access, ('$attr->default(' . $inv . ')')) . "\n"; - } + $code .= ' ' . $self->_inline_init_slot($attr, $instance, ('$attr->default(' . $instance . ')')) . "\n"; + } elsif ($attr->has_builder) { - $code .= ' if (my $builder = '.$inv.'->can($attr->builder)) { ' . "\n" - . ' ' . $self->_inline_init_slot($attr, $inv, $slot_access, ($inv . '->$builder')) - . "\n } else {\n" . - ' confess(Scalar::Util::blessed('.$inv.')." does not support builder method '. - '\'".$attr->builder."\' for attribute \'" . $attr->name . "\'");'. "\n }"; - } + $code .= ' if (my $builder = '.$instance.'->can($attr->builder)) { ' . "\n" + . ' ' . $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, $inv, $slot_access, 'undef') . "\n"; + $code .= ' ' . $self->_inline_init_slot($attr, $instance, 'undef') . "\n"; } } $code .= "}\n"; @@ -203,63 +202,74 @@ 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); + } } sub _inline_store { my ($self, $instance, $value) = @_; my $attr = $self->associated_attribute; - + my $mi = $attr->associated_class->get_meta_instance; - my $slot_name = sprintf "'%s'", $attr->slots; - - my $code = $mi->inline_set_slot_value($instance, $slot_name, $value) . ";"; - $code .= $mi->inline_weaken_slot_value($instance, $slot_name, $value) . ";" + + my $code = $mi->inline_set_slot_value($instance, $attr->slots, $value) . ";"; + $code .= $mi->inline_weaken_slot_value($instance, $attr->slots, $value) . ";" if $attr->is_weak_ref; 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, $attr);', $instance, $value); + return sprintf('$attr->trigger->(%s, %s, %s);', $instance, $value, $old_value); } sub _inline_get { my ($self, $instance) = @_; my $attr = $self->associated_attribute; - + my $mi = $attr->associated_class->get_meta_instance; - my $slot_name = sprintf "'%s'", $attr->slots; - return $mi->inline_get_slot_value($instance, $slot_name); + return $mi->inline_get_slot_value($instance, $attr->slots); } sub _inline_access { my ($self, $instance) = @_; my $attr = $self->associated_attribute; - + my $mi = $attr->associated_class->get_meta_instance; - my $slot_name = sprintf "'%s'", $attr->slots; - return $mi->inline_slot_access($instance, $slot_name); + return $mi->inline_slot_access($instance, $attr->slots); } sub _inline_has { my ($self, $instance) = @_; my $attr = $self->associated_attribute; - + my $mi = $attr->associated_class->get_meta_instance; - my $slot_name = sprintf "'%s'", $attr->slots; - return $mi->inline_is_slot_initialized($instance, $slot_name); + return $mi->inline_is_slot_initialized($instance, $attr->slots); } sub _inline_auto_deref { @@ -278,7 +288,9 @@ sub _inline_auto_deref { $sigil = '%'; } else { - confess "Can not auto de-reference the type constraint '" . $type_constraint->name . "'"; + $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 ) )"; @@ -296,37 +308,16 @@ Moose::Meta::Method::Accessor - A Moose Method metaclass for accessors =head1 DESCRIPTION -This is a subclass of L and it's primary -responsibility is to generate the accessor methods for attributes. It -can handle both closure based accessors, as well as inlined source based -accessors. - -This is a fairly new addition to the MOP, but this will play an important -role in the optimization strategy we are currently following. - -=head1 METHODS - -=over 4 - -=item B - -=item B - -=item B - -=item B - -=item B - -=item B +This class is a subclass of L that +provides additional Moose-specific functionality, all of which is +private. -=back +To understand this class, you should read the the +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 @@ -336,7 +327,7 @@ Yuval Kogman Enothingmuch@woobling.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006-2008 by Infinity Interactive, Inc. +Copyright 2006-2010 by Infinity Interactive, Inc. L