X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FClassData.pm;h=72062d912056284deee4385926d55395c2ef5990;hb=84c28acbcf93fc27a01b9bba70fd2ffdfefe91e1;hp=6b14d7ef9988bfe0436a883cf19e6ff7b830fb26;hpb=df3ea11bb1ad740663f2a4c909fba71612aa6a48;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/ClassData.pm b/lib/Catalyst/ClassData.pm index 6b14d7e..72062d9 100644 --- a/lib/Catalyst/ClassData.pm +++ b/lib/Catalyst/ClassData.pm @@ -3,7 +3,6 @@ package Catalyst::ClassData; use Moose::Role; use Class::MOP; use Class::MOP::Object; -use Scalar::Util 'blessed'; sub mk_classdata { my ($class, $attribute) = @_; @@ -13,8 +12,9 @@ sub mk_classdata { my $slot = '$'.$attribute; my $accessor = sub { my $pkg = ref $_[0] || $_[0]; + # Hack - delberately create a metaclass instance my $meta = $pkg->Class::MOP::Object::meta(); - if (@_ > 1){ + if (@_ > 1) { $meta->namespace->{$attribute} = \$_[1]; return $_[1]; } @@ -29,14 +29,6 @@ sub mk_classdata { return ${$v}; } else { foreach my $super ( $meta->linearized_isa ) { - # If there is a code symbol for this attr in a parent class, - # then copy it into our package. Is this the correct - # fix for C::D::I back-compat? (t0m) - my $parent_symbol = *{"${super}::${attribute}"}{CODE} ? \&{"${super}::${attribute}"} : undef; - # FIXME - this is over-enthusiastic? - if (defined $parent_symbol) { - *{"${pkg}::${attribute}"} = $parent_symbol; - } # tighter version of same after # my $super_meta = Moose::Meta::Class->initialize($super); my $v = ${"${super}::"}{$attribute} ? *{"${super}::${attribute}"}{SCALAR} : undef; @@ -74,7 +66,7 @@ __END__ =head1 NAME -Catalyst::ClassData - Class data acessors +Catalyst::ClassData - Class data accessors =head1 METHODS