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

diff --git a/lib/Mouse/TypeRegistry.pm b/lib/Mouse/TypeRegistry.pm
index c722ec1..dccc736 100644
--- a/lib/Mouse/TypeRegistry.pm
+++ b/lib/Mouse/TypeRegistry.pm
@@ -1,13 +1,13 @@
-#!/usr/bin/env perl
 package Mouse::TypeRegistry;
 use strict;
 use warnings;
 
 use Carp ();
-use Mouse::Util qw/blessed looks_like_number openhandle/;
+use Scalar::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 +47,7 @@ my $optimized_constraints;
 my $optimized_constraints_base;
 {
     no warnings 'uninitialized';
-    $SUBTYPE = {
+    %SUBTYPE = (
         Any        => sub { 1 },
         Item       => sub { 1 },
         Bool       => sub {
@@ -78,41 +78,47 @@ 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;
+    my $stuff = $conf{where} || do { $SUBTYPE{delete $conf{as} || 'Any' } };
+    my $as    = $conf{as} || '';
+    if ($as = $SUBTYPE{$as}) {
+        $SUBTYPE{$name} = sub { $as->($_) && $stuff->($_) };
+    } else {
+        $SUBTYPE{$name} = $stuff;
+    }
 }
 
 sub _coerce {
     my($name, %conf) = @_;
 
     Carp::croak "Cannot find type '$name', perhaps you forgot to load it."
-        unless optimized_constraints()->{$name};
+        unless $SUBTYPE{$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};
+            unless $SUBTYPE{$type};
 
-        $COERCE->{$name}->{$type} = $code;
+        push @{ $COERCE_KEYS{$name} }, $type;
+        $COERCE{$name}->{$type} = $code;
     }
 }
 
@@ -120,6 +126,7 @@ sub _class_type {
     my $pkg = caller(0);
     my($name, $conf) = @_;
     my $class = $conf->{class};
+    Mouse::load_class($class);
     _subtype(
         $name => where => sub {
             defined $_ && ref($_) eq $class;
@@ -139,18 +146,19 @@ sub _role_type {
 }
 
 sub typecast_constraints {
-    my($class, $pkg, $type, $value) = @_;
-    return $value unless $COERCE->{$type};
-
-    my $optimized_constraints = optimized_constraints();
-    for my $coerce_type (keys %{ $COERCE->{$type} }) {
-        local $_ = $value;
-        if ($optimized_constraints->{$coerce_type}->()) {
-            local $_ = $value;
-            return $COERCE->{$type}->{$coerce_type}->();
+    my($class, $pkg, $type_constraint, $types, $value) = @_;
+
+    local $_;
+    for my $type (ref($types) eq 'ARRAY' ? @{ $types } : ( $types )) {
+        next unless $COERCE{$type};
+        for my $coerce_type (@{ $COERCE_KEYS{$type}}) {
+            $_ = $value;
+            next unless $SUBTYPE{$coerce_type}->();
+            $_ = $value;
+            $_ = $COERCE{$type}->{$coerce_type}->();
+            return $_ if $type_constraint->();
         }
     }
-
     return $value;
 }