[Moose-commits] r7699 - Moose/trunk/lib/Moose/Util/TypeConstraints

[autarch at code2.0beta.co.uk]

Author: autarch
Date: 2009-02-14 15:48:00 -0800 (Sat, 14 Feb 2009)
New Revision: 7699

Modified:
   Moose/trunk/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm
Log:
Just use Class::MOP for the optimized ClassName check


Modified: Moose/trunk/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm
===================================================================
--- Moose/trunk/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm	2009-02-14 20:42:16 UTC (rev 7698)
+++ Moose/trunk/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm	2009-02-14 23:48:00 UTC (rev 7699)
@@ -3,6 +3,7 @@
 use strict;
 use warnings;
 
+use Class::MOP;
 use Scalar::Util 'blessed', 'looks_like_number';
 
 our $VERSION   = '0.70';
@@ -33,31 +34,7 @@
 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 {