X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FMethod%2FAccessor.pm;h=b6852f7df5601af5cbcbfaa56c68c6f892616a63;hb=82750a8aa67b0f6cd139537bef64162d7a7c4d52;hp=6d50849425d6567d5a9b49a90c467d94647dce73;hpb=7c4f0d321ad4a19bca346b6deb112f0f742dc277;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Method/Accessor.pm b/lib/Moose/Meta/Method/Accessor.pm index 6d50849..b6852f7 100644 --- a/lib/Moose/Meta/Method/Accessor.pm +++ b/lib/Moose/Meta/Method/Accessor.pm @@ -4,15 +4,39 @@ package Moose::Meta::Method::Accessor; use strict; use warnings; -use Carp 'confess'; - -our $VERSION = '0.08'; +our $VERSION = '0.62_01'; +$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 ) = @_; + + # NOTE: + # set up the environment + my $attr = $self->associated_attribute; + my $attr_name = $attr->name; + my $meta = $self, + + my $type_constraint_obj = $attr->type_constraint; + my $type_constraint_name = $type_constraint_obj && $type_constraint_obj->name; + my $type_constraint = $type_constraint_obj + ? $type_constraint_obj->_compiled_type_constraint + : undef; + + #warn "code for $attr_name =>\n" . $code . "\n"; + my $sub = eval $code; + $self->throw_error("Could not create writer for '$attr_name' because $@ \n code: $code", error => $@, data => $code ) if $@; + return $sub; + +} sub generate_accessor_method_inline { my $self = $_[0]; @@ -22,37 +46,20 @@ sub generate_accessor_method_inline { my $slot_access = $self->_inline_access($inv, $attr_name); my $value_name = $self->_value_needs_copy ? '$val' : '$_[1]'; - my $type_constraint_obj = $attr->type_constraint; - my $type_constraint_name = $type_constraint_obj && $type_constraint_obj->name; - - my $code = 'sub { ' . "\n" + $self->_eval_code('sub { ' . "\n" . $self->_inline_pre_body(@_) . "\n" - . 'if (scalar(@_) == 2) {' . "\n" + . 'if (scalar(@_) >= 2) {' . "\n" . $self->_inline_copy_value . "\n" . $self->_inline_check_required . "\n" . $self->_inline_check_coercion . "\n" . $self->_inline_check_constraint($value_name) . "\n" - . $self->_inline_store($inv, $value_name) . "\n" - . $self->_inline_trigger($inv, $value_name) . "\n" + . $self->_inline_store($inv, $value_name) . "\n" + . $self->_inline_trigger($inv, $value_name) . "\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" - . ' }'; - - # NOTE: - # set up the environment - my $type_constraint = $attr->type_constraint - ? ( - $attr->type_constraint->has_hand_optimized_type_constraint - ? $attr->type_constraint->hand_optimized_type_constraint - : $attr->type_constraint->_compiled_type_constraint - ) - : undef; - - my $sub = eval $code; - confess "Could not create accessor for '$attr_name' because $@ \n code: $code" if $@; - return $sub; + . ' }'); } sub generate_writer_method_inline { @@ -63,26 +70,16 @@ sub generate_writer_method_inline { my $slot_access = $self->_inline_get($inv, $attr_name); my $value_name = $self->_value_needs_copy ? '$val' : '$_[1]'; - my $code = 'sub { ' + $self->_eval_code('sub { ' . $self->_inline_pre_body(@_) . $self->_inline_copy_value . $self->_inline_check_required . $self->_inline_check_coercion - . $self->_inline_check_constraint($value_name) - . $self->_inline_store($inv, $value_name) - . $self->_inline_post_body(@_) - . $self->_inline_trigger($inv, $value_name) - . ' }'; - - # NOTE: - # set up the environment - my $type_constraint = $attr->type_constraint - ? $attr->type_constraint->_compiled_type_constraint - : undef; - - my $sub = eval $code; - confess "Could not create writer for '$attr_name' because $@ \n code: $code" if $@; - return $sub; + . $self->_inline_check_constraint($value_name) + . $self->_inline_store($inv, $value_name) + . $self->_inline_post_body(@_) + . $self->_inline_trigger($inv, $value_name) + . ' }'); } sub generate_reader_method_inline { @@ -92,23 +89,13 @@ sub generate_reader_method_inline { my $inv = '$_[0]'; my $slot_access = $self->_inline_get($inv, $attr_name); - my $code = 'sub {' + $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 ) . ';' - . '}'; - - # NOTE: - # set up the environment - my $type_constraint = $attr->type_constraint - ? $attr->type_constraint->_compiled_type_constraint - : undef; - - my $sub = eval $code; - confess "Could not create reader for '$attr_name' because $@ \n code: $code" if $@; - return $sub; + . '}'); } sub _inline_copy_value { @@ -132,19 +119,13 @@ sub _inline_check_constraint { my ($self, $value) = @_; my $attr = $self->associated_attribute; + my $attr_name = $attr->name; return '' unless $attr->has_type_constraint; - # FIXME - # This sprintf is insanely annoying, we should - # fix it someday - SL - return sprintf <<'EOF', $value, $value, $value, $value, $value, $value, $value -$type_constraint->(%s) - || confess "Attribute (" . $attr_name . ") does not pass the type constraint (" - . $type_constraint_name . ") with " - . (defined(%s) ? (Scalar::Util::blessed(%s) && overload::Overloaded(%s) ? overload::StrVal(%s) : %s) : "undef") - if defined(%s); -EOF + my $type_constraint_name = $attr->type_constraint->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 { @@ -155,65 +136,78 @@ sub _inline_check_coercion { } 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 'defined($_[1]) || confess "Attribute ($attr_name) is required, so cannot be set to undef";' + 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_access = $self->_inline_access($instance, $attr->name); - my $slot_exists = $self->_inline_has($inv, $attr->name); + my $slot_exists = $self->_inline_has($instance, $attr->name); 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) ? (Scalar::Util::blessed($default) && overload::Overloaded($default) ? overload::StrVal($default) : $default) : "undef")' . - ' if defined($default);' . "\n" . - ' ' . $slot_access . ' = $default; ' . "\n"; + ' || ' . $self->_inline_throw_error('"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, $instance, $slot_access, '$default') . "\n"; } else { - $code .= ' ' . $slot_access . " = undef; \n"; + $code .= ' ' . $self->_inline_init_slot($attr, $instance, $slot_access, 'undef') . "\n"; } } else { if ($attr->has_default) { - $code .= ' '.$slot_access.' = $attr->default(' . $inv . ');'."\n"; + $code .= ' ' . $self->_inline_init_slot($attr, $instance, $slot_access, ('$attr->default(' . $instance . ')')) . "\n"; } elsif ($attr->has_builder) { - $code .= ' if(my $builder = '.$inv.'->can($attr->builder)){ '."\n". - ' '.$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, $slot_access, ($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 .= ' ' . $slot_access . " = undef; \n"; + $code .= ' ' . $self->_inline_init_slot($attr, $instance, $slot_access, 'undef') . "\n"; } } $code .= "}\n"; return $code; } +sub _inline_init_slot { + my ($self, $attr, $inv, $slot_access, $value) = @_; + if ($attr->has_initializer) { + return ('$attr->set_initial_value(' . $inv . ', ' . $value . ');'); + } + else { + return ($slot_access . ' = ' . $value . ';'); + } +} sub _inline_store { my ($self, $instance, $value) = @_; @@ -281,7 +275,7 @@ 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 '" . $type_constraint->name . "'", type_constraint => $type_constraint ); } "(wantarray() ? $sigil\{ ( $ref_value ) || return } : ( $ref_value ) )"; @@ -339,7 +333,7 @@ Yuval Kogman Enothingmuch@woobling.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006, 2007 by Infinity Interactive, Inc. +Copyright 2006-2008 by Infinity Interactive, Inc. L