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 818d377..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.55';
+our $VERSION   = '0.56';
+$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Moose::Meta::Method',
@@ -51,8 +52,9 @@ sub generate_accessor_method_inline {
         . $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 . "\n"
+    . $self->_inline_check_lazy($inv) . "\n"
     . $self->_inline_post_body(@_) . "\n"
     . 'return ' . $self->_inline_auto_deref($self->_inline_get($inv)) . "\n"
     . ' }');
@@ -74,6 +76,7 @@ sub generate_writer_method_inline {
     . $self->_inline_check_constraint($value_name)
     . $self->_inline_store($inv, $value_name)
     . $self->_inline_post_body(@_)
+    . $self->_inline_trigger($inv, $value_name)
     . ' }');
 }
 
@@ -87,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 ) . ';'
     . '}');
@@ -147,27 +150,27 @@ sub _inline_check_required {
 }
 
 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;
@@ -175,25 +178,25 @@ sub _inline_check_lazy {
                      '            || confess "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, $inv, $slot_access, '$default') . "\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";
@@ -213,29 +216,21 @@ sub _inline_init_slot {
 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;
+}
 
-    my $gen_code = sub {
-        my ($ins_name, $val_name) = @_;
-        
-        my $code = $mi->inline_set_slot_value(
-            $ins_name, $slot_name, $val_name) . ";\n";
-
-        if ($attr->is_weak_ref) {
-            $code .= $mi->inline_weaken_slot_value(
-                $ins_name, $slot_name, $val_name) . ";\n";
-        }
-
-        return $code;
-    };
-
-    if ($attr->can('_with_inline_triggers')) {
-        return $attr->_with_inline_triggers(
-          $instance, $value, '$attr', $gen_code);
-    }
-
-    return $gen_code->($instance, $value, '$attr');
+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);
 }
 
 sub _inline_get {