X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FMethod%2FAccessor.pm;h=e695e64d8564a61c0b48bbb51da5adfad17d0133;hb=74397c13ad55fc865db34721aed512d4f605fadf;hp=15254124667ef0720b4f55ba6b258d05a2b34f3f;hpb=5f06098eee2cfb99c34241ec54b642d46e1d76c9;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Method/Accessor.pm b/lib/Moose/Meta/Method/Accessor.pm index 1525412..e695e64 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.64'; +our $VERSION = '0.75_01'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; @@ -21,22 +21,25 @@ sub _eval_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 + my $attr = $self->associated_attribute; + 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; + : undef), + }; #warn "code for $attr_name =>\n" . $code . "\n"; - eval $self->_prepare_code( code => $code ) - or $self->throw_error("Could not create writer for '$attr_name' because $@ \n code: $code", error => $@, data => $code ); + $self->_compile_code( environment => $environment, code => $code ) + or $self->throw_error("Could not create writer for '${\$self->associated_attribute->name}' because $@ \n code: $code", error => $@, data => $code ); } -sub generate_accessor_method_inline { +sub _generate_accessor_method_inline { my $self = $_[0]; my $attr = $self->associated_attribute; my $attr_name = $attr->name; @@ -49,7 +52,7 @@ 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_store($inv, $value_name) . "\n" . $self->_inline_trigger($inv, $value_name) . "\n" @@ -60,7 +63,7 @@ sub generate_accessor_method_inline { . ' }'); } -sub generate_writer_method_inline { +sub _generate_writer_method_inline { my $self = $_[0]; my $attr = $self->associated_attribute; my $attr_name = $attr->name; @@ -72,7 +75,7 @@ sub generate_writer_method_inline { . $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_store($inv, $value_name) . $self->_inline_post_body(@_) @@ -80,7 +83,7 @@ sub generate_writer_method_inline { . ' }'); } -sub generate_reader_method_inline { +sub _generate_reader_method_inline { my $self = $_[0]; my $attr = $self->associated_attribute; my $attr_name = $attr->name; @@ -106,11 +109,11 @@ 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 _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 { '' } @@ -129,10 +132,12 @@ sub _inline_check_constraint { } 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 { @@ -169,11 +174,8 @@ sub _inline_check_lazy { ' ' . $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))' . - ' || ' . $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_check_coercion('$default') . "\n"; + $code .= $self->_inline_check_constraint('$default') . "\n"; $code .= ' ' . $self->_inline_init_slot($attr, $instance, $slot_access, '$default') . "\n"; } else { @@ -214,10 +216,9 @@ sub _inline_store { 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; } @@ -226,7 +227,7 @@ sub _inline_trigger { my ($self, $instance, $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);', $instance, $value); } sub _inline_get { @@ -234,9 +235,8 @@ sub _inline_get { 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 { @@ -244,9 +244,8 @@ sub _inline_access { 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 { @@ -254,9 +253,8 @@ sub _inline_has { 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 { @@ -293,35 +291,12 @@ 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 - -=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 @@ -337,7 +312,7 @@ Yuval Kogman Enothingmuch@woobling.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006-2008 by Infinity Interactive, Inc. +Copyright 2006-2009 by Infinity Interactive, Inc. L