Refactor pp method generators

[gitmo/Mouse.git] / lib / Mouse / Meta / Method / Accessor.pm

diff --git a/lib/Mouse/Meta/Method/Accessor.pm b/lib/Mouse/Meta/Method/Accessor.pm
index b05e267..667f2ea 100755 (executable)
--- a/lib/Mouse/Meta/Method/Accessor.pm
+++ b/lib/Mouse/Meta/Method/Accessor.pm
@@ -1,15 +1,15 @@
 package Mouse::Meta::Method::Accessor;
-use Mouse::Util; # enables strict and warnings
+use Mouse::Util qw(:meta); # enables strict and warnings
+use warnings FATAL => 'recursion';
 
-sub _inline_slot{
-    my(undef, $self_var, $attr_name) = @_;
-    return sprintf '%s->{q{%s}}', $self_var, $attr_name;
-}
+use Mouse::Meta::Method::Constructor; # for slot access
 
-sub _generate_accessor{
-    my ($method_class, $attribute, $class, $type) = @_;
+sub _generate_accessor_any{
+    my($method_class, $type, $attribute, $class) = @_;
 
-    my $name          = $attribute->name;
+    my $c             = 'Mouse::Meta::Method::Constructor';
+
+    my $key           = $attribute->name;
     my $default       = $attribute->default;
     my $constraint    = $attribute->type_constraint;
     my $builder       = $attribute->builder;
@@ -20,22 +20,23 @@ sub _generate_accessor{
 
     my $compiled_type_constraint = defined($constraint) ? $constraint->_compiled_type_constraint : undef;
 
-    my $self  = '$_[0]';
-    my $slot  = $method_class->_inline_slot($self, $name);;
-
-    $type ||= 'accessor';
+    my $instance  = '$_[0]';
+    my $slot      = $c->_inline_get_slot($instance, $key);;
 
-    my $accessor = sprintf(qq{#line 1 "%s for %s (%s)"\n}, $type, $name, __FILE__)
-                 . "sub {\n";
+    my $accessor = sprintf(<<'END_SUB_START', $class->name, __LINE__, $type, $key, __FILE__);
+package %s;
+#line %d "%s-accessor for %s (%s)
+sub {
+END_SUB_START
 
-    if ($type eq 'accessor' || $type eq 'writer') {
-        if($type eq '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.'") }'.
+                'if(@_ < 2){ Carp::confess("Not enough arguments for the writer of '.$key.'") }'.
                 '{' . "\n";
         }
                 
@@ -51,26 +52,26 @@ sub _generate_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
         # this setter
         $accessor .= 'return ' if !$is_weak && !$trigger && !$should_deref;
 
-        $accessor .= "$slot = $value;\n";
+        $accessor .= $c->_inline_set_slot($instance, $key, $value) . ";\n";
 
         if ($is_weak) {
-            $accessor .= "Scalar::Util::weaken($slot) if ref $slot;\n";
+            $accessor .= $c->_inline_weaken_slot($instance, $key) ." if ref $slot;\n";
         }
 
         if ($trigger) {
-            $accessor .= '$trigger->('.$self.', '.$value.');' . "\n";
+            $accessor .= '$trigger->('.$instance.', '.$value.');' . "\n";
         }
 
         $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{
@@ -81,28 +82,31 @@ sub _generate_accessor{
         my $value;
 
         if (defined $builder){
-            $value = "$self->\$builder()";
+            $value = "$instance->\$builder()";
         }
         elsif (ref($default) eq 'CODE'){
-            $value = "$self->\$default()";
+            $value = "$instance->\$default()";
         }
         else{
             $value = '$default';
         }
 
-        $accessor .= "if(!exists $slot){\n";
+        $accessor .= sprintf "if(!%s){\n", $c->_inline_has_slot($instance, $key);
         if($should_coerce){
-            $accessor .= "$slot = \$constraint->coerce($value)";
+            $value = "\$constraint->coerce($value)";
         }
         elsif(defined $constraint){
             $accessor .= "my \$tmp = $value;\n";
 
             $accessor .= "\$compiled_type_constraint->(\$tmp)";
-            $accessor .= " || \$attribute->verify_type_constraint_error(\$name, \$tmp, \$constraint);\n";
-            $accessor .= "$slot = \$tmp;\n";
+            $accessor .= " || \$attribute->_throw_type_constraint_error(\$tmp, \$constraint);\n";
+            $value = '$tmp';
         }
-        else{
-            $accessor .= "$slot = $value;\n";
+
+        $accessor .= $c->_inline_set_slot($instance, $key, $value) .";\n";
+
+        if ($is_weak) {
+            $accessor .= $c->_inline_weaken_slot($instance, $key) . " if ref $slot;\n";
         }
         $accessor .= "}\n";
     }
@@ -121,7 +125,7 @@ sub _generate_accessor{
 
     $accessor .= "return $slot;\n}\n";
 
-    #print "# class ", $class->name, "\n", $accessor, "\n";
+    #print $accessor, "\n";
     my $code;
     my $e = do{
         local $@;
@@ -133,16 +137,20 @@ sub _generate_accessor{
     return $code;
 }
 
-sub _generate_reader{
+sub _generate_accessor{
     my $class = shift;
-    return $class->_generate_accessor(@_, 'reader');
+    return $class->_generate_accessor_any(rw => @_);
 }
 
-sub _generate_writer{
+sub _generate_reader {
     my $class = shift;
-    return $class->_generate_accessor(@_, 'writer');
+    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) = @_;
@@ -157,8 +165,7 @@ sub _generate_clearer {
     my (undef, $attribute, $class) = @_;
 
     my $slot = $attribute->name;
-
-   return sub{
+    return sub{
         delete $_[0]->{$slot};
     };
 }
@@ -172,7 +179,7 @@ Mouse::Meta::Method::Accessor - A Mouse method generator for accessors
 
 =head1 VERSION
 
-This document describes Mouse version 0.40_05
+This document describes Mouse version 0.50_04
 
 =head1 SEE ALSO