X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FMethod%2FAccessor.pm;h=8601487dcdfc7eb1bc8eb43db71a1318dbac47f5;hb=c40e4359e7a5ad21af41e42c5a3746c193da9777;hp=2fcd72dd264906f65f252baf207977916ea00648;hpb=dc39b8509deeefd2204942516e4161ac10a2a38d;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Method/Accessor.pm b/lib/Moose/Meta/Method/Accessor.pm
index 2fcd72d..8601487 100644
--- a/lib/Moose/Meta/Method/Accessor.pm
+++ b/lib/Moose/Meta/Method/Accessor.pm
@@ -4,347 +4,165 @@ package Moose::Meta::Method::Accessor;
 use strict;
 use warnings;
 
-our $VERSION   = '0.70';
-$VERSION = eval $VERSION;
-our $AUTHORITY = 'cpan:STEVAN';
+use Try::Tiny;
 
 use base 'Moose::Meta::Method',
          'Class::MOP::Method::Accessor';
 
 sub _error_thrower {
     my $self = shift;
-    ( ref $self && $self->associated_attribute ) || $self->SUPER::_error_thrower();
+    return $self->associated_attribute
+        if ref($self) && defined($self->associated_attribute);
+    return $self->SUPER::_error_thrower;
 }
 
-sub _eval_code {
-    my ( $self, $code ) = @_;
-
-    # NOTE:
-    # set up the environment
-    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),
+sub _compile_code {
+    my $self = shift;
+    my @args = @_;
+    try {
+        $self->SUPER::_compile_code(@args);
+    }
+    catch {
+        $self->throw_error(
+            'Could not create writer for '
+          . "'" . $self->associated_attribute->name . "' "
+          . 'because ' . $_,
+            error => $_,
+        );
     };
-
-    #warn "code for $attr_name =>\n" . $code . "\n";
-    $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 {
-    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"
-    . $self->_inline_pre_body(@_) . "\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"
-    . ' }' . "\n"
-    . $self->_inline_check_lazy($inv) . "\n"
-    . $self->_inline_post_body(@_) . "\n"
-    . 'return ' . $self->_inline_auto_deref($self->_inline_get($inv)) . "\n"
-    . ' }');
-}
+sub _eval_environment {
+    my $self = shift;
 
-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 $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_constraint($value_name)
-    . $self->_inline_store($inv, $value_name)
-    . $self->_inline_post_body(@_)
-    . $self->_inline_trigger($inv, $value_name)
-    . ' }');
-}
+    my $env = { };
 
-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);
-
-    $self->_eval_code('sub {'
-    . $self->_inline_pre_body(@_)
-    . $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 ) . ';'
-    . '}');
-}
+    my $attr = $self->associated_attribute;
 
-sub _inline_copy_value {
-    return '' unless shift->_value_needs_copy;
-    return 'my $val = $_[1];'
-}
+    $env->{'$trigger'} = \($attr->trigger)
+        if $attr->has_trigger;
+    $env->{'$default'} = \($attr->default)
+        if $attr->has_default;
 
-sub _value_needs_copy {
-    my $attr = (shift)->associated_attribute;
-    return $attr->should_coerce;
-}
+    if ($attr->has_type_constraint) {
+        my $tc_obj = $attr->type_constraint;
 
-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(@_) }
+        # is this going to be an issue? it's currently only used for the tc
+        # message. is there a way to inline that too?
+        $env->{'$type_constraint_obj'} = \$tc_obj;
 
-sub _inline_pre_body  { '' }
-sub _inline_post_body { '' }
+        $env->{'$type_constraint'} = \(
+            $tc_obj->_compiled_type_constraint
+        ) unless $tc_obj->can_be_inlined;
+        $env->{'$type_coercion'} = \(
+            $tc_obj->coercion->_compiled_type_coercion
+        ) if $tc_obj->has_coercion;
 
-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;
+        $env = { %$env, %{ $tc_obj->inline_environment } };
+    }
 
-    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") . ";";
-}
+    # XXX ugh, fix these
+    $env->{'$attr'} = \$attr
+        if $attr->has_initializer;
+    $env->{'$meta'} = \$self;
 
-sub _inline_check_coercion {
-    my $attr = (shift)->associated_attribute;
-    
-    return '' unless $attr->should_coerce;
-    return '$val = $attr->type_constraint->coerce($_[1]);'
+    return $env;
 }
 
