X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FUtil%2FTypeConstraints%2FOptimizedConstraints.pm;h=5e3ccdc02cfb2c3f7451d8f9299c14bea30ba00c;hb=e462f6f3d260687b8f7372b112a50c5c2a2c431c;hp=cde58f5766dc793acbb9a0172868faf63b00d16b;hpb=5892c70c75a80e9d5a311a337848e20764d4998c;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm b/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm
index cde58f5..5e3ccdc 100644
--- a/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm
+++ b/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm
@@ -3,23 +3,54 @@ package Moose::Util::TypeConstraints::OptimizedConstraints;
 use strict;
 use warnings;
 
+use Class::MOP;
 use Scalar::Util 'blessed', 'looks_like_number';
 
-our $VERSION   = '0.02';
+our $VERSION   = '1.05';
+$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
-use XSLoader;
-# Optimized type constraints are XS in Moose.xs
-XSLoader::load('Moose', '0.39'); # This is a pain... must use the version number of moose
-                                 # but can't refer to it since Moose may not be loaded.
+sub Value { defined($_[0]) && !ref($_[0]) }
 
-sub Num         { !Ref($_[0]) && looks_like_number($_[0]) }
+sub Ref { ref($_[0]) }
 
-sub Int         { Defined($_[0]) && !Ref($_[0]) && $_[0] =~ /^-?[0-9]+$/ }
+# 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 FileHandle  { GlobRef($_[0]) && Scalar::Util::openhandle($_[0]) or ObjectOfType($_[0], "IO::Handle")  }
+sub Num { !ref($_[0]) && looks_like_number($_[0]) }
 
-sub Role        { Object($_[0]) && $_[0]->can('does') }
+sub Int { defined($_[0]) && !ref($_[0]) && $_[0] =~ /^-?[0-9]+$/ }
+
+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 { Carp::cluck('The Role type is deprecated.'); blessed($_[0]) && $_[0]->can('does') }
+
+sub ClassName {
+    return Class::MOP::is_class_loaded( $_[0] );
+}
+
+sub RoleName {
+    ClassName($_[0])
+    && (Class::MOP::class_of($_[0]) || return)->isa('Moose::Meta::Role')
+}
+
+# NOTE:
+# we have XS versions too, ...
+# 04:09 <@konobi> nothingmuch: konobi.co.uk/code/utilsxs.tar.gz
+# 04:09 <@konobi> or utilxs.tar.gz iirc
 
 1;
 
@@ -34,64 +65,58 @@ 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 Undef
-
-=item Defined
-
-=item Value
+=item C<Value>
 
-=item Ref
+=item C<Ref>
 
-=item Str
+=item C<Str>
 
-=item Num
+=item C<Num>
 
-=item Int
+=item C<Int>
 
-=item ScalarRef
+=item C<ScalarRef>
 
-=item ArrayRef
+=item C<ArrayRef>
 
-=item HashRef
+=item C<HashRef>
 
-=item CodeRef
+=item C<CodeRef>
 
-=item RegexpRef
+=item C<RegexpRef>
 
-=item GlobRef
+=item C<GlobRef>
 
-=item FileHandle
+=item C<FileHandle>
 
-=item Object
+=item C<Object>
 
-=item ObjectOfType
+=item C<Role>
 
-Makes sure $object->isa($class). Used in anon type constraints.
+=item C<ClassName>
 
-=item Role
+=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
 
 Yuval Kogman E<lt>nothingmuch@cpan.orgE<gt>
-Konobi E<lt>konobi@cpan.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2008 by Infinity Interactive, Inc.
+Copyright 2007-2009 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>