X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FMethod%2FAccessor.pm;h=f619a326956ea8fc0be048059dea4c70ada0936c;hb=21276ee227d0ed4ac4f4c65c490e4abfbd1f7b29;hp=c85f72fc9c69ef7b0089171cc3639c1f3c71873c;hpb=cd00d876826ae9df767871dea63aa7f77be0603d;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Method/Accessor.pm b/lib/Mouse/Meta/Method/Accessor.pm
index c85f72f..f619a32 100755
--- a/lib/Mouse/Meta/Method/Accessor.pm
+++ b/lib/Mouse/Meta/Method/Accessor.pm
@@ -1,9 +1,13 @@
 package Mouse::Meta::Method::Accessor;
-use Mouse::Util; # enables strict and warnings
-use Scalar::Util qw(blessed);
+use Mouse::Util qw(:meta); # enables strict and warnings
+
+sub _inline_slot{
+    my(undef, $self_var, $attr_name) = @_;
+    return sprintf '%s->{q{%s}}', $self_var, $attr_name;
+}
 
 sub _generate_accessor{
-    my (undef, $attribute, $class, $type) = @_;
+    my ($method_class, $attribute, $class, $type) = @_;
 
     my $name          = $attribute->name;
     my $default       = $attribute->default;
@@ -17,12 +21,11 @@ sub _generate_accessor{
     my $compiled_type_constraint = defined($constraint) ? $constraint->_compiled_type_constraint : undef;
 
     my $self  = '$_[0]';
-    my $key   = "q{$name}";
-    my $slot  = "$self\->{$key}";
+    my $slot  = $method_class->_inline_slot($self, $name);;
 
     $type ||= 'accessor';
 
-    my $accessor = sprintf(qq{#line 1 "%s for %s (%s)"\n}, $type, $name, __FILE__)
+    my $accessor = sprintf(qq{package %s;\n#line 1 "%s for %s (%s)"\n}, $class->name, $type, $name, __FILE__)
                  . "sub {\n";
 
     if ($type eq 'accessor' || $type eq 'writer') {
@@ -87,11 +90,24 @@ sub _generate_accessor{
             $value = '$default';
         }
 
+        $accessor .= "if(!exists $slot){\n";
         if($should_coerce){
-            $value = "\$constraint->coerce($value)";
+            $accessor .= "$slot = \$constraint->coerce($value)";
         }
+        elsif(defined $constraint){
+            $accessor .= "my \$tmp = $value;\n";
 
-        $accessor .= "$slot = $value if !exists $slot;\n";
+            $accessor .= "\$compiled_type_constraint->(\$tmp)";
+            $accessor .= " || \$attribute->verify_type_constraint_error(\$name, \$tmp, \$constraint);\n";
+            $accessor .= "$slot = \$tmp;\n";
+        }
+        else{
+            $accessor .= "$slot = $value;\n";
+        }
+        if ($is_weak) {
+            $accessor .= "Scalar::Util::weaken($slot) if ref $slot;\n";
+        }
+        $accessor .= "}\n";
     }
 
     if ($should_deref) {
@@ -150,27 +166,19 @@ sub _generate_clearer {
     };
 }
 
-sub _generate_delegation{
-    my (undef, $attribute, $class, $reader, $handle_name, $method_to_call) = @_;
-
-    return sub {
-        my $instance = shift;
-        my $proxy    = $instance->$reader();
-
-        my $error = !defined($proxy)                ? ' is not defined'
-                  : ref($proxy) && !blessed($proxy) ? qq{ is not an object (got '$proxy')}
-                                                    : undef;
-        if ($error) {
-            $instance->meta->throw_error(
-                "Cannot delegate $handle_name to $method_to_call because "
-                    . "the value of "
-                    . $attribute->name
-                    . $error
-             );
-        }
-        $proxy->$method_to_call(@_);
-    };
-}
+1;
+__END__
 
+=head1 NAME
 
-1;
+Mouse::Meta::Method::Accessor - A Mouse method generator for accessors
+
+=head1 VERSION
+
+This document describes Mouse version 0.40_09
+
+=head1 SEE ALSO
+
+L<Moose::Meta::Method::Accessor>
+
+=cut