instance-protocol

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

diff --git a/lib/Class/MOP/Attribute.pm b/lib/Class/MOP/Attribute.pm
index 64542c2..0677448 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,16 +61,17 @@ sub clone {
 }
 
 sub initialize_instance_slot {
-    my ($self, $class, $instance, $params) = @_;
-    my $init_arg = $self->init_arg();
+    my ($self, $class, $meta_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)
-    $val = $self->default($instance) 
-        if !defined $val && $self->has_default; 
-    $instance->{$self->name} = $val;    
+    if (!defined $val && defined $self->{default}) {
+        $val = $self->default($meta_instance->get_instance); 
+    }            
+    $meta_instance->add_slot($self->name, $val);    
 }
 
 # NOTE:
@@ -127,28 +128,36 @@ sub detach_from_class {
 
 sub generate_accessor_method {
     my ($self, $attr_name) = @_;
+    my $meta_instance = $self->associated_class->instance_metaclass;
     sub {
-        $_[0]->{$attr_name} = $_[1] if scalar(@_) == 2;
-        $_[0]->{$attr_name};
+        $meta_instance->set_slot_value($_[0], $attr_name, $_[1]) if scalar(@_) == 2;
+        $meta_instance->get_slot_value($_[0], $attr_name);
     };
 }
 
 sub generate_reader_method {
     my ($self, $attr_name) = @_; 
+    my $meta_instance = $self->associated_class->instance_metaclass;
     sub { 
         confess "Cannot assign a value to a read-only accessor" if @_ > 1;
-        $_[0]->{$attr_name}; 
+        $meta_instance->get_slot_value($_[0], $attr_name); 
     };   
 }
 
 sub generate_writer_method {
     my ($self, $attr_name) = @_; 
-    sub { $_[0]->{$attr_name} = $_[1] };
+    my $meta_instance = $self->associated_class->instance_metaclass;    
+    sub { 
+        $meta_instance->set_slot_value($_[0], $attr_name, $_[1]);
+    };
 }
 
 sub generate_predicate_method {
     my ($self, $attr_name) = @_; 
-    sub { defined $_[0]->{$attr_name} ? 1 : 0 };
+    my $meta_instance = $self->associated_class->instance_metaclass;    
+    sub { 
+        $meta_instance->has_slot_value($_[0], $attr_name);
+    };
 }
 
 sub process_accessors {