X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FMethod%2FAccessor.pm;h=417f4dfc2c0b0c98e803b81eb9d370caae9ffb68;hb=0a3d3fdbd1870409592ef689f926e02d3359cf55;hp=3bba366f36bae9a7bb28a93212f6d934018700de;hpb=02bf7ed13ae5d43392767a38fe71e9606f1dba76;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Method/Accessor.pm b/lib/Mouse/Meta/Method/Accessor.pm
index 3bba366..417f4df 100755
--- a/lib/Mouse/Meta/Method/Accessor.pm
+++ b/lib/Mouse/Meta/Method/Accessor.pm
@@ -1,7 +1,5 @@
 package Mouse::Meta::Method::Accessor;
 use Mouse::Util qw(:meta); # enables strict and warnings
-use warnings FATAL => 'recursion';
-
 
 sub _inline_slot{
     my(undef, $self_var, $attr_name) = @_;
@@ -77,7 +75,7 @@ sub _generate_accessor_any{
         $class->throw_error("Unknown accessor type '$type'");
     }
 
-    if ($attribute->is_lazy) {
+    if ($attribute->is_lazy and $type ne 'wo') {
         my $value;
 
         if (defined $builder){
@@ -90,6 +88,7 @@ sub _generate_accessor_any{
             $value = '$default';
         }
 
+        $accessor .= "els" if $type eq 'rw';
         $accessor .= "if(!exists $slot){\n";
         if($should_coerce){
             $accessor .= "$slot = \$constraint->coerce($value)";
@@ -137,22 +136,26 @@ sub _generate_accessor_any{
 }
 
 sub _generate_accessor{
-    my $class = shift;
-    return $class->_generate_accessor_any(rw => @_);
+    #my($self, $attribute, $metaclass) = @_;
+    my $self = shift;
+    return $self->_generate_accessor_any(rw => @_);
 }
 
 sub _generate_reader {
-    my $class = shift;
-    return $class->_generate_accessor_any(ro => @_);
+    #my($self, $attribute, $metaclass) = @_;
+    my $self = shift;
+    return $self->_generate_accessor_any(ro => @_);
 }
 
 sub _generate_writer {
-    my $class = shift;
-    return $class->_generate_accessor_any(wo => @_);
+    #my($self, $attribute, $metaclass) = @_;
+    my $self = shift;
+    return $self->_generate_accessor_any(wo => @_);
 }
 
 sub _generate_predicate {
-    my (undef, $attribute, $class) = @_;
+    #my($self, $attribute, $metaclass) = @_;
+    my(undef, $attribute) = @_;
 
     my $slot = $attribute->name;
     return sub{
@@ -161,7 +164,8 @@ sub _generate_predicate {
 }
 
 sub _generate_clearer {
-    my (undef, $attribute, $class) = @_;
+    #my($self, $attribute, $metaclass) = @_;
+    my(undef, $attribute) = @_;
 
     my $slot = $attribute->name;
     return sub{
@@ -178,7 +182,7 @@ Mouse::Meta::Method::Accessor - A Mouse method generator for accessors
 
 =head1 VERSION
 
-This document describes Mouse version 0.48
+This document describes Mouse version 0.62
 
 =head1 SEE ALSO