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=caeb98081d8ca420bc2f920c84a6abcf2823cfae;hp=916acc130b921c947a2cd43898706a2d09e3d8f6;hb=d21b0c568e8f1ec9acb47482446e8ef4ab1e2906;hpb=6d28c5cf89bfd4c00e675e95aff6c31b61aeb805

diff --git a/lib/Mouse/Meta/TypeConstraint.pm b/lib/Mouse/Meta/TypeConstraint.pm
index 916acc1..caeb980 100644
--- a/lib/Mouse/Meta/TypeConstraint.pm
+++ b/lib/Mouse/Meta/TypeConstraint.pm
@@ -2,31 +2,53 @@ package Mouse::Meta::TypeConstraint;
 use strict;
 use warnings;
 
-use overload '""'     => sub { shift->{name} },   # stringify to tc name
-             fallback => 1;
+use overload
+    '""'     => sub { shift->{name} },   # stringify to tc name
+    fallback => 1;
 
-use Carp ();
+use Carp qw(confess);
+use Scalar::Util qw(blessed reftype);
 
-use Mouse::Util ();
+use Mouse::Util qw(:meta);
+
+my $null_check = sub { 1 };
 
 sub new {
-    my $class = shift;
-    my %args = @_;
-    my $name = $args{name} || '__ANON__';
+    my($class, %args) = @_;
+
+    $args{name} = '__ANON__' if !defined $args{name};
 
-    my $check = $args{_compiled_type_constraint} or Carp::croak("missing _compiled_type_constraint");
-    if (ref $check eq 'Mouse::Meta::TypeConstraint') {
+    my $check = $args{_compiled_type_constraint} || $args{constraint};
+
+    if(blessed($check)){
+        Carp::cluck("'constraint' must be a CODE reference");
         $check = $check->{_compiled_type_constraint};
     }
 
-    bless +{
-        name                      => $name,
-        _compiled_type_constraint => $check,
-        message                   => $args{message}
-    }, $class;
+    if(defined($check) && ref($check) ne 'CODE'){
+        confess("Type constraint for $args{name} is not a CODE reference");
+    }
+
+    my $self = bless \%args, $class;
+    $self->{_compiled_type_constraint} ||= $self->_compile();
+
+    return $self;
+}
+
+sub create_child_type{
+    my $self = shift;
+    # XXX: FIXME
+    return ref($self)->new(
+        %{$self},                            # pass the inherit parent attributes
+        _compiled_type_constraint => undef,  # ... other than compiled type constraint
+        @_,                                  # ... and args
+        parent => $self                      # ... and the parent
+   );
 }
 
-sub name { shift->{name} }
+sub name    { $_[0]->{name}    }
+sub parent  { $_[0]->{parent}  }
+sub message { $_[0]->{message} }
 
 sub check {
     my $self = shift;
@@ -34,27 +56,22 @@ sub check {
 }
 
 sub validate {
-    my ($self, $value) = @_;
-    if ($self->{_compiled_type_constraint}->($value)) {
-        return undef;
-    }
-    else {
-        $self->get_message($value);
-    }
+    my ($self, $value) = @_;
+    if ($self->{_compiled_type_constraint}->($value)) {
+        return undef;
+    }
+    else {
+        $self->get_message($value);
+    }
 }
 
-sub assert_valid {
-    my ($self, $value) = @_;
-
-    my $error = $self->validate($value);
-    return 1 if ! defined $error;
-
-    Carp::confess($error);
-}
+sub assert_valid {
+    my ($self, $value) = @_;
 
+    my $error = $self->validate($value);
+    return 1 if ! defined $error;
 
-sub message {
-    return $_[0]->{message};
+    confess($error);
 }
 
 sub get_message {
@@ -73,10 +90,69 @@ sub get_message {
 }
 
 sub is_a_type_of{
-    my($self, $tc_name) = @_;
+    my($self, $other) = @_;
+
+    # ->is_a_type_of('__ANON__') is always false
+    return 0 if !blessed($other) && $other eq '__ANON__';
 
-    return $self->name eq $tc_name
-        || $self->name =~ /\A $tc_name \[/xms; # "ArrayRef" =~ "ArrayRef[Foo]"
+    (my $other_name = $other) =~ s/\s+//g;
+
+    return 1 if $self->name eq $other_name;
+
+    if(exists $self->{type_constraints}){ # union
+        foreach my $type(@{$self->{type_constraints}}){
+            return 1 if $type->name eq $other_name;
+        }
+    }
+
+    for(my $parent = $self->parent; defined $parent; $parent = $parent->parent){
+        return 1 if $parent->name eq $other_name;
+    }
+
+    return 0;
+}
+
+sub _compile{
+    my($self) = @_;
+
+    # add parents first
+    my @checks;
+    for(my $parent = $self->parent; defined $parent; $parent = $parent->parent){
+        if($parent->{constraint}){
+            push @checks, $parent->{constraint};
+         }
+         elsif($parent->{_compiled_type_constraint} && $parent->{_compiled_type_constraint} != $null_check){
+            # hand-optimized constraint
+            push @checks, $parent->{_compiled_type_constraint};
+            last;
+        }
+    }
+    # then add child
+    if($self->{constraint}){
+        push @checks, $self->{constraint};
+    }
+
+    if(@checks == 0){
+        return $null_check;
+    }
+    elsif(@checks == 1){
+        my $c = $checks[0];
+        return sub{
+            my(@args) = @_;
+            local $_ = $args[0];
+            return $c->(@args);
+        };
+    }
+    else{
+        return sub{
+            my(@args) = @_;
+            local $_ = $args[0];
+            foreach my $c(@checks){
+                return undef if !$c->(@args);
+            }
+            return 1;
+        };
+    }
 }
 
 1;
@@ -84,7 +160,7 @@ __END__
 
 =head1 NAME
 
-Mouse::Meta::TypeConstraint - The Mouse Type Constraint Metaclass
+Mouse::Meta::TypeConstraint - The Mouse Type Constraint metaclass
 
 =head1 DESCRIPTION
 
@@ -106,5 +182,9 @@ Don't use this.
 
 =back
 
+=head1 SEE ALSO
+
+L<Moose::Meta::TypeConstraint>
+
 =cut