X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FTypeRegistry.pm;h=f11a8319102b946dba709b8c6e5824e33d270a8f;hb=8a7f2a8a33880aeb024e9fa21703e49fac9ef6a5;hp=c722ec1ba43f5eb0812c4ea9aeeaf6c89816f0fb;hpb=d3982c7e7f662fb205f4fca0a264c3479bba4438;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/TypeRegistry.pm b/lib/Mouse/TypeRegistry.pm
index c722ec1..f11a831 100644
--- a/lib/Mouse/TypeRegistry.pm
+++ b/lib/Mouse/TypeRegistry.pm
@@ -6,8 +6,9 @@ use warnings;
 use Carp ();
 use Mouse::Util qw/blessed looks_like_number openhandle/;
 
-my $SUBTYPE = +{};
-my $COERCE = +{};
+my %SUBTYPE;
+my %COERCE;
+my %COERCE_KEYS;
 
 #find_type_constraint register_type_constraint
 sub import {
@@ -47,7 +48,7 @@ my $optimized_constraints;
 my $optimized_constraints_base;
 {
     no warnings 'uninitialized';
-    $SUBTYPE = {
+    %SUBTYPE = (
         Any        => sub { 1 },
         Item       => sub { 1 },
         Bool       => sub {
@@ -78,23 +79,23 @@ my $optimized_constraints_base;
             },
 
         Object     => sub { blessed($_) && blessed($_) ne 'Regexp' },
-    };
+    );
 
-    sub optimized_constraints { $SUBTYPE }
-    my @SUBTYPE_KEYS = keys %{ $SUBTYPE };
+    sub optimized_constraints { \%SUBTYPE }
+    my @SUBTYPE_KEYS = keys %SUBTYPE;
     sub list_all_builtin_type_constraints { @SUBTYPE_KEYS }
 }
 
 sub _subtype {
     my $pkg = caller(0);
     my($name, %conf) = @_;
-    if (my $type = $SUBTYPE->{$name}) {
+    if (my $type = $SUBTYPE{$name}) {
         Carp::croak "The type constraint '$name' has already been created, cannot be created again in $pkg";
     };
     my $as = $conf{as};
     my $stuff = $conf{where} || optimized_constraints()->{$as};
 
-    $SUBTYPE->{$name} = $stuff;
+    $SUBTYPE{$name} = $stuff;
 }
 
 sub _coerce {
@@ -104,15 +105,19 @@ sub _coerce {
         unless optimized_constraints()->{$name};
 
     my $subtypes = optimized_constraints();
-    $COERCE->{$name} ||= {};
+    unless ($COERCE{$name}) {
+        $COERCE{$name}      = {};
+        $COERCE_KEYS{$name} = [];
+    }
     while (my($type, $code) = each %conf) {
         Carp::croak "A coercion action already exists for '$type'"
-            if $COERCE->{$name}->{$type};
+            if $COERCE{$name}->{$type};
 
         Carp::croak "Could not find the type constraint ($type) to coerce from"
             unless $subtypes->{$type};
 
-        $COERCE->{$name}->{$type} = $code;
+        push @{ $COERCE_KEYS{$name} }, $type;
+        $COERCE{$name}->{$type} = $code;
     }
 }
 
@@ -139,18 +144,20 @@ sub _role_type {
 }
 
 sub typecast_constraints {
-    my($class, $pkg, $type, $value) = @_;
-    return $value unless $COERCE->{$type};
+    my($class, $pkg, $type_constraint, $types, $value) = @_;
 
-    my $optimized_constraints = optimized_constraints();
-    for my $coerce_type (keys %{ $COERCE->{$type} }) {
-        local $_ = $value;
-        if ($optimized_constraints->{$coerce_type}->()) {
+    for my $type (ref($types) eq 'ARRAY' ? @{ $types } : ( $types )) {
+        next unless $COERCE{$type};
+
+        for my $coerce_type (@{ $COERCE_KEYS{$type}}) {
             local $_ = $value;
-            return $COERCE->{$type}->{$coerce_type}->();
+            if ($SUBTYPE{$coerce_type}->()) {
+                local $_ = $value;
+                local $_ = $COERCE{$type}->{$coerce_type}->();
+                return $_ if $type_constraint->();
+            }
         }
     }
-
     return $value;
 }