The great Class::MOP::Instance refactoring

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

diff --git a/lib/Class/MOP/Attribute.pm b/lib/Class/MOP/Attribute.pm
index 1dfc3b3..5e2563c 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.04';
+our $VERSION = '0.08';
 
 sub meta { 
     require Class::MOP::Class;
@@ -60,6 +60,22 @@ sub clone {
     return bless { %{$self}, %options } => blessed($self);
 }
 
+sub initialize_instance_slot {
+    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 && 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:
 # the next bunch of methods will get bootstrapped 
 # away in the Class::MOP bootstrapping section
@@ -110,40 +126,73 @@ 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) = @_;
-    eval qq{sub {
-        \$_[0]->{'$attr_name'} = \$_[1] if scalar(\@_) == 2;
-        \$_[0]->{'$attr_name'};
-    }};
+    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]) if scalar(@_) == 2;
+        $meta_instance->get_slot_value($_[0], $slot_name);
+    };
 }
 
 sub generate_reader_method {
     my ($self, $attr_name) = @_; 
-    eval qq{sub {
-        \$_[0]->{'$attr_name'};
-    }};   
+    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;
+        $meta_instance->get_slot_value($_[0], $slot_name); 
+    };   
 }
 
 sub generate_writer_method {
     my ($self, $attr_name) = @_; 
-    eval qq{sub {
-        \$_[0]->{'$attr_name'} = \$_[1];
-    }};
+    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) = @_; 
-    eval qq{sub {
-        defined \$_[0]->{'$attr_name'} ? 1 : 0;
-    }};
+    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 {
     my ($self, $type, $accessor) = @_;
-    if (reftype($accessor) && reftype($accessor) eq 'HASH') {
+    if (reftype($accessor)) {
+        (reftype($accessor) eq 'HASH')
+            || confess "bad accessor/reader/writer/predicate format, must be a HASH ref";
         my ($name, $method) = each %{$accessor};
         return ($name, Class::MOP::Attribute::Accessor->wrap($method));        
     }
@@ -264,8 +313,6 @@ An attribute must (at the very least), have a C<$name>. All other
 C<%options> are contained added as key-value pairs. Acceptable keys
 are as follows:
 
-=item B<clone (%options)>
-
 =over 4
 
 =item I<init_arg>
@@ -376,6 +423,10 @@ defined, and false (C<0>) otherwise.
 
 =back
 
+=item B<clone (%options)>
+
+=item B<initialize_instance_slot ($instance, $params)>
+
 =back 
 
 =head2 Informational
@@ -435,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