X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FUtil%2FTypeConstraints%2FOptimizedConstraints.pm;h=6168558f50daeee637fc31e10ecd5a03b6237a51;hb=9e4ed568f2e5c1041e6fea8d0cbde420562ab5df;hp=bd8c927d2ddb05e0681aea329fabe3fb917678de;hpb=93cc8330c689c1eb92171550e5fabb628a8759a6;p=gitmo%2FMoose.git diff --git a/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm b/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm index bd8c927..6168558 100644 --- a/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm +++ b/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm @@ -3,9 +3,11 @@ package Moose::Util::TypeConstraints::OptimizedConstraints; use strict; use warnings; +use Class::MOP; use Scalar::Util 'blessed', 'looks_like_number'; -our $VERSION = '0.54'; +our $VERSION = '0.84'; +$VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; sub Value { defined($_[0]) && !ref($_[0]) } @@ -29,34 +31,15 @@ sub FileHandle { ref($_[0]) eq 'GLOB' && Scalar::Util::openhandle($_[0]) or bles sub Object { blessed($_[0]) && blessed($_[0]) ne 'Regexp' } -sub Role { blessed($_[0]) && $_[0]->can('does') } +sub Role { Carp::cluck('The Role type is deprecated.'); blessed($_[0]) && $_[0]->can('does') } sub ClassName { - return 0 if ref($_[0]) || !defined($_[0]) || !length($_[0]); - - # walk the symbol table tree to avoid autovififying - # \*{${main::}{"Foo::"}} == \*main::Foo:: - - my $pack = \*::; - foreach my $part (split('::', $_[0])) { - return 0 unless exists ${$$pack}{"${part}::"}; - $pack = \*{${$$pack}{"${part}::"}}; - } - - # check for $VERSION or @ISA - return 1 if exists ${$$pack}{VERSION} - && defined *{${$$pack}{VERSION}}{SCALAR}; - return 1 if exists ${$$pack}{ISA} - && defined *{${$$pack}{ISA}}{ARRAY}; - - # check for any method - foreach ( keys %{$$pack} ) { - next if substr($_, -2, 2) eq '::'; - return 1 if defined *{${$$pack}{$_}}{CODE}; - } - - # fail - return 0; + return Class::MOP::is_class_loaded( $_[0] ); +} + +sub RoleName { + ClassName($_[0]) + && (Class::MOP::class_of($_[0]) || return)->isa('Moose::Meta::Role') } # NOTE: @@ -77,48 +60,50 @@ bodies for various moose types =head1 DESCRIPTION -This file contains the hand optimized versions of Moose type constraints, +This file contains the hand optimized versions of Moose type constraints, no user serviceable parts inside. =head1 FUNCTIONS =over 4 -=item Value +=item C + +=item C -=item Ref +=item C -=item Str +=item C -=item Num +=item C -=item Int +=item C -=item ScalarRef +=item C -=item ArrayRef +=item C -=item HashRef +=item C -=item CodeRef +=item C -=item RegexpRef +=item C -=item GlobRef +=item C -=item FileHandle +=item C -=item Object +=item C -=item Role +=item C -=item ClassName +=item C =back =head1 BUGS -All complex software has bugs lurking in it, and this module is no +All complex software has bugs lurking in it, and this module is no exception. If you find a bug please either email me, or add the bug to cpan-RT. @@ -128,7 +113,7 @@ Yuval Kogman Enothingmuch@cpan.orgE =head1 COPYRIGHT AND LICENSE -Copyright 2007-2008 by Infinity Interactive, Inc. +Copyright 2007-2009 by Infinity Interactive, Inc. L