X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FTypeConstraint.pm;h=4dc4650d735cec279aa3101bda52bda40e813661;hp=6bb7e2171824740b3b725fff58014349b4b457cc;hb=HEAD;hpb=825f7cdadcd71fb73aa7f6fa7c29b4f2d0c25366

diff --git a/lib/Mouse/Meta/TypeConstraint.pm b/lib/Mouse/Meta/TypeConstraint.pm
index 6bb7e21..4dc4650 100644
--- a/lib/Mouse/Meta/TypeConstraint.pm
+++ b/lib/Mouse/Meta/TypeConstraint.pm
@@ -1,6 +1,5 @@
 package Mouse::Meta::TypeConstraint;
 use Mouse::Util qw(:meta); # enables strict and warnings
-use Scalar::Util ();
 
 sub new {
     my $class = shift;
@@ -8,28 +7,54 @@ sub new {
 
     $args{name} = '__ANON__' if !defined $args{name};
 
-    if($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};
     }
 
@@ -42,9 +67,16 @@ sub new {
     $self->compile_type_constraint()
         if !$args{hand_optimized_type_constraint};
 
-    if($args{type_constraints}) {
-        $self->_compile_union_type_coercion();
+    if($args{type_constraints}) { # union types
+        foreach my $type(@{$self->{type_constraints}}){
+            if($type->has_coercion){
+                # set undef for has_coercion()
+                $self->{_compiled_type_coercion} = undef;
+                last;
+            }
+        }
     }
+
     return $self;
 }
 
@@ -72,8 +104,13 @@ sub compile_type_constraint;
 sub _add_type_coercions { # ($self, @pairs)
     my $self = shift;
 
-    my $coercions = ($self->{coercion_map} ||= []);
-    my %has       = map{ $_->[0] => undef } @{$coercions};
+    if(exists $self->{type_constraints}){ # union type
+        $self->throw_error(
+            "Cannot add additional type coercions to Union types '$self'");
+    }
+
+    my $coercion_map = ($self->{coercion_map} ||= []);
+    my %has          = map{ $_->[0]->name => undef } @{$coercion_map};
 
     for(my $i = 0; $i < @_; $i++){
         my $from   = $_[  $i];
@@ -87,71 +124,66 @@ 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 ];
     }
 
-    # compile
-    if(exists $self->{type_constraints}){ # union type
-        $self->throw_error(
-            "Cannot add additional type coercions to Union types");
-    }
-    else{
-        $self->_compile_type_coercion();
-    }
+    $self->{_compiled_type_coercion} = undef;
     return;
 }
 
-sub _compile_type_coercion {
+sub _compiled_type_coercion {
     my($self) = @_;
 
-    my @coercions = @{$self->{coercion_map}};
+    my $coercion = $self->{_compiled_type_coercion};
+    return $coercion if defined $coercion;
 
-    $self->{_compiled_type_coercion} = sub {
-       my($thing) = @_;
-       foreach my $pair (@coercions) {
-            #my ($constraint, $converter) = @$pair;
-            if ($pair->[0]->check($thing)) {
-              local $_ = $thing;
-              return $pair->[1]->($thing);
-            }
-       }
-       return $thing;
-    };
-    return;
-}
-
-sub _compile_union_type_coercion {
-    my($self) = @_;
-
-    my @coercions;
-    foreach my $type(@{$self->{type_constraints}}){
-        if($type->has_coercion){
-            push @coercions, $type;
+    if(!$self->{type_constraints}) {
+        my @coercions;
+        foreach my $pair(@{$self->{coercion_map}}) {
+            push @coercions,
+                [ $pair->[0]->_compiled_type_constraint, $pair->[1] ];
         }
+
+        $coercion = sub {
+           my($thing) = @_;
+           foreach my $pair (@coercions) {
+                #my ($constraint, $converter) = @$pair;
+                if ($pair->[0]->($thing)) {
+                  local $_ = $thing;
+                  return $pair->[1]->($thing);
+                }
+           }
+           return $thing;
+        };
     }
-    if(@coercions){
-        $self->{_compiled_type_coercion} = sub {
-            my($thing) = @_;
-            foreach my $type(@coercions){
-                my $value = $type->coerce($thing);
-                return $value if $self->check($value);
+    else { # for union type
+        my @coercions;
+        foreach my $type(@{$self->{type_constraints}}){
+            if($type->has_coercion){
+                push @coercions, $type;
             }
-            return $thing;
-        };
+        }
+        if(@coercions){
+            $coercion = sub {
+                my($thing) = @_;
+                foreach my $type(@coercions){
+                    my $value = $type->coerce($thing);
+                    return $value if $self->check($value);
+                }
+                return $thing;
+            };
+        }
     }
-    return;
+
+    return( $self->{_compiled_type_coercion} = $coercion );
 }
 
 sub coerce {
     my $self = shift;
-
-    my $coercion = $self->_compiled_type_coercion;
-    if(!$coercion){
-        $self->throw_error("Cannot coerce without a type coercion");
-    }
-
     return $_[0] if $self->check(@_);
 
+    my $coercion = $self->_compiled_type_coercion
+        or $self->throw_error("Cannot coerce without a type coercion");
     return  $coercion->(@_);
 }
 
@@ -172,7 +204,7 @@ sub get_message {
     }
 }
 
-sub is_a_type_of{
+sub is_a_type_of {
     my($self, $other) = @_;
 
     # ->is_a_type_of('__ANON__') is always false
@@ -196,7 +228,7 @@ sub is_a_type_of{
 }
 
 # See also Moose::Meta::TypeConstraint::Parameterizable
-sub parameterize{
+sub parameterize {
     my($self, $param, $name) = @_;
 
     if(!ref $param){
@@ -221,14 +253,17 @@ sub assert_valid {
     return 1;
 }
 
-sub _as_string { $_[0]->name                  } # overload ""
-sub _identity  { Scalar::Util::refaddr($_[0]) } # overload 0+
+# overloading stuff
+
+sub _as_string { $_[0]->name } # overload ""
+sub _identity;                 # overload 0+
 
 sub _unite { # overload infix:<|>
     my($lhs, $rhs) = @_;
     require Mouse::Util::TypeConstraints;
-    return Mouse::Util::TypeConstraints::find_or_parse_type_constraint(
-       " $lhs | $rhs",
+    return Mouse::Util::TypeConstraints::_find_or_create_union_type(
+        $lhs,
+        Mouse::Util::TypeConstraints::find_or_create_isa_type_constraint($rhs),
     );
 }
 
@@ -241,7 +276,7 @@ Mouse::Meta::TypeConstraint - The Mouse Type Constraint metaclass
 
 =head1 VERSION
 
-This document describes Mouse version 0.74
+This document describes Mouse version 0.95
 
 =head1 DESCRIPTION
 
@@ -266,7 +301,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) >>