X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FUtil%2FTypeConstraints.pm;h=9582efda8949e299975dd4094c3967c0dd4584e6;hb=98ab51333533a85f044f893160daaf525fb6da2c;hp=4ebb08a50bf7ec95c91831891299c8df625254dd;hpb=ffbbf459fec594dcd08b5f7d05014740390bde58;p=gitmo%2FMouse.git diff --git a/lib/Mouse/Util/TypeConstraints.pm b/lib/Mouse/Util/TypeConstraints.pm index 4ebb08a..9582efd 100644 --- a/lib/Mouse/Util/TypeConstraints.pm +++ b/lib/Mouse/Util/TypeConstraints.pm @@ -8,11 +8,8 @@ use Carp qw(confess); use Scalar::Util qw/blessed looks_like_number openhandle/; use Mouse::Util qw(does_role not_supported); -use Mouse::Meta::Module; # class_of use Mouse::Meta::TypeConstraint; -use constant _DEBUG => !!$ENV{TC_DEBUG}; - our @ISA = qw(Exporter); our @EXPORT = qw( as where message from via type subtype coerce class_type role_type enum @@ -20,8 +17,6 @@ our @EXPORT = qw( ); my %TYPE; -my %COERCE; -my %COERCE_KEYS; sub as ($) { return(as => $_[0]); @@ -77,7 +72,7 @@ BEGIN { ); } - sub optimized_constraints { + sub optimized_constraints { # DEPRECATED Carp::cluck('optimized_constraints() has been deprecated'); return \%TYPE; } @@ -189,11 +184,12 @@ sub role_type { ); } -# this is an original method for Mouse -sub typecast_constraints { +sub typecast_constraints { # DEPRECATED my($class, $pkg, $type, $value) = @_; Carp::croak("wrong arguments count") unless @_ == 4; + Carp::cluck("typecast_constraints() has been deprecated, which was an internal utility anyway"); + return $type->coerce($value); } @@ -222,7 +218,7 @@ sub _find_or_create_regular_type{ return $TYPE{$spec} if exists $TYPE{$spec}; - my $meta = Mouse::Meta::Module::class_of($spec); + my $meta = Mouse::Util::get_metaclass_by_name($spec); if(!$meta){ return; @@ -243,8 +239,6 @@ sub _find_or_create_regular_type{ $type = 'Class'; } - warn "#CREATE a $type type for $spec\n" if _DEBUG; - return $TYPE{$spec} = Mouse::Meta::TypeConstraint->new( name => $spec, optimized => $check, @@ -292,8 +286,6 @@ sub _find_or_create_parameterized_type{ my $name = sprintf '%s[%s]', $base->name, $param->name; $TYPE{$name} ||= do{ - warn "#CREATE a Parameterized type for $name\n" if _DEBUG; - my $generator = $base->{constraint_generator}; if(!$generator){ @@ -315,8 +307,6 @@ sub _find_or_create_union_type{ my $name = join '|', map{ $_->name } @types; $TYPE{$name} ||= do{ - warn "# CREATE a Union type for ", Mouse::Util::english_list(@types),"\n" if _DEBUG; - return Mouse::Meta::TypeConstraint->new( name => $name, type_constraints => \@types,