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=6d8ccfa3545e3134e25959baf1a0419a665014f2;hpb=3b89ea918d7ff7162f2bbeecf24df818148d5315;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Util/TypeConstraints.pm b/lib/Mouse/Util/TypeConstraints.pm
index 6d8ccfa..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;
     }
@@ -124,15 +119,15 @@ sub _create_type{
               . "$existing->{package_defined_in} and cannot be created again in $package_defined_in");
     }
 
-    $args{constraint} = delete($args{where})      if exists $args{where};
-    $args{optimized} = delete $args{optimized_as} if exists $args{optimized_as};
+    $args{constraint} = delete($args{where})       if exists $args{where};
+    $args{optimized}  = delete $args{optimized_as} if exists $args{optimized_as};
 
     my $constraint;
     if($mode eq 'subtype'){
-        my $parent = exists($args{as}) ? delete($args{as}) : delete($args{name});
+        my $parent = delete($args{as})
+            or confess('A subtype cannot consist solely of a name, it must have a parent');
 
-        $parent     = find_or_create_isa_type_constraint($parent);
-        $constraint = $parent->create_child_type(%args);
+        $constraint = find_or_create_isa_type_constraint($parent)->create_child_type(%args);
     }
     else{
         $constraint = Mouse::Meta::TypeConstraint->new(%args);
@@ -150,35 +145,12 @@ sub subtype {
 }
 
 sub coerce {
-    my $name = shift;
-
-    $name =~ s/\s+//g;
-    confess "Cannot find type '$name', perhaps you forgot to load it."
-        unless $TYPE{$name};
-
-    unless ($COERCE{$name}) {
-        $COERCE{$name}      = {};
-        $COERCE_KEYS{$name} = [];
-    }
-
-    my $package_defined_in = caller;
-
-    while (my($from, $action) = splice @_, 0, 2) {
-        $from =~ s/\s+//g;
+    my $type_name = shift;
 
-        confess "A coercion action already exists for '$from'"
-            if $COERCE{$name}->{$from};
+    my $type = find_type_constraint($type_name)
+        or confess("Cannot find type '$type_name', perhaps you forgot to load it.");
 
-        my $type = find_or_parse_type_constraint($from, $package_defined_in);
-        if (!$type) {
-            confess "Could not find the type constraint ($from) to coerce from"
-        }
-
-        warn "# REGISTER COERCE $name, from $type\n" if _DEBUG;
-
-        push @{ $COERCE_KEYS{$name} }, $type;
-        $COERCE{$name}->{$from} = $action;
-    }
+    $type->_add_type_coercions(@_);
     return;
 }
 
@@ -212,37 +184,13 @@ sub role_type {
     );
 }
 
-# this is an original method for Mouse
-sub typecast_constraints {
-    my($class, $pkg, $types, $value) = @_;
+sub typecast_constraints { # DEPRECATED
+    my($class, $pkg, $type, $value) = @_;
     Carp::croak("wrong arguments count") unless @_ == 4;
 
-    local $_;
-    for my $type ($types->{type_constraints} ? @{$types->{type_constraints}} : $types ) {
-        for my $coerce_type (@{ $COERCE_KEYS{$type}}) {
-
-            if(_DEBUG){
-                warn sprintf "# COERCE: from %s to %s for %s (%s)\n",
-                    $coerce_type, $type, defined($value) ? "'$value'" : 'undef',
-                    $coerce_type->check($value) ? "try" : "skip";
-            }
+    Carp::cluck("typecast_constraints() has been deprecated, which was an internal utility anyway");
 
-            next if !$coerce_type->check($value);
-
-            # try to coerce
-            $_ = $value;
-            my $coerced = $COERCE{$type}->{$coerce_type}->($value); # coerce
-
-            if(_DEBUG){
-                warn sprintf "# COERCE: got %s, which is%s %s\n",
-                    defined($coerced) ? $coerced : 'undef', $types->check($coerced) ? '' : ' not', $types;
-            }
-
-            # check with $types, not $constraint
-            return $coerced if $types->check($coerced);
-        }
-    }
-    return $value; # returns original $value
+    return $type->coerce($value);
 }
 
 sub enum {
@@ -270,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;
@@ -291,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,
@@ -340,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){
@@ -363,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,
@@ -634,9 +576,13 @@ related C<eq_deeply> function.
 
 =head1 METHODS
 
-=head2 optimized_constraints -> HashRef[CODE]
+=head2 C<< list_all_builtin_type_constraints -> (Names) >>
+
+Returns the names of builtin type constraints.
+
+=head2 C<< list_all_type_constraints -> (Names) >>
 
-Returns the simple type constraints that Mouse understands.
+Returns the names of all the type constraints.
 
 =head1 FUNCTIONS