remove $attr_name from the accessor generators

[gitmo/Class-MOP.git] / lib / Class / MOP / Attribute.pm

diff --git a/lib/Class/MOP/Attribute.pm b/lib/Class/MOP/Attribute.pm
index fad8bda..2eeee2d 100644 (file)
--- a/lib/Class/MOP/Attribute.pm
+++ b/lib/Class/MOP/Attribute.pm
@@ -7,7 +7,7 @@ use warnings;
 use Carp         'confess';
 use Scalar::Util 'blessed', 'reftype', 'weaken';
 
-our $VERSION = '0.06';
+our $VERSION = '0.08';
 
 sub meta { 
     require Class::MOP::Class;
@@ -61,21 +61,19 @@ sub clone {
 }
 
 sub initialize_instance_slot {
-    my ($self, $class, $instance, $params) = @_;
-    # OPTIMIZATION NOTE:
-    # We break the attribute encapsulation here 
-    # in order to save a number of method calls
-    # to $self and speed things up a bit
+    my ($self, $instance, $params) = @_;
     my $init_arg = $self->{init_arg};
     # try to fetch the init arg from the %params ...
     my $val;        
     $val = $params->{$init_arg} if exists $params->{$init_arg};
     # if nothing was in the %params, we can use the 
     # attribute's default value (if it has one)
-    if (!defined $val && $self->{default}) {
-        $val = $self->default($instance); 
-    }            
-    $instance->{$self->{name}} = $val;    
+    if (!defined $val && defined $self->{default}) {
+        $val = $self->default($instance);
+    }
+
+    my $meta_instance = $self->associated_class->get_meta_instance;
+    $meta_instance->set_slot_value_with_init( $instance, $self->slot_name, $val );
 }
 
 # NOTE:
@@ -128,32 +126,66 @@ sub detach_from_class {
     $self->{associated_class} = undef;        
 }
 
+# slot management
+
+sub slot_name { # when attr <-> slot mapping is 1:1
+    my $self = shift;
+    $self->name;
+}
+
+# slot alocation
+
+sub allocate_slots {
+    my $self = shift;
+    my $meta_instance = $self->associated_class->get_meta_instance;
+    $meta_instance->add_slot( $self->slot_name ); 
+}
+
+sub deallocate_slots {
+    my $self = shift;
+    my $meta_instance = $self->associated_class->get_meta_instance;
+    $meta_instance->remove_slot( $self->slot_name );
+}
+
 ## Method generation helpers
 
 sub generate_accessor_method {
-    my ($self, $attr_name) = @_;
+    my $self = shift;
+    my $meta_instance = $self->associated_class->get_meta_instance;    
+    my $slot_name = $self->slot_name;
+
     sub {
-        $_[0]->{$attr_name} = $_[1] if scalar(@_) == 2;
-        $_[0]->{$attr_name};
+        $meta_instance->set_slot_value($_[0], $slot_name, $_[1]) if scalar(@_) == 2;
+        $meta_instance->get_slot_value($_[0], $slot_name);
     };
 }
 
 sub generate_reader_method {
-    my ($self, $attr_name) = @_; 
+    my $self = shift;
+    my $meta_instance = $self->associated_class->get_meta_instance;
+    my $slot_name = $self->slot_name;
     sub { 
         confess "Cannot assign a value to a read-only accessor" if @_ > 1;
-        $_[0]->{$attr_name}; 
+        $meta_instance->get_slot_value($_[0], $slot_name); 
     };   
 }
 
 sub generate_writer_method {
-    my ($self, $attr_name) = @_; 
-    sub { $_[0]->{$attr_name} = $_[1] };
+    my $self = shift;
+    my $meta_instance = $self->associated_class->get_meta_instance;
+    my $slot_name = $self->slot_name;
+    sub { 
+        $meta_instance->set_slot_value($_[0], $slot_name, $_[1]);
+    };
 }
 
 sub generate_predicate_method {
-    my ($self, $attr_name) = @_; 
-    sub { defined $_[0]->{$attr_name} ? 1 : 0 };
+    my $self = shift;
+    my $meta_instance = $self->associated_class->get_meta_instance;
+    my $slot_name = $self->slot_name;
+    sub { 
+        defined $meta_instance->get_slot_value($_[0], $slot_name);
+    };
 }
 
 sub process_accessors {
@@ -454,6 +486,12 @@ These are all basic predicate methods for the values passed into C<new>.
 
 =item B<detach_from_class>
 
+=item B<slot_name>
+
+=item B<allocate_slots>
+
+=item B<deallocate_slots>
+
 =back
 
 =head2 Attribute Accessor generation
@@ -479,13 +517,13 @@ use the custom method passed through the constructor.
 
 =over 4
 
-=item B<generate_accessor_method ($attr_name)>
+=item B<generate_accessor_method>
 
-=item B<generate_predicate_method ($attr_name)>
+=item B<generate_predicate_method>
 
-=item B<generate_reader_method ($attr_name)>
+=item B<generate_reader_method>
 
-=item B<generate_writer_method ($attr_name)>
+=item B<generate_writer_method>
 
 =back