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=5bc0808875a1bcf4c3cba5fa86b984ae7c5aea0c;hp=38531bcbad278ebbe915c0f094afb918e429de38;hb=d990f7911dfd6a36d1dcc072e7adb72bf0379349;hpb=a3f4f68e59a9f962a72410a3aa1ece6f1f3126b5

diff --git a/lib/Mouse/Meta/Method/Accessor.pm b/lib/Mouse/Meta/Method/Accessor.pm
old mode 100644
new mode 100755
index 38531bc..5bc0808
--- a/lib/Mouse/Meta/Method/Accessor.pm
+++ b/lib/Mouse/Meta/Method/Accessor.pm
@@ -1,11 +1,15 @@
 package Mouse::Meta::Method::Accessor;
-use strict;
-use warnings;
-use Carp ();
+use Mouse::Util qw(:meta); # enables strict and warnings
+use warnings FATAL => 'recursion';
 
-# internal use only. do not call directly
-sub generate_accessor_method_inline {
-    my ($class, $attribute) = @_;
+
+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;
@@ -14,56 +18,50 @@ sub generate_accessor_method_inline {
     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   = $attribute->inlined_name;
+    my $slot  = $method_class->_inline_slot($self, $name);;
 
-    my $accessor = 
-        '#line ' . __LINE__ . ' "' . __FILE__ . "\"\n" .
-        "sub {\n";
-    if ($attribute->_is_metadata eq 'rw') {
-        $accessor .= 
-            '#line ' . __LINE__ . ' "' . __FILE__ . "\"\n" .
-            'if (scalar(@_) >= 2) {' . "\n";
+    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') {
+        if($type eq 'rw'){
+            $accessor .= 
+                'if (scalar(@_) >= 2) {' . "\n";
+        }
+        else{ # writer
+            $accessor .= 
+                '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) {
@@ -72,40 +70,118 @@ sub generate_accessor_method_inline {
 
         $accessor .= "}\n";
     }
-    else {
+    elsif($type eq 'ro') {
         $accessor .= 'Carp::confess("Cannot assign a value to a read-only accessor") if scalar(@_) >= 2;' . "\n";
     }
+    else{
+        $class->throw_error("Unknown accessor type '$type'");
+    }
 
     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 (ref($constraint) && $constraint->name =~ '^ArrayRef\b') {
-            $accessor .= 'if (wantarray) {
-                return @{ '.$self.'->{'.$key.'} || [] };
-            }';
+        if ($constraint->is_a_type_of('ArrayRef')) {
+            $accessor .= "return \@{ $slot || [] } if wantarray;\n";
         }
-        else {
-            $accessor .= 'if (wantarray) {
-                return %{ '.$self.'->{'.$key.'} || {} };
-            }';
+        elsif($constraint->is_a_type_of('HashRef')){
+            $accessor .= "return \%{ $slot || {} } if wantarray;\n";
+        }
+        else{
+            $class->throw_error("Can not auto de-reference the type constraint " . $constraint->name);
         }
     }
 
-    $accessor .= 'return '.$self.'->{'.$key.'};
-    }';
+    $accessor .= "return $slot;\n}\n";
+
+    #print $accessor, "\n";
+    my $code;
+    my $e = do{
+        local $@;
+        $code = eval $accessor;
+        $@;
+    };
+    die $e if $e;
+
+    return $code;
+}
+
+sub _generate_accessor{
+    my $class = shift;
+    return $class->_generate_accessor_any(rw => @_);
+}
+
+sub _generate_reader {
+    my $class = shift;
+    return $class->_generate_accessor_any(ro => @_);
+}
+
+sub _generate_writer {
+    my $class = shift;
+    return $class->_generate_accessor_any(wo => @_);
+}
+
+sub _generate_predicate {
+    my (undef, $attribute, $class) = @_;
 
-    my $sub = eval $accessor;
-    Carp::confess($@) if $@;
-    return $sub;
+    my $slot = $attribute->name;
+    return sub{
+        return exists $_[0]->{$slot};
+    };
+}
+
+sub _generate_clearer {
+    my (undef, $attribute, $class) = @_;
+
+    my $slot = $attribute->name;
+    return sub{
+        delete $_[0]->{$slot};
+    };
 }
 
 1;
+__END__
+
+=head1 NAME
+
+Mouse::Meta::Method::Accessor - A Mouse method generator for accessors
+
+=head1 VERSION
+
+This document describes Mouse version 0.50_02
+
+=head1 SEE ALSO
+
+L<Moose::Meta::Method::Accessor>
+
+=cut