X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FUtil.pm;h=f6be4ea44e17f027d55bdcc0e9405ce872e62e2c;hp=cac02a1746781f75b85aa97f9aaabc87969a547b;hb=01f892fafd4633960960c120650e32ecf549e369;hpb=f7e41edaceee0d549a2d664378cfcf85dcf9454b diff --git a/lib/Mouse/Util.pm b/lib/Mouse/Util.pm index cac02a1..f6be4ea 100644 --- a/lib/Mouse/Util.pm +++ b/lib/Mouse/Util.pm @@ -38,13 +38,11 @@ BEGIN{ # Because Mouse::Util is loaded first in all the Mouse sub-modules, # XS loader is placed here, not in Mouse.pm. - our $VERSION = '0.40_08'; + our $VERSION = '0.50_03'; my $xs = !(exists $INC{'Mouse/PurePerl.pm'} || $ENV{MOUSE_PUREPERL}); if($xs){ - local $@; - # XXX: XSLoader tries to get the object path from caller's file name # $hack_mouse_file fools its mechanism @@ -52,10 +50,11 @@ BEGIN{ $xs = eval sprintf("#line %d %s\n", __LINE__, $hack_mouse_file) . q{ require XSLoader; XSLoader::load('Mouse', $VERSION); - - *Mouse::Meta::Method::Constructor::XS::meta = \&meta; - *Mouse::Meta::Method::Destructor::XS::meta = \&meta; - }; + Mouse::Util->import({ into => 'Mouse::Meta::Method::Constructor::XS' }, ':meta'); + Mouse::Util->import({ into => 'Mouse::Meta::Method::Destructor::XS' }, ':meta'); + Mouse::Util->import({ into => 'Mouse::Meta::Method::Accessor::XS' }, ':meta'); + return 1; + } || 0; #warn $@ if $@; } @@ -66,7 +65,6 @@ BEGIN{ *MOUSE_XS = sub(){ $xs }; } - use Carp (); use Scalar::Util (); @@ -76,18 +74,29 @@ use constant _MOUSE_VERBOSE => !!$ENV{MOUSE_VERBOSE}; # 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 -BEGIN { +# 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'); + #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 @@ -112,36 +121,44 @@ BEGIN { require mro; $get_linear_isa = \&mro::get_linear_isa; } else { - my $e = do { - local $@; - eval { require MRO::Compat }; - $@; - }; - if (!$e) { - $get_linear_isa = \&mro::get_linear_isa; - } else { # VVVVV CODE TAKEN FROM MRO::COMPAT VVVVV - my $_get_linear_isa_dfs; # this recurses so it isn't pretty - $_get_linear_isa_dfs = sub ($;$){ - no strict 'refs'; - - my $classname = shift; - - my @lin = ($classname); - my %stored; - foreach my $parent (@{"$classname\::ISA"}) { - my $plin = $_get_linear_isa_dfs->($parent); - foreach my $p(@$plin) { - next if exists $stored{$p}; - push(@lin, $p); - $stored{$p} = 1; - } + my $_get_linear_isa_dfs; # this recurses so it isn't pretty + $_get_linear_isa_dfs = sub { + my($classname) = @_; + + my @lin = ($classname); + my %stored; + + no strict 'refs'; + foreach my $parent (@{"$classname\::ISA"}) { + my $plin = $_get_linear_isa_dfs->($parent); + foreach my $p(@$plin) { + next if exists $stored{$p}; + push(@lin, $p); + $stored{$p} = 1; } - return \@lin; - }; + } + return \@lin; + }; # ^^^^^ CODE TAKEN FROM MRO::COMPAT ^^^^^ - $get_linear_isa = $_get_linear_isa_dfs; - } + + eval{ require Class::C3 }; + + # MRO::Compat::__get_linear_isa has no prototype, so + # we define a prototyped version for compatibility with core's + # See also MRO::Compat::__get_linear_isa. + $get_linear_isa = sub ($;$){ + my($classname, $type) = @_; + package # hide from PAUSE + Class::C3; + if(!defined $type){ + our %MRO; + $type = exists $MRO{$classname} ? 'c3' : 'dfs'; + } + return $type eq 'c3' + ? [calculateMRO($classname)] + : $_get_linear_isa_dfs->($classname); + }; } *get_linear_isa = $get_linear_isa; @@ -231,12 +248,12 @@ sub _try_load_one_class { return undef if $is_class_loaded_cache{$class} ||= is_class_loaded($class); - my $file = $class . '.pm'; - $file =~ s{::}{/}g; + $class =~ s{::}{/}g; + $class .= '.pm'; return do { local $@; - eval { require($file) }; + eval { require $class }; $@; }; } @@ -247,14 +264,13 @@ sub load_class { my $e = _try_load_one_class($class); Carp::confess "Could not load class ($class) because : $e" if $e; - return 1; + return $class; } sub is_class_loaded; - sub apply_all_roles { - my $applicant = Scalar::Util::blessed($_[0]) + my $consumer = Scalar::Util::blessed($_[0]) ? shift # instance : Mouse::Meta::Class->initialize(shift); # class or role name @@ -272,15 +288,15 @@ sub apply_all_roles { load_class($role_name); is_a_metarole( get_metaclass_by_name($role_name) ) - || $applicant->meta->throw_error("You can only consume roles, $role_name(".$role_name->meta.") is not a Mouse 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( $applicant, defined $params ? $params : () ); + get_metaclass_by_name($role_name)->apply( $consumer, defined $params ? $params : () ); } else { - Mouse::Meta::Role->combine(@roles)->apply($applicant); + Mouse::Meta::Role->combine(@roles)->apply($consumer); } return; } @@ -298,6 +314,9 @@ sub english_list { return join q{, }, @items, "and $tail"; } +sub quoted_english_list { + return english_list(map { qq{'$_'} } @_); +} # common utilities @@ -321,17 +340,17 @@ sub dump :method { require 'Data/Dumper.pm'; # we don't want to create its namespace my $dd = Data::Dumper->new([$self]); - $dd->Maxdepth(defined($maxdepth) ? $maxdepth : 2); + $dd->Maxdepth(defined($maxdepth) ? $maxdepth : 3); $dd->Indent(1); return $dd->Dump(); } # general does() method -sub does :method; -*does = \&does_role; # alias +sub does :method { + goto &does_role; +} 1; - __END__ =head1 NAME @@ -340,7 +359,7 @@ Mouse::Util - Features, with or without their dependencies =head1 VERSION -This document describes Mouse version 0.40_08 +This document describes Mouse version 0.50_03 =head1 IMPLEMENTATIONS FOR @@ -386,10 +405,14 @@ C or using C. =head3 C -=head1 UTILITIES FOR MOUSE +=head1 Mouse specific utilities =head3 C +=head3 C + +=head3 C + =head1 SEE ALSO L