stuff

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

diff --git a/lib/Class/MOP/Attribute.pm b/lib/Class/MOP/Attribute.pm
index b85a8a2..c05aa2d 100644 (file)
--- a/lib/Class/MOP/Attribute.pm
+++ b/lib/Class/MOP/Attribute.pm
@@ -134,44 +134,81 @@ sub detach_from_class {
 
 sub generate_accessor_method {
     my $self = shift;
-    my $meta_class = $self->associated_class;    
+    #my $meta_class = $self->associated_class;  
+    my $meta_instance = $self->associated_class->get_meta_instance;  
     my $attr_name  = $self->name;
-    return sub {
-        my $meta_instance = $meta_class->get_meta_instance;
-        $meta_instance->set_slot_value($_[0], $attr_name, $_[1]) if scalar(@_) == 2;
-        $meta_instance->get_slot_value($_[0], $attr_name);
-    };
+    #return sub {
+    #    my $meta_instance = $meta_class->get_meta_instance;
+    #    $meta_instance->set_slot_value($_[0], $attr_name, $_[1]) if scalar(@_) == 2;
+    #    $meta_instance->get_slot_value($_[0], $attr_name);
+    #};
+    
+    my $code = "sub {\n"
+    . $meta_instance->inline_set_slot_value('$_[0]', "'$attr_name'", '$_[1]') 
+    . " if scalar(\@_) == 2;\n"
+    . $meta_instance->inline_get_slot_value('$_[0]', "'$attr_name'", '$_[1]') 
+    . "\n}";
+    my $sub = eval $code;
+    confess "Could not eval code:\n$code\nbecause: $@" if $@;
+    return $sub;
 }
 
 sub generate_reader_method {
     my $self = shift;
-    my $meta_class = $self->associated_class;    
+    #my $meta_class = $self->associated_class;    
+    my $meta_instance = $self->associated_class->get_meta_instance;
     my $attr_name  = $self->name;
-    return sub { 
-        confess "Cannot assign a value to a read-only accessor" if @_ > 1;
-        $meta_class->get_meta_instance
-                   ->get_slot_value($_[0], $attr_name); 
-    };   
+    #return sub { 
+    #    confess "Cannot assign a value to a read-only accessor" if @_ > 1;
+    #    $meta_class->get_meta_instance
+    #               ->get_slot_value($_[0], $attr_name); 
+    #}; 
+    
+    my $code = "sub {\n"
+    . 'confess "Cannot assign a value to a read-only accessor" if @_ > 1;' . "\n"
+    . $meta_instance->inline_get_slot_value('$_[0]', "'$attr_name'", '$_[1]') 
+    . "\n}";
+    my $sub = eval $code;
+    confess "Could not eval code:\n$code\nbecause: $@" if $@;
+    return $sub;      
 }
 
 sub generate_writer_method {
     my $self = shift;
-    my $meta_class = $self->associated_class;    
+    #my $meta_class = $self->associated_class;    
+    my $meta_instance = $self->associated_class->get_meta_instance;
     my $attr_name  = $self->name;
-    return sub { 
-        $meta_class->get_meta_instance
-                   ->set_slot_value($_[0], $attr_name, $_[1]);
-    };
+    #return sub { 
+    #    $meta_class->get_meta_instance
+    #               ->set_slot_value($_[0], $attr_name, $_[1]);
+    #};
+    
+    my $code = "sub {\n"
+    . $meta_instance->inline_set_slot_value('$_[0]', "'$attr_name'", '$_[1]') 
+    . "\n}";
+    my $sub = eval $code;
+    confess "Could not eval code:\n$code\nbecause: $@" if $@;
+    return $sub;    
 }
 
 sub generate_predicate_method {
     my $self = shift;
-    my $meta_class = $self->associated_class;    
+    #my $meta_class = $self->associated_class;   
+    my $meta_instance = $self->associated_class->get_meta_instance; 
     my $attr_name  = $self->name;
-    return sub { 
-        defined $meta_class->get_meta_instance
-                           ->get_slot_value($_[0], $attr_name) ? 1 : 0;
-    };
+    #return sub { 
+    #    defined $meta_class->get_meta_instance
+    #                       ->get_slot_value($_[0], $attr_name) ? 1 : 0;
+    #};
+    
+    my $code = "sub {\n"
+    . 'defined '
+    . $meta_instance->inline_get_slot_value('$_[0]', "'$attr_name'", '$_[1]') 
+    . ' ? 1 : 0;'
+    . "\n}";
+    my $sub = eval $code;
+    confess "Could not eval code:\n$code\nbecause: $@" if $@;
+    return $sub;    
 }
 
 sub process_accessors {