X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FMethod%2FAccessor.pm;h=d643816cf02d4869ce82ad3dcae21e57f71d62fd;hb=66e3df7a8d3d839b53f6fc3af8f4bad6fc27fefe;hp=5d854764e59ba896954a9acffc52b0a6434bf151;hpb=06a970ab9fb60a4cac5e3f1774cf9a2914c94cc1;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Method/Accessor.pm b/lib/Mouse/Meta/Method/Accessor.pm
old mode 100755
new mode 100644
index 5d85476..d643816
--- a/lib/Mouse/Meta/Method/Accessor.pm
+++ b/lib/Mouse/Meta/Method/Accessor.pm
@@ -1,9 +1,15 @@
 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 _generate_accessor{
-    my (undef, $attribute, $class, $type) = @_;
+use constant _MOUSE_DEBUG => $ENV{MOUSE_DEBUG} ? 1 : 0;
+
+sub _inline_slot{
+    my(undef, $self_var, $attr_name) = @_;
+    return sprintf '%s->{q{%s}}', $self_var, $attr_name;
+}
+
+sub _generate_accessor_any{
+    my($method_class, $type, $attribute, $class) = @_;
 
     my $name          = $attribute->name;
     my $default       = $attribute->default;
@@ -12,30 +18,31 @@ sub _generate_accessor{
     my $trigger       = $attribute->trigger;
     my $is_weak       = $attribute->is_weak_ref;
     my $should_deref  = $attribute->should_auto_deref;
-    my $should_coerce = (defined($constraint) && $constraint->has_coercion && $attribute->should_coerce);
+    my $should_coerce = (defined($constraint)
+                            && $constraint->has_coercion
+                            && $attribute->should_coerce);
 
-    my $compiled_type_constraint = defined($constraint) ? $constraint->_compiled_type_constraint : undef;
+    my $compiled_type_constraint = defined($constraint)
+        ? $constraint->_compiled_type_constraint
+        : undef;
 
     my $self  = '$_[0]';
-    my $key   = "q{$name}";
-    my $slot  = "$self\->{$key}";
-
-    $type ||= 'accessor';
+    my $slot  = $method_class->_inline_slot($self, $name);;
 
-    my $accessor = sprintf(qq{#line 1 "%s for %s (%s)"\n}, $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 'accessor' || $type eq 'writer') {
-        if($type eq 'accessor'){
-            $accessor .= 
+    if ($type eq 'rw' || $type eq 'wo') {
+        if($type eq 'rw'){
+            $accessor .=
                 'if (scalar(@_) >= 2) {' . "\n";
         }
         else{ # writer
-            $accessor .= 
-                'if(@_ < 2){ Carp::confess("Not enough arguments for the writer of '.$name.'") }'.
+            $accessor .=
+                'if(@_ < 2){ Carp::confess("Not enough arguments for the writer of $name") }'.
                 '{' . "\n";
         }
-                
+
         my $value = '$_[1]';
 
         if (defined $constraint) {
@@ -45,10 +52,10 @@ sub _generate_accessor{
                     'my $val = $constraint->coerce('.$value.');';
                 $value = '$val';
             }
-            $accessor .= 
+            $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
@@ -67,14 +74,14 @@ sub _generate_accessor{
 
         $accessor .= "}\n";
     }
-    elsif($type eq 'reader') {
-        $accessor .= 'Carp::confess("Cannot assign a value to a read-only accessor") if scalar(@_) >= 2;' . "\n";
+    elsif($type eq 'ro') {
+        $accessor .= 'Carp::confess("Cannot assign a value to a read-only accessor of $name") if scalar(@_) >= 2;' . "\n";
     }
     else{
         $class->throw_error("Unknown accessor type '$type'");
     }
 
-    if ($attribute->is_lazy) {
+    if ($attribute->is_lazy and $type ne 'wo') {
         my $value;
 
         if (defined $builder){
@@ -87,22 +94,23 @@ sub _generate_accessor{
             $value = '$default';
         }
 
+        $accessor .= "els" if $type eq 'rw';
         $accessor .= "if(!exists $slot){\n";
         if($should_coerce){
             $accessor .= "$slot = \$constraint->coerce($value)";
         }
         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 .= " || \$attribute->_throw_type_constraint_error(\$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";
     }
 
@@ -120,7 +128,7 @@ sub _generate_accessor{
 
     $accessor .= "return $slot;\n}\n";
 
-    #print "# class ", $class->name, "\n", $accessor, "\n";
+    warn $accessor if _MOUSE_DEBUG;
     my $code;
     my $e = do{
         local $@;
@@ -132,19 +140,27 @@ sub _generate_accessor{
     return $code;
 }
 
-sub _generate_reader{
-    my $class = shift;
-    return $class->_generate_accessor(@_, 'reader');
+sub _generate_accessor{
+    #my($self, $attribute, $metaclass) = @_;
+    my $self = shift;
+    return $self->_generate_accessor_any(rw => @_);
 }
 
-sub _generate_writer{
-    my $class = shift;
-    return $class->_generate_accessor(@_, 'writer');
+sub _generate_reader {
+    #my($self, $attribute, $metaclass) = @_;
+    my $self = shift;
+    return $self->_generate_accessor_any(ro => @_);
 }
 
+sub _generate_writer {
+    #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{
@@ -153,38 +169,15 @@ sub _generate_predicate {
 }
 
 sub _generate_clearer {
-    my (undef, $attribute, $class) = @_;
+    #my($self, $attribute, $metaclass) = @_;
+    my(undef, $attribute) = @_;
 
     my $slot = $attribute->name;
-
-   return sub{
+    return sub{
         delete $_[0]->{$slot};
     };
 }
 
-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__
 
@@ -194,7 +187,7 @@ Mouse::Meta::Method::Accessor - A Mouse method generator for accessors
 
 =head1 VERSION
 
-This document describes Mouse version 0.38
+This document describes Mouse version 0.88
 
 =head1 SEE ALSO