X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FUtil%2FTypeConstraints%2FOptimizedConstraints.pm;h=4672c47c6298f91cc1e39b5e3f1badd120668c34;hb=86850486e3e2425c803df63cb6f10ee89a8d4a76;hp=0e622c23048229d0f4d922bfefe0d22c9cdc6c70;hpb=45160c4b37efc1dce63d008c7a734d8250fb714c;p=gitmo%2FMoose.git diff --git a/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm b/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm index 0e622c2..4672c47 100644 --- a/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm +++ b/lib/Moose/Util/TypeConstraints/OptimizedConstraints.pm @@ -4,9 +4,10 @@ use strict; use warnings; use Class::MOP; +use Moose::Deprecated; use Scalar::Util 'blessed', 'looks_like_number'; -our $VERSION = '0.99'; +our $VERSION = '1.12'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; @@ -23,7 +24,12 @@ sub Str { sub Num { !ref($_[0]) && looks_like_number($_[0]) } -sub Int { defined($_[0]) && !ref($_[0]) && $_[0] =~ /^-?[0-9]+$/ } +# using a temporary here because regex matching promotes an IV to a PV, +# and that confuses some things (like JSON.pm) +sub Int { + my $value = $_[0]; + defined($value) && !ref($value) && $value =~ /^-?[0-9]+$/ +} sub ScalarRef { ref($_[0]) eq 'SCALAR' || ref($_[0]) eq 'REF' } sub ArrayRef { ref($_[0]) eq 'ARRAY' } @@ -36,7 +42,14 @@ sub FileHandle { ref($_[0]) eq 'GLOB' && Scalar::Util::openhandle($_[0]) or bles sub Object { blessed($_[0]) && blessed($_[0]) ne 'Regexp' } -sub Role { Carp::cluck('The Role type is deprecated.'); blessed($_[0]) && $_[0]->can('does') } +sub Role { + Moose::Deprecated::deprecated( + feature => 'Role type', + message => + 'The Role type has been deprecated. Maybe you meant to create a RoleName type?' + ); + blessed( $_[0] ) && $_[0]->can('does'); +} sub ClassName { return Class::MOP::is_class_loaded( $_[0] );