Pass the invocant name to _inline_check_lazy for consistency (also

[gitmo/Moose.git] / lib / Moose / Meta / Method / Accessor.pm

diff --git a/lib/Moose/Meta/Method/Accessor.pm b/lib/Moose/Meta/Method/Accessor.pm
index 30efaa6..8da980d 100644 (file)
--- a/lib/Moose/Meta/Method/Accessor.pm
+++ b/lib/Moose/Meta/Method/Accessor.pm
@@ -6,7 +6,8 @@ use warnings;
 
 use Carp 'confess';
 
-our $VERSION   = '0.12';
+our $VERSION   = '0.56';
+$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Moose::Meta::Method',
@@ -28,6 +29,7 @@ sub _eval_code {
                                    ? $type_constraint_obj->_compiled_type_constraint
                                    : undef;
 
+    #warn "code for $attr_name =>\n" . $code . "\n";
     my $sub = eval $code;
     confess "Could not create writer for '$attr_name' because $@ \n code: $code" if $@;
     return $sub;
@@ -52,7 +54,7 @@ sub generate_accessor_method_inline {
         . $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"
     . ' }');
@@ -88,7 +90,7 @@ sub generate_reader_method_inline {
     $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_check_lazy($inv)
     . $self->_inline_post_body(@_)
     . 'return ' . $self->_inline_auto_deref( $slot_access ) . ';'
     . '}');
@@ -127,8 +129,7 @@ sub _inline_check_constraint {
     return sprintf <<'EOF', $value, $attr_name, $value, $value,
 $type_constraint->(%s)
         || confess "Attribute (%s) does not pass the type constraint because: "
-       . $type_constraint_obj->get_message(%s)
-  if defined(%s);
+       . $type_constraint_obj->get_message(%s);
 EOF
 }
 
@@ -145,57 +146,57 @@ sub _inline_check_required {
     my $attr_name = $attr->name;
     
     return '' unless $attr->is_required;
-    return qq{defined(\$_[1]) || confess "Attribute ($attr_name) is required, so cannot be set to undef";}
+    return qq{(\@_ >= 2) || confess "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 '.
+                         '    if(my $builder = '.$instance.'->can($attr->builder)){ '."\n".
+                         '        $default = '.$instance.'->$builder; '. "\n    } else {\n" .
+                         '        confess(Scalar::Util::blessed('.$instance.')." does not support builder method '.
                          '\'".$attr->builder."\' for attribute \'" . $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) ? overload::StrVal($default) : "undef")' .
-                     '          if defined($default);' . "\n";
-            $code .= '    ' . $self->_inline_init_slot($attr, $inv, $slot_access, '$default') . "\n";
+                     '           . $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, $inv, $slot_access, 'undef') . "\n";
+            $code .= '    ' . $self->_inline_init_slot($attr, $instance, $slot_access, 'undef') . "\n";
         }
 
     } else {
         if ($attr->has_default) {
-            $code .= '    ' . $self->_inline_init_slot($attr, $inv, $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" 
-                  .  '       ' . $self->_inline_init_slot($attr, $inv, $slot_access, ($inv . '->$builder'))           
+            $code .= '    if (my $builder = '.$instance.'->can($attr->builder)) { ' . "\n" 
+                  .  '       ' . $self->_inline_init_slot($attr, $instance, $slot_access, ($instance . '->$builder'))           
                      . "\n    } else {\n" .
-                     '        confess(Scalar::Util::blessed('.$inv.')." does not support builder method '.
+                     '        confess(Scalar::Util::blessed('.$instance.')." does not support builder method '.
                      '\'".$attr->builder."\' for attribute \'" . $attr->name . "\'");'. "\n    }";
         } 
         else {
-            $code .= '    ' . $self->_inline_init_slot($attr, $inv, $slot_access, 'undef') . "\n";
+            $code .= '    ' . $self->_inline_init_slot($attr, $instance, $slot_access, 'undef') . "\n";
         }
     }
     $code .= "}\n";