X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FUtil%2FTypeConstraints.pm;h=c84c75cbd375cce7e43ae0b05992c92e55f69309;hb=4060c871da12ba3c5e88986ed121a8254f906bd6;hp=db543f412b2c3f8e8292c1fb5a64cf4be0b7bc0b;hpb=24410e3a90b8bb4eb90f126c8c836ab01a6f5abe;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Util/TypeConstraints.pm b/lib/Mouse/Util/TypeConstraints.pm
index db543f4..c84c75c 100644
--- a/lib/Mouse/Util/TypeConstraints.pm
+++ b/lib/Mouse/Util/TypeConstraints.pm
@@ -1,27 +1,23 @@
 package Mouse::Util::TypeConstraints;
-use strict;
-use warnings;
-
-use Exporter;
+use Mouse::Util qw(does_role not_supported); # enables strict and warnings
 
 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 Mouse::Exporter;
 
-use constant _DEBUG => !!$ENV{TC_DEBUG};
+Mouse::Exporter->setup_import_methods(
+    as_is => [qw(
+        as where message from via
+        type subtype coerce class_type role_type enum
+        find_type_constraint
+    )],
 
-our @ISA    = qw(Exporter);
-our @EXPORT = qw(
-    as where message from via type subtype coerce class_type role_type enum
-    find_type_constraint
+    _export_to_main => 1,
 );
 
 my %TYPE;
-my %COERCE;
-my %COERCE_KEYS;
 
 sub as ($) {
     return(as => $_[0]);
@@ -77,7 +73,7 @@ BEGIN {
         );
     }
 
-    sub optimized_constraints {
+    sub optimized_constraints { # DEPRECATED
         Carp::cluck('optimized_constraints() has been deprecated');
         return \%TYPE;
     }
@@ -150,35 +146,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 +185,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}}) {
+    Carp::cluck("typecast_constraints() has been deprecated, which was an internal utility anyway");
 
-            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";
-            }
-
-            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 +219,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 +240,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 +287,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){
@@ -358,13 +303,11 @@ sub _find_or_create_parameterized_type{
     }
 }
 sub _find_or_create_union_type{
-    my @types = map{ $_->{type_constraints} ? @{$_->{type_constraints}} : $_ } @_;
+    my @types = sort{ $a cmp $b } map{ $_->{type_constraints} ? @{$_->{type_constraints}} : $_ } @_;
 
-    my $name = join '|', map{ $_->name } @types;
+    my $name = join '|', @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,
@@ -455,7 +398,7 @@ sub find_or_parse_type_constraint {
 }
 
 sub find_or_create_does_type_constraint{
-    my $type = find_or_parse_type_constriant(@_) || role_type(@_);
+    my $type = find_or_parse_type_constraint(@_) || role_type(@_);
 
     if($type->{type} && $type->{type} ne 'Role'){
         Carp::cluck("$type is not a role type");