From: Stevan Little <stevan.little@iinteractive.com>
Date: Tue, 2 May 2006 14:46:06 +0000 (+0000)
Subject: moooo
X-Git-Tag: 0_09_03~48
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ac1ef2f95ce114cbcd37422afcd3cf2a99b2b99c;p=gitmo%2FMoose.git

moooo
---

diff --git a/lib/Moose/Meta/Attribute.pm b/lib/Moose/Meta/Attribute.pm
index 9be7804..d5e3b8f 100644
--- a/lib/Moose/Meta/Attribute.pm
+++ b/lib/Moose/Meta/Attribute.pm
@@ -194,12 +194,13 @@ sub initialize_instance_slot {
         }
 	}
 
-    $meta_instance->set_slot_value( $instance, $self->name, $val );
-    $meta_instance->weaken_slot_value( $instance, $self->name ) if ( ref $val && $self->is_weak_ref );
+    $meta_instance->set_slot_value($instance, $self->name, $val);
+    $meta_instance->weaken_slot_value($instance, $self->name) 
+        if ref $val && $self->is_weak_ref;
 }
 
 sub _inline_check_constraint {
-	my ( $self, $value ) = @_;
+	my ($self, $value) = @_;
 	return '' unless $self->has_type_constraint;
 	
 	# FIXME - remove 'unless defined($value) - constraint Undef
@@ -212,36 +213,37 @@ EOF
 }
 
 sub _inline_store {
-	my ( $self, $instance, $value ) = @_;
+	my ($self, $instance, $value) = @_;
 
 	my $mi = $self->associated_class->get_meta_instance;
-	my $slot_name = sprintf "'%s'", $self->name;
+	my $slot_name = sprintf "'%s'", $self->slots;
 
-	return ( $self->is_weak_ref
-		? $mi->inline_set_slot_value_weak( $instance, $slot_name, $value )
-		: $mi->inline_set_slot_value( $instance, $slot_name, $value ) ) . ";";
+    my $code = $mi->inline_set_slot_value($instance, $slot_name, $value)    . ";";
+	$code   .= $mi->inline_weaken_slot_value($instance, $slot_name, $value) . ";"
+	    if $self->is_weak_ref;
+    return $code;
 }
 
 sub _inline_trigger {
-	my ( $self, $instance, $value ) = @_;
+	my ($self, $instance, $value) = @_;
 	return '' unless $self->has_trigger;
 	return sprintf('$attr->trigger->(%s, %s, $attr);', $instance, $value);
 }
 
 sub _inline_get {
-	my ( $self, $instance ) = @_;
+	my ($self, $instance) = @_;
 
 	my $mi = $self->associated_class->get_meta_instance;
-	my $slot_name = sprintf "'%s'", $self->name;
+	my $slot_name = sprintf "'%s'", $self->slots;
 
-    return $mi->inline_get_slot_value( $instance, $slot_name );
+    return $mi->inline_get_slot_value($instance, $slot_name);
 }
 
 sub generate_accessor_method {
     my ($attr, $attr_name) = @_;
     my $value_name = $attr->should_coerce ? '$val' : '$_[1]';
 	my $mi = $attr->associated_class->get_meta_instance;
-	my $slot_name = sprintf "'%s'", $attr->name;
+	my $slot_name = sprintf "'%s'", $attr->slots;
 	my $inv = '$_[0]';
     my $code = 'sub { '
     . 'if (scalar(@_) == 2) {'
@@ -251,9 +253,9 @@ sub generate_accessor_method {
         . ($attr->should_coerce ? 
             'my $val = $attr->type_constraint->coercion->coerce($_[1]);'
             : '')
-        . $attr->_inline_check_constraint( $value_name )
-		. $attr->_inline_store( $inv, $value_name )
-		. $attr->_inline_trigger( $inv, $value_name )
+        . $attr->_inline_check_constraint($value_name)
+		. $attr->_inline_store($inv, $value_name)
+		. $attr->_inline_trigger($inv, $value_name)
     . ' }'
     . ($attr->is_lazy ? 
             '$_[0]->{$attr_name} = ($attr->has_default ? $attr->default($_[0]) : undef)'
@@ -278,9 +280,9 @@ sub generate_writer_method {
     . ($attr->should_coerce ? 
         'my $val = $attr->type_constraint->coercion->coerce($_[1]);'
         : '')
-	. $attr->_inline_check_constraint( $value_name )
-	. $attr->_inline_store( $inv, $value_name )
-	. $attr->_inline_trigger( $inv, $value_name )
+	. $attr->_inline_check_constraint($value_name)
+	. $attr->_inline_store($inv, $value_name)
+	. $attr->_inline_trigger($inv, $value_name)
     . ' }';
     my $sub = eval $code;
     confess "Could not create writer for '$attr_name' because $@ \n code: $code" if $@;
@@ -289,7 +291,7 @@ sub generate_writer_method {
 
 sub generate_reader_method {
     my $self = shift;
-    my $attr_name = $self->name;
+    my $attr_name = $self->slots;
     my $code = 'sub {'
     . 'confess "Cannot assign a value to a read-only accessor" if @_ > 1;'
     . ($self->is_lazy ? 
diff --git a/lib/Moose/Meta/Class.pm b/lib/Moose/Meta/Class.pm
index 70ea64a..f191906 100644
--- a/lib/Moose/Meta/Class.pm
+++ b/lib/Moose/Meta/Class.pm
@@ -344,6 +344,8 @@ suport for delegation.
 
 =item get_delegatable_methods
 
+=item filter_delegations
+
 =back
 
 =head1 BUGS
diff --git a/lib/Moose/Meta/Instance.pm b/lib/Moose/Meta/Instance.pm
index 393be6d..1946275 100644
--- a/lib/Moose/Meta/Instance.pm
+++ b/lib/Moose/Meta/Instance.pm
@@ -4,10 +4,41 @@ package Moose::Meta::Instance;
 use strict;
 use warnings;
 
-
-our $VERSION = '0.05';
+our $VERSION = '0.01';
 
 use base "Class::MOP::Instance";
-use base "Class::MOP::Instance::Inlinable";
 
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+Moose::Meta::Instance - The Moose Instance metaclass
+
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+=head1 BUGS
+
+All complex software has bugs lurking in it, and this module is no 
+exception. If you find a bug please either email me, or add the bug
+to cpan-RT.
+
+=head1 AUTHOR
+
+Stevan Little E<lt>stevan@iinteractive.comE<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright 2006 by Infinity Interactive, Inc.
+
+L<http://www.iinteractive.com>
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself. 
 
+=cut