From: Fuji, Goro Date: Wed, 29 Sep 2010 02:05:08 +0000 (+0900) Subject: Fix superclass validation X-Git-Tag: 0.77~13 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7778ab1ec4652cd0c12f7004ad300cf714a334f0;p=gitmo%2FMouse.git Fix superclass validation --- diff --git a/lib/Mouse/Meta/Class.pm b/lib/Mouse/Meta/Class.pm index ee47b2b..be95702 100644 --- a/lib/Mouse/Meta/Class.pm +++ b/lib/Mouse/Meta/Class.pm @@ -56,33 +56,43 @@ sub superclasses { if (@_) { foreach my $super(@_){ Mouse::Util::load_class($super); - my $meta = Mouse::Util::get_metaclass_by_name($super); - unless(defined $meta) { - # checks if $super is a foreign class (i.e. non-Mouse class) - my $mm = $super->can('meta'); - if(!($mm && $mm == \&Mouse::Util::meta)) { - if($super->can('new') or $super->can('DESTROY')) { - $self->inherit_from_foreign_class($super); - } - } - next; - } - - if(Mouse::Util::is_a_metarole($meta)){ - $self->throw_error("You cannot inherit from a Mouse Role ($super)"); - } - - # checks and fixes in metaclass compatiility - next if $self->isa(ref $meta); # _superclass_meta_is_compatible + next if $self->verify_superclass($super, $meta); $self->_reconcile_with_superclass_meta($meta); } - @{ $self->{superclasses} } = @_; + return @{ $self->{superclasses} } = @_; } return @{ $self->{superclasses} }; } +sub verify_superclass { + my($self, $super, $super_meta) = @_; + + if(defined $super_meta) { + if(Mouse::Util::is_a_metarole($super_meta)){ + $self->throw_error("You cannot inherit from a Mouse Role ($super)"); + } + } + else { + # The metaclass of $super is not initialized. + # i.e. it might be Mouse::Object, a mixin package (e.g. Exporter), + # or a foreign class including Moose classes. + + # checks if $super is a foreign class (i.e. non-Mouse class) + # see also Mouse::Foreign::Meta::Role::Class + my $mm = $super->can('meta'); + if(!($mm && $mm == \&Mouse::Util::meta)) { + if($super->can('new') or $super->can('DESTROY')) { + $self->inherit_from_foreign_class($super); + } + } + return 1; # always ok + } + + return $self->isa(ref $super_meta); # checks metaclass compatibility +} + sub inherit_from_foreign_class { my($class, $super) = @_; Carp::carp("You inherit from non-Mouse class ($super),"