X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FUtil.pm;h=fc2292a46e8bb59b455eabbcf9d724d1958f5c2e;hb=6336eb18ec59cf5c9c057624c7a1d15f449b00c6;hp=393bccf9940732a68df841d3c9234356f263be2b;hpb=823419c540f9e77090f31f11e04b14477c0372c4;p=gitmo%2FMouse.git diff --git a/lib/Mouse/Util.pm b/lib/Mouse/Util.pm index 393bccf..fc2292a 100644 --- a/lib/Mouse/Util.pm +++ b/lib/Mouse/Util.pm @@ -1,6 +1,8 @@ package Mouse::Util; use Mouse::Exporter; # enables strict and warnings +# Note that those which don't exist here are defined in XS or Mouse::PurePerl + # must be here because it will be refered by other modules loaded sub get_linear_isa($;$); ## no critic @@ -48,7 +50,7 @@ BEGIN{ }, ); - our $VERSION = '0.70'; + our $VERSION = '0.93'; my $xs = !(defined(&is_valid_class_name) || $ENV{MOUSE_PUREPERL} || $ENV{PERL_ONLY}); @@ -75,62 +77,13 @@ BEGIN{ } *MOUSE_XS = sub(){ $xs }; -} - -use Carp (); -use Scalar::Util (); - -# aliases as public APIs -# it must be 'require', not 'use', because Mouse::Meta::Module depends on Mouse::Util -require Mouse::Meta::Module; # for the entities of metaclass cache utilities - -# aliases -{ - *class_of = \&Mouse::Meta::Module::_class_of; - *get_metaclass_by_name = \&Mouse::Meta::Module::_get_metaclass_by_name; - *get_all_metaclass_instances = \&Mouse::Meta::Module::_get_all_metaclass_instances; - *get_all_metaclass_names = \&Mouse::Meta::Module::_get_all_metaclass_names; - - *Mouse::load_class = \&load_class; - *Mouse::is_class_loaded = \&is_class_loaded; - - # is-a predicates - #generate_isa_predicate_for('Mouse::Meta::TypeConstraint' => 'is_a_type_constraint'); - #generate_isa_predicate_for('Mouse::Meta::Class' => 'is_a_metaclass'); - #generate_isa_predicate_for('Mouse::Meta::Role' => 'is_a_metarole'); - - # duck type predicates - generate_can_predicate_for(['_compiled_type_constraint'] => 'is_a_type_constraint'); - generate_can_predicate_for(['create_anon_class'] => 'is_a_metaclass'); - generate_can_predicate_for(['create_anon_role'] => 'is_a_metarole'); -} - -our $in_global_destruction = 0; -END{ $in_global_destruction = 1 } - -# Moose::Util compatible utilities -sub find_meta{ - return class_of( $_[0] ); -} - -sub does_role{ - my ($class_or_obj, $role_name) = @_; - - my $meta = class_of($class_or_obj); - - (defined $role_name) - || ($meta || 'Mouse::Meta::Class')->throw_error("You must supply a role name to does()"); - - return defined($meta) && $meta->does_role($role_name); -} - -BEGIN { + # definition of mro::get_linear_isa() my $get_linear_isa; - if ($] >= 5.009_005) { - require mro; + if (eval { require mro }) { $get_linear_isa = \&mro::get_linear_isa; - } else { + } + else { # this code is based on MRO::Compat::__get_linear_isa my $_get_linear_isa_dfs; # this recurses so it isn't pretty $_get_linear_isa_dfs = sub { @@ -178,6 +131,53 @@ BEGIN { *get_linear_isa = $get_linear_isa; } +use Carp (); +use Scalar::Util (); + +# aliases as public APIs +# it must be 'require', not 'use', because Mouse::Meta::Module depends on Mouse::Util +require Mouse::Meta::Module; # for the entities of metaclass cache utilities + +# aliases +{ + *class_of = \&Mouse::Meta::Module::_class_of; + *get_metaclass_by_name = \&Mouse::Meta::Module::_get_metaclass_by_name; + *get_all_metaclass_instances = \&Mouse::Meta::Module::_get_all_metaclass_instances; + *get_all_metaclass_names = \&Mouse::Meta::Module::_get_all_metaclass_names; + + *Mouse::load_class = \&load_class; + *Mouse::is_class_loaded = \&is_class_loaded; + + # is-a predicates + #generate_isa_predicate_for('Mouse::Meta::TypeConstraint' => 'is_a_type_constraint'); + #generate_isa_predicate_for('Mouse::Meta::Class' => 'is_a_metaclass'); + #generate_isa_predicate_for('Mouse::Meta::Role' => 'is_a_metarole'); + + # duck type predicates + generate_can_predicate_for(['_compiled_type_constraint'] => 'is_a_type_constraint'); + generate_can_predicate_for(['create_anon_class'] => 'is_a_metaclass'); + generate_can_predicate_for(['create_anon_role'] => 'is_a_metarole'); +} + +our $in_global_destruction = 0; +END{ $in_global_destruction = 1 } + +# Moose::Util compatible utilities + +sub find_meta{ + return class_of( $_[0] ); +} + +sub does_role{ + my ($class_or_obj, $role_name) = @_; + + my $meta = class_of($class_or_obj); + + (defined $role_name) + || ($meta || 'Mouse::Meta::Class')->throw_error("You must supply a role name to does()"); + + return defined($meta) && $meta->does_role($role_name); +} # taken from Mouse::Util (0.90) { @@ -212,6 +212,7 @@ sub get_code_info; sub get_code_package; sub is_valid_class_name; +sub is_class_loaded; # taken from Class/MOP.pm sub load_first_existing_class { @@ -270,33 +271,40 @@ sub load_class { return $class; } -sub is_class_loaded; sub apply_all_roles { my $consumer = Scalar::Util::blessed($_[0]) - ? shift # instance - : Mouse::Meta::Class->initialize(shift); # class or role name + ? $_[0] # instance + : Mouse::Meta::Class->initialize($_[0]); # class or role name my @roles; # Basis of Data::OptList my $max = scalar(@_); - for (my $i = 0; $i < $max ; $i++) { - if ($i + 1 < $max && ref($_[$i + 1])) { - push @roles, [ $_[$i] => $_[++$i] ]; - } else { - push @roles, [ $_[$i] => undef ]; + for (my $i = 1; $i < $max ; $i++) { + my $role = $_[$i]; + my $role_name; + if(ref $role) { + $role_name = $role->name; + } + else { + $role_name = $role; + load_class($role_name); + $role = get_metaclass_by_name($role_name); } - my $role_name = $roles[-1][0]; - load_class($role_name); - is_a_metarole( get_metaclass_by_name($role_name) ) + if ($i + 1 < $max && ref($_[$i + 1]) eq 'HASH') { + push @roles, [ $role => $_[++$i] ]; + } else { + push @roles, [ $role => undef ]; + } + is_a_metarole($role) || $consumer->meta->throw_error("You can only consume roles, $role_name is not a Mouse role"); } if ( scalar @roles == 1 ) { - my ( $role_name, $params ) = @{ $roles[0] }; - get_metaclass_by_name($role_name)->apply( $consumer, defined $params ? $params : () ); + my ( $role, $params ) = @{ $roles[0] }; + $role->apply( $consumer, defined $params ? $params : () ); } else { Mouse::Meta::Role->combine(@roles)->apply($consumer); @@ -326,7 +334,7 @@ sub quoted_english_list { sub not_supported{ my($feature) = @_; - $feature ||= ( caller(1) )[3]; # subroutine name + $feature ||= ( caller(1) )[3] . '()'; # subroutine name local $Carp::CarpLevel = $Carp::CarpLevel + 1; Carp::confess("Mouse does not currently support $feature"); @@ -380,7 +388,7 @@ Mouse::Util - Utilities for working with Mouse classes =head1 VERSION -This document describes Mouse version 0.70 +This document describes Mouse version 0.93 =head1 SYNOPSIS @@ -434,7 +442,7 @@ C or using C. =head3 C<< Mouse::Util::get_all_metaclass_names() -> (ClassNames) >> -=head2 MRO::Compat +=head2 mro (or MRO::Compat) =head3 C @@ -458,6 +466,8 @@ L L +L + L =cut