support of isa or ( isa => ' Str | Undef ')

[gitmo/Mouse.git] / lib / Mouse / TypeRegistry.pm

diff --git a/lib/Mouse/TypeRegistry.pm b/lib/Mouse/TypeRegistry.pm
index b5d069c..a37ce3b 100644 (file)
--- a/lib/Mouse/TypeRegistry.pm
+++ b/lib/Mouse/TypeRegistry.pm
@@ -47,7 +47,7 @@ my $optimized_constraints;
 my $optimized_constraints_base;
 {
     no warnings 'uninitialized';
-    $optimized_constraints = $optimized_constraints_base = {
+    $SUBTYPE = {
         Any        => sub { 1 },
         Item       => sub { 1 },
         Bool       => sub {
@@ -79,7 +79,12 @@ my $optimized_constraints_base;
 
         Object     => sub { blessed($_) && blessed($_) ne 'Regexp' },
     };
+
+    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) = @_;
@@ -90,7 +95,6 @@ sub _subtype {
     my $stuff = $conf{where} || optimized_constraints()->{$as};
 
     $SUBTYPE->{$name} = $stuff;
-    $optimized_constraints = +{ %{ $SUBTYPE }, %{ $optimized_constraints_base } };
 }
 
 sub _coerce {
@@ -135,27 +139,24 @@ 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 (keys %{ $COERCE->{$type} }) {
             local $_ = $value;
-            return $COERCE->{$type}->{$coerce_type}->();
+            if ($optimized_constraints->{$coerce_type}->()) {
+                local $_ = $value;
+                local $_ = $COERCE->{$type}->{$coerce_type}->();
+                return $_ if $type_constraint->();
+            }
         }
     }
-
     return $value;
 }
 
-sub optimized_constraints { $optimized_constraints }
-{
-    my @optimized_constraints_keys = keys %{ $optimized_constraints };
-    sub list_all_builtin_type_constraints { @optimized_constraints_keys }
-}
-
 1;
 
 __END__