X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod%2FAccessor.pm;h=5cd69b6c78c30c360b213314765bef929202b2b4;hb=e45f0a07c741bb8b8eedbbab139d245fc4cf7c4a;hp=dfef5f7f45488f9c807c59dbde33b639c95bc706;hpb=6e1c8b63d87c6e1d8e84e15cc2c1f5336780515b;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Method/Accessor.pm b/lib/Class/MOP/Method/Accessor.pm index dfef5f7..5cd69b6 100644 --- a/lib/Class/MOP/Method/Accessor.pm +++ b/lib/Class/MOP/Method/Accessor.pm @@ -7,7 +7,8 @@ use warnings; use Carp 'confess'; use Scalar::Util 'blessed', 'weaken'; -our $VERSION = '0.63'; +our $VERSION = '0.68'; +$VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use base 'Class::MOP::Method::Generated'; @@ -28,31 +29,31 @@ sub new { ($options{package_name} && $options{name}) || confess "You must supply the package_name and name parameters $Class::MOP::Method::UPGRADE_ERROR_TEXT"; - my $self = bless { - # from our superclass - '&!body' => undef, - '$!package_name' => $options{package_name}, - '$!name' => $options{name}, - # specific to this subclass - '$!attribute' => $options{attribute}, - '$!is_inline' => ($options{is_inline} || 0), - '$!accessor_type' => $options{accessor_type}, - } => $class; + my $self = $class->_new(\%options); # we don't want this creating # a cycle in the code, if not # needed - weaken($self->{'$!attribute'}); + weaken($self->{'attribute'}); $self->initialize_body; return $self; } +sub _new { + my $class = shift; + my $options = @_ == 1 ? $_[0] : {@_}; + + $options->{is_inline} ||= 0; + + return bless $options, $class; +} + ## accessors -sub associated_attribute { (shift)->{'$!attribute'} } -sub accessor_type { (shift)->{'$!accessor_type'} } +sub associated_attribute { (shift)->{'attribute'} } +sub accessor_type { (shift)->{'accessor_type'} } ## factory @@ -66,7 +67,7 @@ sub initialize_body { ($self->is_inline ? 'inline' : ()) ); - eval { $self->{'&!body'} = $self->$method_name() }; + eval { $self->{'body'} = $self->$method_name() }; die $@ if $@; }