X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FMethod%2FAccessor.pm;h=cb3e910e9290bf2c85cc1f1a92840cc16c170c78;hp=0fb563cdc91ec4ed276150aee3eda0091430d4be;hb=267711f78bd79835875f805447d3ab802a18f0c4;hpb=912fa38123c71ab5d0b8d885782cbab8d8203e8a

diff --git a/lib/Mouse/Meta/Method/Accessor.pm b/lib/Mouse/Meta/Method/Accessor.pm
index 0fb563c..cb3e910 100755
--- a/lib/Mouse/Meta/Method/Accessor.pm
+++ b/lib/Mouse/Meta/Method/Accessor.pm
@@ -1,10 +1,15 @@
 package Mouse::Meta::Method::Accessor;
-use strict;
-use warnings;
-use Scalar::Util qw(blessed);
+use Mouse::Util qw(:meta); # enables strict and warnings
+use warnings FATAL => 'recursion';
 
-sub _install_accessor{
-    my (undef, $attribute, $method_name, $class, $type) = @_;
+
+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;
@@ -13,66 +18,50 @@ sub _install_accessor{
     my $trigger       = $attribute->trigger;
     my $is_weak       = $attribute->is_weak_ref;
     my $should_deref  = $attribute->should_auto_deref;
-    my $should_coerce = $attribute->should_coerce;
+    my $should_coerce = (defined($constraint) && $constraint->has_coercion && $attribute->should_coerce);
 
-    my $compiled_type_constraint    = $constraint ? $constraint->{_compiled_type_constraint} : undef;
+    my $compiled_type_constraint = defined($constraint) ? $constraint->_compiled_type_constraint : undef;
 
     my $self  = '$_[0]';
-    my $key   = sprintf q{"%s"}, quotemeta $name;
+    my $slot  = $method_class->_inline_slot($self, $name);;
 
-    $type ||= 'accessor';
+    my $accessor = sprintf(qq{package %s;\n#line 1 "%s-accessor for %s (%s)"\n}, $class->name, $type, $name, __FILE__)
+                 . "sub {\n";
 
-    my $accessor = 
-        '#line ' . __LINE__ . ' "' . __FILE__ . "\"\n" .
-        "sub {\n";
-    if ($type eq 'accessor' || $type eq 'writer') {
-        if($type eq 'accessor'){
+    if ($type eq 'rw' || $type eq 'wo') {
+        if($type eq 'rw'){
             $accessor .= 
-                '#line ' . __LINE__ . ' "' . __FILE__ . "\"\n" .
                 'if (scalar(@_) >= 2) {' . "\n";
         }
         else{ # writer
             $accessor .= 
-                '#line ' . __LINE__ . ' "' . __FILE__ . "\"\n" .
-                'if(@_ < 2){ Carp::confess("Not enough arguments for writer '.$method_name.'") }'.
+                'if(@_ < 2){ Carp::confess("Not enough arguments for the writer of '.$name.'") }'.
                 '{' . "\n";
         }
                 
         my $value = '$_[1]';
 
-        if ($constraint) {
+        if (defined $constraint) {
             if ($should_coerce) {
                 $accessor .=
                     "\n".
-                    '#line ' . __LINE__ . ' "' . __FILE__ . "\"\n" .
-                    'my $val = Mouse::Util::TypeConstraints->typecast_constraints("'.$attribute->associated_class->name.'", $attribute->{type_constraint}, '.$value.');';
+                    'my $val = $constraint->coerce('.$value.');';
                 $value = '$val';
             }
-            if ($compiled_type_constraint) {
-                $accessor .= 
-                    "\n".
-                    '#line ' . __LINE__ . ' "' . __FILE__ . "\"\n" .
-                    'unless ($compiled_type_constraint->('.$value.')) {
-                        $attribute->verify_type_constraint_error($name, '.$value.', $attribute->{type_constraint});
-                    }' . "\n";
-            } else {
-                $accessor .= 
-                    "\n".
-                    '#line ' . __LINE__ . ' "' . __FILE__ . "\"\n" .
-                    'unless ($constraint->check('.$value.')) {
-                        $attribute->verify_type_constraint_error($name, '.$value.', $attribute->{type_constraint});
-                    }' . "\n";
-            }
+            $accessor .= 
+                "\n".
+                '$compiled_type_constraint->('.$value.') or
+                    $attribute->_throw_type_constraint_error('.$value.', $constraint);' . "\n";
         }
 
         # if there's nothing left to do for the attribute we can return during
         # this setter
         $accessor .= 'return ' if !$is_weak && !$trigger && !$should_deref;
 
-        $accessor .= $self.'->{'.$key.'} = '.$value.';' . "\n";
+        $accessor .= "$slot = $value;\n";
 
         if ($is_weak) {
-            $accessor .= 'Scalar::Util::weaken('.$self.'->{'.$key.'}) if ref('.$self.'->{'.$key.'});' . "\n";
+            $accessor .= "Scalar::Util::weaken($slot) if ref $slot;\n";
         }
 
         if ($trigger) {
@@ -81,7 +70,7 @@ sub _install_accessor{
 
         $accessor .= "}\n";
     }
-    elsif($type eq 'reader') {
+    elsif($type eq 'ro') {
         $accessor .= 'Carp::confess("Cannot assign a value to a read-only accessor") if scalar(@_) >= 2;' . "\n";
     }
     else{
@@ -89,109 +78,110 @@ sub _install_accessor{
     }
 
     if ($attribute->is_lazy) {
-        $accessor .= $self.'->{'.$key.'} = ';
-
-        $accessor .= $attribute->has_builder
-                ? $self.'->$builder'
-                    : ref($default) eq 'CODE'
-                    ? '$default->('.$self.')'
-                    : '$default';
-        $accessor .= ' if !exists '.$self.'->{'.$key.'};' . "\n";
+        my $value;
+
+        if (defined $builder){
+            $value = "$self->\$builder()";
+        }
+        elsif (ref($default) eq 'CODE'){
+            $value = "$self->\$default()";
+        }
+        else{
+            $value = '$default';
+        }
+
+        $accessor .= "if(!exists $slot){\n";
+        if($should_coerce){
+            $accessor .= "$slot = \$constraint->coerce($value)";
+        }
+        elsif(defined $constraint){
+            $accessor .= "my \$tmp = $value;\n";
+
+            $accessor .= "\$compiled_type_constraint->(\$tmp)";
+            $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";
     }
 
     if ($should_deref) {
         if ($constraint->is_a_type_of('ArrayRef')) {
-            $accessor .= 'if (wantarray) {
-                return @{ '.$self.'->{'.$key.'} || [] };
-            }';
+            $accessor .= "return \@{ $slot || [] } if wantarray;\n";
         }
         elsif($constraint->is_a_type_of('HashRef')){
-            $accessor .= 'if (wantarray) {
-                return %{ '.$self.'->{'.$key.'} || {} };
-            }';
+            $accessor .= "return \%{ $slot || {} } if wantarray;\n";
         }
         else{
             $class->throw_error("Can not auto de-reference the type constraint " . $constraint->name);
         }
     }
 
-    $accessor .= 'return '.$self.'->{'.$key."};\n}";
+    $accessor .= "return $slot;\n}\n";
 
     #print $accessor, "\n";
-    my $code = eval $accessor;
-    $attribute->throw_error($@) if $@;
-
-    $class->add_method($method_name => $code);
-    return;
+    my $code;
+    my $e = do{
+        local $@;
+        $code = eval $accessor;
+        $@;
+    };
+    die $e if $e;
+
+    return $code;
 }
 
-sub _install_reader{
+sub _generate_accessor{
     my $class = shift;
-    $class->_install_accessor(@_, 'reader');
-    return;
+    return $class->_generate_accessor_any(rw => @_);
 }
 
-sub _install_writer{
+sub _generate_reader {
     my $class = shift;
-    $class->_install_accessor(@_, 'writer');
-    return;
+    return $class->_generate_accessor_any(ro => @_);
 }
 
+sub _generate_writer {
+    my $class = shift;
+    return $class->_generate_accessor_any(wo => @_);
+}
 
-sub _install_predicate {
-    my (undef, $attribute, $method_name, $class) = @_;
+sub _generate_predicate {
+    my (undef, $attribute, $class) = @_;
 
     my $slot = $attribute->name;
-
-    $class->add_method($method_name => sub{
+    return sub{
         return exists $_[0]->{$slot};
-    });
-    return;
+    };
 }
 
-sub _install_clearer {
-    my (undef, $attribute, $method_name, $class) = @_;
+sub _generate_clearer {
+    my (undef, $attribute, $class) = @_;
 
     my $slot = $attribute->name;
-
-    $class->add_method($method_name => sub{
+    return sub{
         delete $_[0]->{$slot};
-    });
-    return;
+    };
 }
 
-sub _install_handles {
-    my (undef, $attribute, $handles, $class) = @_;
-
-    my $reader  = $attribute->reader || $attribute->accessor
-        or $class->throw_error("You must pass a reader method for '".$attribute->name."'");
-
-    my %handles = $attribute->_canonicalize_handles($handles);
-
-    foreach my $handle_name (keys %handles) {
-        my $method_to_call = $handles{$handle_name};
-
-        my $code = 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(@_);
-        };
-        $class->add_method($handle_name => $code);
-    }
-    return;
-}
+1;
+__END__
 
+=head1 NAME
 
-1;
+Mouse::Meta::Method::Accessor - A Mouse method generator for accessors
+
+=head1 VERSION
+
+This document describes Mouse version 0.4501
+
+=head1 SEE ALSO
+
+L<Moose::Meta::Method::Accessor>
+
+=cut