X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FMethod%2FAccessor.pm;h=585be50d0a323cbf3f06e6d5e867ef9799b1f7ba;hb=a9fdc7c4d7fd25109c74f694918c7b37561738b7;hp=d727650e7b4563d9fe5607c2d47461041a7dc20b;hpb=4c0fe06fa87e7c2c4ed1666e77ed52ae020f19d7;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Method/Accessor.pm b/lib/Mouse/Meta/Method/Accessor.pm
index d727650..585be50 100755
--- a/lib/Mouse/Meta/Method/Accessor.pm
+++ b/lib/Mouse/Meta/Method/Accessor.pm
@@ -23,7 +23,7 @@ sub _generate_accessor_any{
     my $self  = '$_[0]';
     my $slot  = $method_class->_inline_slot($self, $name);;
 
-    my $accessor = sprintf(qq{package %s;\n#line 1 "%s for %s (%s)"\n}, $class->name, $type, $name, __FILE__)
+    my $accessor = sprintf(qq{package %s;\n#line 1 "%s-accessor for %s (%s)"\n}, $class->name, $type, $name, __FILE__)
                  . "sub {\n";
 
     if ($type eq 'rw' || $type eq 'wo') {
@@ -49,7 +49,7 @@ sub _generate_accessor_any{
             $accessor .= 
                 "\n".
                 '$compiled_type_constraint->('.$value.') or
-                    $attribute->verify_type_constraint_error($name, '.$value.', $constraint);' . "\n";
+                    $attribute->_throw_type_constraint_error('.$value.', $constraint);' . "\n";
         }
 
         # if there's nothing left to do for the attribute we can return during
@@ -75,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){
@@ -88,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)";
@@ -96,7 +97,7 @@ sub _generate_accessor_any{
             $accessor .= "my \$tmp = $value;\n";
 
             $accessor .= "\$compiled_type_constraint->(\$tmp)";
-            $accessor .= " || \$attribute->verify_type_constraint_error(\$name, \$tmp, \$constraint);\n";
+            $accessor .= " || \$attribute->_throw_type_constraint_error(\$tmp, \$constraint);\n";
             $accessor .= "$slot = \$tmp;\n";
         }
         else{
@@ -135,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{
@@ -159,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{
@@ -176,7 +182,7 @@ Mouse::Meta::Method::Accessor - A Mouse method generator for accessors
 
 =head1 VERSION
 
-This document describes Mouse version 0.41
+This document describes Mouse version 0.70
 
 =head1 SEE ALSO