X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FInstance.pm;h=2b28e58d22119a33930c324f696ebe5f58a8deff;hb=6db5c459d895adc8cea8f285f26aca1ea3c3cd14;hp=56d9a300fe3cca8ab125bd471be036e0c03ec96c;hpb=5fb4edd5750aadf2d20fdf45e95149272d48343a;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Instance.pm b/lib/Class/MOP/Instance.pm index 56d9a30..2b28e58 100644 --- a/lib/Class/MOP/Instance.pm +++ b/lib/Class/MOP/Instance.pm @@ -6,7 +6,7 @@ use warnings; use Scalar::Util 'weaken', 'blessed'; -our $VERSION = '0.88'; +our $VERSION = '0.90'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; @@ -45,8 +45,12 @@ sub new { } sub _new { - my ( $class, %options ) = @_; - bless { + my $class = shift; + return Class::MOP::Class->initialize($class)->new_object(@_) + if $class ne __PACKAGE__; + + my $params = @_ == 1 ? $_[0] : {@_}; + return bless { # NOTE: # I am not sure that it makes # sense to pass in the meta @@ -57,10 +61,10 @@ sub _new { # which is *probably* a safe # assumption,.. but you can # never tell <:) - 'associated_metaclass' => $options{associated_metaclass}, - 'attributes' => $options{attributes}, - 'slots' => $options{slots}, - 'slot_hash' => $options{slot_hash}, + 'associated_metaclass' => $params->{associated_metaclass}, + 'attributes' => $params->{attributes}, + 'slots' => $params->{slots}, + 'slot_hash' => $params->{slot_hash}, } => $class; }