X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FUtil%2FTypeConstraints%2FOptimizedConstraints.pm;h=e408d0e12e606543c946bf14d4881dc98dfe4076;hb=2e7576bdd6c4a179beadc2d21623c6cad1d66469;hp=fb10012d95da911c12b9c379066409d4fdf8f572;hpb=19fabdd362b0d39023e2359b59701c4fc42247de;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm b/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm
index fb10012..e408d0e 100644
--- a/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm
+++ b/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm
@@ -3,63 +3,48 @@ package Moose::Util::TypeConstraints::OptimizedConstraints;
 use strict;
 use warnings;
 
+use Class::MOP;
 use Scalar::Util 'blessed', 'looks_like_number';
 
-our $VERSION   = '0.52';
+our $VERSION   = '0.96';
+$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 sub Value { defined($_[0]) && !ref($_[0]) }
 
 sub Ref { ref($_[0]) }
 
-sub Str { defined($_[0]) && !ref($_[0]) }
+# We need to use a temporary here to flatten LVALUEs, for instance as in
+# Str(substr($_,0,255)).
+sub Str {
+    my $value = $_[0];
+    defined($value) && ref(\$value) eq 'SCALAR'
+}
 
 sub Num { !ref($_[0]) && looks_like_number($_[0]) }
 
 sub Int { defined($_[0]) && !ref($_[0]) && $_[0] =~ /^-?[0-9]+$/ }
 
-{
-    no warnings 'uninitialized';
-    sub ScalarRef { ref($_[0]) eq 'SCALAR' }
-    sub ArrayRef  { ref($_[0]) eq 'ARRAY'  }
-    sub HashRef   { ref($_[0]) eq 'HASH'   }
-    sub CodeRef   { ref($_[0]) eq 'CODE'   }
-    sub RegexpRef { ref($_[0]) eq 'Regexp' }
-    sub GlobRef   { ref($_[0]) eq 'GLOB'   }
-}
+sub ScalarRef { ref($_[0]) eq 'SCALAR' || ref($_[0]) eq 'REF' }
+sub ArrayRef  { ref($_[0]) eq 'ARRAY'  }
+sub HashRef   { ref($_[0]) eq 'HASH'   }
+sub CodeRef   { ref($_[0]) eq 'CODE'   }
+sub RegexpRef { ref($_[0]) eq 'Regexp' }
+sub GlobRef   { ref($_[0]) eq 'GLOB'   }
 
 sub FileHandle { ref($_[0]) eq 'GLOB' && Scalar::Util::openhandle($_[0]) or blessed($_[0]) && $_[0]->isa("IO::Handle") }
 
 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:
@@ -80,50 +65,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<Value>
+
+=item C<Ref>
 
-=item Ref
+=item C<Str>
 
-=item Str
+=item C<Num>
 
-=item Num
+=item C<Int>
 
-=item Int
+=item C<ScalarRef>
 
-=item ScalarRef
+=item C<ArrayRef>
 
-=item ArrayRef
+=item C<HashRef>
 
-=item HashRef
+=item C<CodeRef>
 
-=item CodeRef
+=item C<RegexpRef>
 
-=item RegexpRef
+=item C<GlobRef>
 
-=item GlobRef
+=item C<FileHandle>
 
-=item FileHandle
+=item C<Object>
 
-=item Object
+=item C<Role>
 
-=item Role
+=item C<ClassName>
 
-=item ClassName
+=item C<RoleName>
 
 =back
 
 =head1 BUGS
 
-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.
+See L<Moose/BUGS> for details on reporting bugs.
 
 =head1 AUTHOR
 
@@ -131,7 +116,7 @@ Yuval Kogman E<lt>nothingmuch@cpan.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2007-2008 by Infinity Interactive, Inc.
+Copyright 2007-2009 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>