X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FMethod%2FAccessor.pm;h=957ba1606e41864b8c34714b956126cb4d9fdf30;hb=6f94c802188d44415bafdd64422cecd24585a289;hp=d19d1965f8eeb53c79c7f698b3988b0dd35769de;hpb=cb5f4275cc545d6566664cbbac66e6ec5dcbca36;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Method/Accessor.pm b/lib/Moose/Meta/Method/Accessor.pm
index d19d196..957ba16 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.75';
+our $VERSION   = '0.87';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -17,7 +17,7 @@ sub _error_thrower {
 }
 
 sub _eval_code {
-    my ( $self, $code ) = @_;
+    my ( $self, $source ) = @_;
 
     # NOTE:
     # set up the environment
@@ -34,9 +34,15 @@ sub _eval_code {
                                    : undef),
     };
 
-    #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 );
+    #warn "code for $attr_name =>\n" . $source . "\n";
+    my ( $code, $e ) = $self->_compile_code( environment => $environment, code => $source );
+
+    $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 {
@@ -120,12 +126,12 @@ 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;
 
     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") . ";";
@@ -135,7 +141,7 @@ sub _inline_check_coercion {
     my ($self, $value) = @_;
 
     my $attr = $self->associated_attribute;
-    
+
     return '' unless $attr->should_coerce;
     return "$value = \$attr->type_constraint->coerce($value);";
 }
@@ -145,7 +151,7 @@ sub _inline_check_required {
     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
 }
@@ -166,7 +172,7 @@ sub _inline_check_lazy {
         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".
@@ -177,22 +183,22 @@ sub _inline_check_lazy {
             $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 {
             $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";            
-        } 
+            $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'))           
+            $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";
         }
@@ -208,15 +214,15 @@ sub _inline_init_slot {
     }
     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 $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;
@@ -233,7 +239,7 @@ sub _inline_trigger {
 sub _inline_get {
     my ($self, $instance) = @_;
     my $attr = $self->associated_attribute;
-    
+
     my $mi = $attr->associated_class->get_meta_instance;
 
     return $mi->inline_get_slot_value($instance, $attr->slots);
@@ -242,7 +248,7 @@ sub _inline_get {
 sub _inline_access {
     my ($self, $instance) = @_;
     my $attr = $self->associated_attribute;
-    
+
     my $mi = $attr->associated_class->get_meta_instance;
 
     return $mi->inline_slot_access($instance, $attr->slots);
@@ -251,7 +257,7 @@ sub _inline_access {
 sub _inline_has {
     my ($self, $instance) = @_;
     my $attr = $self->associated_attribute;
-    
+
     my $mi = $attr->associated_class->get_meta_instance;
 
     return $mi->inline_is_slot_initialized($instance, $attr->slots);
@@ -291,12 +297,12 @@ Moose::Meta::Method::Accessor - A Moose Method metaclass for accessors
 
 =head1 DESCRIPTION
 
-This class is a subclass of L<Class::MOP::Class::Accessor> that
+This class is a subclass of L<Class::MOP::Method::Accessor> that
 provides additional Moose-specific functionality, all of which is
 private.
 
 To understand this class, you should read the the
-L<Class::MOP::Class::Accessor> documentation.
+L<Class::MOP::Method::Accessor> documentation.
 
 =head1 BUGS