From: Dave Rolsky Date: Sat, 14 Feb 2009 23:48:00 +0000 (+0000) Subject: Just use Class::MOP for the optimized ClassName check X-Git-Tag: 0.71~22 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e631c7d15f0653f5784108edd5e3b7e178bfcd96;p=gitmo%2FMoose.git Just use Class::MOP for the optimized ClassName check --- diff --git a/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm b/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm index 035fcf7..67391be 100644 --- a/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm +++ b/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm @@ -3,6 +3,7 @@ package Moose::Util::TypeConstraints::OptimizedConstraints; use strict; use warnings; +use Class::MOP; use Scalar::Util 'blessed', 'looks_like_number'; our $VERSION = '0.70'; @@ -33,31 +34,7 @@ sub Object { blessed($_[0]) && blessed($_[0]) ne 'Regexp' } sub Role { 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 {