-sub _inline_check_required {
+sub _instance_is_inlinable {
     my $self = shift;
-    my $attr = $self->associated_attribute;
-
-    my $attr_name = $attr->name;
-    
-    return '' unless $attr->is_required;
-    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
+    return $self->associated_attribute->associated_class->instance_metaclass->is_inlinable;
 }
 
-sub _inline_check_lazy {
-    my ($self, $instance) = @_;
-
-    my $attr = $self->associated_attribute;
-
-    return '' unless $attr->is_lazy;
-
-    my $slot_access = $self->_inline_access($instance, $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(' . $instance . ');'."\n";
-            } 
-            elsif ($attr->has_builder) {
-                $code .= '    my $default;'."\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))' .
-                     '            || ' . $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 .= '    ' . $self->_inline_init_slot($attr, $instance, $slot_access, 'undef') . "\n";
-        }
-
-    } else {
-        if ($attr->has_default) {
-            $code .= '    ' . $self->_inline_init_slot($attr, $instance, $slot_access, ('$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'))           
-                  .  "\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 .= "}\n";
-    return $code;
+sub _generate_reader_method {
+    my $self = shift;
+    $self->_instance_is_inlinable ? $self->_generate_reader_method_inline(@_)
+                                  : $self->SUPER::_generate_reader_method(@_);
 }
 
-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 _generate_writer_method {
+    my $self = shift;
+    $self->_instance_is_inlinable ? $self->_generate_writer_method_inline(@_)
+                                  : $self->SUPER::_generate_writer_method(@_);
 }
 
-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) . ";"
-        if $attr->is_weak_ref;
-    return $code;
+sub _generate_accessor_method {
+    my $self = shift;
+    $self->_instance_is_inlinable ? $self->_generate_accessor_method_inline(@_)
+                                  : $self->SUPER::_generate_accessor_method(@_);
 }
 
-sub _inline_trigger {
-    my ($self, $instance, $value) = @_;
-    my $attr = $self->associated_attribute;
-    return '' unless $attr->has_trigger;
-    return sprintf('$attr->trigger->(%s, %s);', $instance, $value);
+sub _generate_predicate_method {
+    my $self = shift;
+    $self->_instance_is_inlinable ? $self->_generate_predicate_method_inline(@_)
+                                  : $self->SUPER::_generate_predicate_method(@_);
 }
 
-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;
+sub _generate_clearer_method {
+    my $self = shift;
+    $self->_instance_is_inlinable ? $self->_generate_clearer_method_inline(@_)
+                                  : $self->SUPER::_generate_clearer_method(@_);
+}
 
-    return $mi->inline_get_slot_value($instance, $slot_name);
+sub _writer_value_needs_copy {
+    shift->associated_attribute->_writer_value_needs_copy(@_);
 }
 
-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;
+sub _inline_tc_code {
+    shift->associated_attribute->_inline_tc_code(@_);
+}
 
-    return $mi->inline_slot_access($instance, $slot_name);
+sub _inline_check_coercion {
+    shift->associated_attribute->_inline_check_coercion(@_);
 }
 
-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;
+sub _inline_check_constraint {
+    shift->associated_attribute->_inline_check_constraint(@_);
+}
 
-    return $mi->inline_is_slot_initialized($instance, $slot_name);
+sub _inline_check_lazy {
+    shift->associated_attribute->_inline_check_lazy(@_);
 }
 
-sub _inline_auto_deref {
-    my ( $self, $ref_value ) = @_;
-        my $attr = $self->associated_attribute;
+sub _inline_store_value {
+    shift->associated_attribute->_inline_instance_set(@_) . ';';
+}
 
-    return $ref_value unless $attr->should_auto_deref;
+sub _inline_get_old_value_for_trigger {
+    shift->associated_attribute->_inline_get_old_value_for_trigger(@_);
+}
 
-    my $type_constraint = $attr->type_constraint;
+sub _inline_trigger {
+    shift->associated_attribute->_inline_trigger(@_);
+}
 
-    my $sigil;
-    if ($type_constraint->is_a_type_of('ArrayRef')) {
-        $sigil = '@';
-    }
-    elsif ($type_constraint->is_a_type_of('HashRef')) {
-        $sigil = '%';
-    }
-    else {
-        $self->throw_error("Can not auto de-reference the type constraint '" . $type_constraint->name . "'", type_constraint => $type_constraint );
-    }
+sub _get_value {
+    shift->associated_attribute->_inline_instance_get(@_);
+}
 
-    "(wantarray() ? $sigil\{ ( $ref_value ) || return } : ( $ref_value ) )";
+sub _has_value {
+    shift->associated_attribute->_inline_instance_has(@_);
 }
 
 1;
 
+# ABSTRACT: A Moose Method metaclass for accessors
+
 __END__
 
 =pod
 
-=head1 NAME
-
-Moose::Meta::Method::Accessor - A Moose Method metaclass for accessors
-
 =head1 DESCRIPTION
 
-This is a subclass of L<Class::MOP::Method::Accessor> 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<generate_accessor_method>
-
-=item B<generate_reader_method>
-
-=item B<generate_writer_method>
-
-=item B<generate_predicate_method>
-
-=item B<generate_clearer_method>
-
-=item B<generate_accessor_method_inline>
+This class is a subclass of L<Class::MOP::Method::Accessor> that
+provides additional Moose-specific functionality, all of which is
+private.
 
-=item B<generate_reader_method_inline>
-
-=item B<generate_writer_method_inline>
-
-=back
+To understand this class, you should read the the
+L<Class::MOP::Method::Accessor> 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.
-
-=head1 AUTHOR
-
-Stevan Little E<lt>stevan@iinteractive.comE<gt>
-
-Yuval Kogman E<lt>nothingmuch@woobling.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright 2006-2009 by Infinity Interactive, Inc.
-
-L<http://www.iinteractive.com>
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
+See L<Moose/BUGS> for details on reporting bugs.
 
 =cut