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=1934a5013a62559b6bff0a35e90a4eefd431cfd1;hpb=7bffa230cb5d051d895a8393dcc0b096b91f24e0;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Method/Accessor.pm b/lib/Moose/Meta/Method/Accessor.pm
index 1934a50..b6852f7 100644
--- a/lib/Moose/Meta/Method/Accessor.pm
+++ b/lib/Moose/Meta/Method/Accessor.pm
@@ -4,192 +4,264 @@ package Moose::Meta::Method::Accessor;
 use strict;
 use warnings;
 
-use Carp 'confess';
-
-our $VERSION = '0.01';
+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 generate_accessor_method_inline {
-    my $self      = shift;
-    my $attr      = $self->associated_attribute; 
-    my $attr_name = $attr->name;
+sub _eval_code {
+    my ( $self, $code ) = @_;
 
-    my $value_name = $attr->should_coerce ? '$val' : '$_[1]';
-	my $mi = $attr->associated_class->get_meta_instance;
-	my $slot_name = sprintf "'%s'", $attr->slots;
-	my $inv = '$_[0]';
-    my $code = 'sub { '
-    . 'if (scalar(@_) == 2) {'
-        . $self->_inline_check_required
-        . $self->_inline_check_coercion
-        . $self->_inline_check_constraint($value_name)
-		. $self->_inline_store($inv, $value_name)
-		. $self->_inline_trigger($inv, $value_name)
-    . ' }'
-    . $self->_inline_check_lazy
-    . 'return ' . $self->_inline_auto_deref($self->_inline_get($inv))
-    . ' }';
-    
     # NOTE:
     # set up the environment
-    my $type_constraint = $attr->type_constraint 
-                                ? $attr->type_constraint->_compiled_type_constraint
-                                : undef;
-    
+    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;
-    confess "Could not create accessor for '$attr_name' because $@ \n code: $code" if $@;
-    return $sub;    
+    $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];
+    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 generate_writer_method_inline {
-    my $self      = shift;
-    my $attr      = $self->associated_attribute; 
-    my $attr_name = $attr->name;
-    
-    my $value_name = $attr->should_coerce ? '$val' : '$_[1]';
-	my $inv = '$_[0]';
-    my $code = 'sub { '
+    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_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 {
-    my $self      = shift;
-    my $attr      = $self->associated_attribute; 
-    my $attr_name = $attr->name;
-    
-    my $code = 'sub {'
-    . 'confess "Cannot assign a value to a read-only accessor" if @_ > 1;'
-    . $self->_inline_check_lazy
-    . 'return ' . $self->_inline_auto_deref( '$_[0]->{$attr_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 reader for '$attr_name' because $@ \n code: $code" if $@;
-    return $sub;
+    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 ) . ';'
+    . '}');
+}
+
+sub _inline_copy_value {
+    return '' unless shift->_value_needs_copy;
+    return 'my $val = $_[1];'
+}
+
+sub _value_needs_copy {
+    my $attr = (shift)->associated_attribute;
+    return $attr->should_coerce;
 }
 
-*generate_reader_method   = \&generate_reader_method_inline;
-*generate_writer_method   = \&generate_writer_method_inline;
-*generate_accessor_method = \&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(@_) }
 
-## ... private helpers
+sub _inline_pre_body  { '' }
+sub _inline_post_body { '' }
 
 sub _inline_check_constraint {
-	my ($self, $value) = @_;
-	
-	my $attr = $self->associated_attribute; 
-	
-	return '' unless $attr->has_type_constraint;
-	
-	# FIXME - remove 'unless defined($value) - constraint Undef
-	return sprintf <<'EOF', $value, $value, $value, $value
-defined($type_constraint->(%s))
-	|| confess "Attribute (" . $attr->name . ") does not pass the type constraint ("
-       . $attr->type_constraint->name . ") with " . (defined(%s) ? "'%s'" : "undef")
-  if defined(%s);
-EOF
+    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;
+
+    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; 
-	
-	return '' unless $attr->should_coerce;
-    return 'my $val = $attr->type_constraint->coerce($_[1]);'
+    my $attr = (shift)->associated_attribute;
+    
+    return '' unless $attr->should_coerce;
+    return '$val = $attr->type_constraint->coerce($_[1]);'
 }
 
 sub _inline_check_required {
-	my $attr = (shift)->associated_attribute; 
-	
-	return '' unless $attr->is_required;
-    return 'defined($_[1]) || confess "Attribute ($attr_name) is required, so cannot be set to undef";'
+    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
 }
 
 sub _inline_check_lazy {
-	my $attr = (shift)->associated_attribute; 
-	
-	return '' unless $attr->is_lazy;
-	
-	if ($attr->has_type_constraint) {
-	    # NOTE:
-	    # this could probably be cleaned 
-	    # up and streamlined a little more
-	    return 'unless (exists $_[0]->{$attr_name}) {' .
-	           '    if ($attr->has_default) {' .
-	           '        my $default = $attr->default($_[0]);' .
-               '        (defined($type_constraint->($default)))' .
-               '        	|| confess "Attribute (" . $attr->name . ") does not pass the type constraint ("' .
-               '               . $attr->type_constraint->name . ") with " . (defined($default) ? "\'$default\'" : "undef")' .
-               '          if defined($default);' .	                
-	           '        $_[0]->{$attr_name} = $default; ' .
-	           '    }' .
-	           '    else {' .
-               '        $_[0]->{$attr_name} = undef;' .
-	           '    }' .
-	           '}';	    
-	}
-    return '$_[0]->{$attr_name} = ($attr->has_default ? $attr->default($_[0]) : undef)'
-         . 'unless exists $_[0]->{$attr_name};';
+    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 _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) = @_;
-	my $attr = $self->associated_attribute; 	
-
-	my $mi = $attr->associated_class->get_meta_instance;
-	my $slot_name = sprintf "'%s'", $attr->slots;
-
+    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;
+    $code   .= $mi->inline_weaken_slot_value($instance, $slot_name, $value) . ";"
+        if $attr->is_weak_ref;
     return $code;
 }
 
 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);
+    my ($self, $instance, $value) = @_;
+    my $attr = $self->associated_attribute;
+    return '' unless $attr->has_trigger;
+    return sprintf('$attr->trigger->(%s, %s, $attr);', $instance, $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;
+    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);
 }
 
+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);
+}
+
+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);
+}
+
 sub _inline_auto_deref {
     my ( $self, $ref_value ) = @_;
-	my $attr = $self->associated_attribute;     
+        my $attr = $self->associated_attribute;
 
     return $ref_value unless $attr->should_auto_deref;
 
@@ -198,12 +270,12 @@ sub _inline_auto_deref {
     my $sigil;
     if ($type_constraint->is_a_type_of('ArrayRef')) {
         $sigil = '@';
-    } 
+    }
     elsif ($type_constraint->is_a_type_of('HashRef')) {
         $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 ) )";
@@ -221,10 +293,10 @@ 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 
+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. 
+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.
@@ -249,7 +321,7 @@ role in the optimization strategy we are currently following.
 
 =head1 BUGS
 
-All complex software has bugs lurking in it, and this module is no 
+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.
 
@@ -261,11 +333,11 @@ Yuval Kogman E<lt>nothingmuch@woobling.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006 by Infinity Interactive, Inc.
+Copyright 2006-2008 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.
 
-=cut
\ No newline at end of file
+=cut