X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FTypeConstraint.pm;h=c73fa892dc5c961a4bfcb0b5de22d84d30c35da5;hb=559f35335d5ddba6baeff5a8a50c0d67a3297c87;hp=fc64d2894f7a9934eeca7d78a3da42bf78bd800f;hpb=32ec255c44d36d63cce20f5e21386d5cd11396b9;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/TypeConstraint.pm b/lib/Mouse/Meta/TypeConstraint.pm
index fc64d28..c73fa89 100644
--- a/lib/Mouse/Meta/TypeConstraint.pm
+++ b/lib/Mouse/Meta/TypeConstraint.pm
@@ -7,28 +7,54 @@ sub new {
 
     $args{name} = '__ANON__' if !defined $args{name};
 
-    if(defined $args{parent}) {
+    my $type_parameter;
+    if(defined $args{parent}) { # subtyping
         %args = (%{$args{parent}}, %args);
+
         # a child type must not inherit 'compiled_type_constraint'
         # and 'hand_optimized_type_constraint' from the parent
-        delete $args{compiled_type_constraint};
-        delete $args{hand_optimized_type_constraint};
+        delete $args{compiled_type_constraint};       # don't inherit it
+        delete $args{hand_optimized_type_constraint}; # don't inherit it
+
+        $type_parameter = $args{type_parameter};
+        if(defined(my $parent_tp = $args{parent}{type_parameter})) {
+            if($parent_tp != $type_parameter) {
+                $type_parameter->is_a_type_of($parent_tp)
+                    or $class->throw_error(
+                        "$type_parameter is not a subtype of $parent_tp",
+                    );
+            }
+            else {
+                $type_parameter = undef;
+            }
+        }
     }
 
     my $check;
 
-    if($check = delete $args{optimized}) {
+    if($check = delete $args{optimized}) { # likely to be builtins
         $args{hand_optimized_type_constraint} = $check;
         $args{compiled_type_constraint}       = $check;
     }
-    elsif(my $param = $args{type_parameter}) {
+    elsif(defined $type_parameter) { # parameterizing
         my $generator = $args{constraint_generator}
-            || $class->throw_error("The $args{name} constraint cannot be used,"
-                . " because $param doesn't subtype from a parameterizable type");
-        # it must be 'constraint'
-        $check = $args{constraint} = $generator->($param);
+            || $class->throw_error(
+                  "The $args{name} constraint cannot be used,"
+                . " because $type_parameter doesn't subtype"
+                . " from a parameterizable type");
+
+        my $parameterized_check = $generator->($type_parameter);
+        if(defined(my $my_check = $args{constraint})) {
+            $check = sub {
+                return $parameterized_check->($_) && $my_check->($_);
+            };
+        }
+        else {
+            $check = $parameterized_check;
+        }
+        $args{constraint} = $check;
     }
-    else {
+    else { # common cases
         $check = $args{constraint};
     }
 
@@ -76,8 +102,8 @@ sub _add_type_coercions { # ($self, @pairs)
             "Cannot add additional type coercions to Union types '$self'");
     }
 
-    my $coercions = ($self->{coercion_map} ||= []);
-    my %has       = map{ $_->[0] => undef } @{$coercions};
+    my $coercion_map = ($self->{coercion_map} ||= []);
+    my %has          = map{ $_->[0]->name => undef } @{$coercion_map};
 
     for(my $i = 0; $i < @_; $i++){
         my $from   = $_[  $i];
@@ -91,7 +117,7 @@ sub _add_type_coercions { # ($self, @pairs)
             or $self->throw_error(
                 "Could not find the type constraint ($from) to coerce from");
 
-        push @{$coercions}, [ $type => $action ];
+        push @{$coercion_map}, [ $type => $action ];
     }
 
     $self->_compile_type_coercion();
@@ -101,13 +127,17 @@ sub _add_type_coercions { # ($self, @pairs)
 sub _compile_type_coercion {
     my($self) = @_;
 
-    my @coercions = @{$self->{coercion_map}};
+    my @coercions;
+
+    foreach my $pair(@{$self->{coercion_map}}) {
+        push @coercions, [ $pair->[0]->_compiled_type_constraint, $pair->[1] ];
+    }
 
     $self->{_compiled_type_coercion} = sub {
        my($thing) = @_;
        foreach my $pair (@coercions) {
             #my ($constraint, $converter) = @$pair;
-            if ($pair->[0]->check($thing)) {
+            if ($pair->[0]->($thing)) {
               local $_ = $thing;
               return $pair->[1]->($thing);
             }
@@ -189,7 +219,7 @@ sub is_a_type_of {
 }
 
 # See also Moose::Meta::TypeConstraint::Parameterizable
-sub parameterize{
+sub parameterize {
     my($self, $param, $name) = @_;
 
     if(!ref $param){
@@ -214,8 +244,10 @@ sub assert_valid {
     return 1;
 }
 
-sub _as_string { $_[0]->name                  } # overload ""
-sub _identity;                                  # overload 0+
+# overloading stuff
+
+sub _as_string { $_[0]->name } # overload ""
+sub _identity;                 # overload 0+
 
 sub _unite { # overload infix:<|>
     my($lhs, $rhs) = @_;
@@ -234,7 +266,7 @@ Mouse::Meta::TypeConstraint - The Mouse Type Constraint metaclass
 
 =head1 VERSION
 
-This document describes Mouse version 0.75
+This document describes Mouse version 0.86
 
 =head1 DESCRIPTION
 
@@ -259,7 +291,7 @@ constraints
 
 =item C<< $constraint->message >>
 
-=item C<< $constraint->is_a_subtype_of($name or $object) >>
+=item C<< $constraint->is_a_type_of($name or $object) >>
 
 =item C<< $constraint->coerce($value) >>