X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FMethod%2FAccessor.pm;h=1e788c814f42006074a240a968da46b908771ab5;hb=f774b7de063779726b9f84c70f512cab94fee065;hp=d073cb58f69e99dcc61118134dcc116cb23b9f56;hpb=c3797828b5fae171b01dbb08a9a752c610d8a7bf;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Method/Accessor.pm b/lib/Mouse/Meta/Method/Accessor.pm
index d073cb5..1e788c8 100755
--- a/lib/Mouse/Meta/Method/Accessor.pm
+++ b/lib/Mouse/Meta/Method/Accessor.pm
@@ -74,8 +74,7 @@ sub _generate_accessor{
         $class->throw_error("Unknown accessor type '$type'");
     }
 
-    # XXX: an anon class can be a runtime created class
-    if ($attribute->is_lazy || $class->is_anon_class) {
+    if ($attribute->is_lazy) {
         my $value;
 
         if (defined $builder){
@@ -88,11 +87,23 @@ sub _generate_accessor{
             $value = '$default';
         }
 
+        $accessor .= "if(!exists $slot){\n";
         if($should_coerce){
-            $value = "\$constraint->coerce($value)";
+            $accessor .= "$slot = \$constraint->coerce($value)";
         }
-
-        $accessor .= "$slot = $value if !exists $slot;\n";
+        elsif(defined $constraint){
+            $accessor .= "my \$tmp = $value;\n";
+            #XXX: The following 'defined and' check is for backward compatibility
+            $accessor .= "defined(\$tmp) and ";
+
+            $accessor .= "\$compiled_type_constraint->(\$tmp)";
+            $accessor .= " || \$attribute->verify_type_constraint_error(\$name, \$tmp, \$constraint);\n";
+            $accessor .= "$slot = \$tmp;\n";
+        }
+        else{
+            $accessor .= "$slot = $value;\n";
+        }
+        $accessor .= "}\n";
     }
 
     if ($should_deref) {
@@ -175,3 +186,4 @@ sub _generate_delegation{
 
 
 1;
+__END__