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=436f690d9aadba5475722116a336dac20a7bc6f6;hp=13b44954c5042e659610816dcaf21f02d0db29fd;hb=a15d1371334de8874a74618597d0c1995fdca276;hpb=1820fffecb0bd1da64edc16ecde534178b841d14

diff --git a/lib/Mouse/Meta/TypeConstraint.pm b/lib/Mouse/Meta/TypeConstraint.pm
index 13b4495..436f690 100644
--- a/lib/Mouse/Meta/TypeConstraint.pm
+++ b/lib/Mouse/Meta/TypeConstraint.pm
@@ -2,59 +2,141 @@ 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 qw(:meta);
 
+my $null_check = sub { 1 };
+
 sub new {
-    my $class = shift;
-    my %args = @_;
-    my $name = $args{name} || '__ANON__';
+    my($class, %args) = @_;
 
-    my $check = $args{_compiled_type_constraint} or Carp::croak("missing _compiled_type_constraint");
-    if (ref $check eq 'Mouse::Meta::TypeConstraint') {
-        $check = $check->{_compiled_type_constraint};
-    }
+    $args{name} = '__ANON__' if !defined $args{name};
 
-    bless +{
-        name                      => $name,
-        _compiled_type_constraint => $check,
-        message                   => $args{message}
-    }, $class;
-}
+    my $check = delete $args{optimized};
 
-sub name { shift->{name} }
+    if($args{_compiled_type_constraint}){
+        Carp::cluck("'_compiled_type_constraint' has been deprecated, use 'optimized' instead");
+        $check = $args{_compiled_type_constraint};
 
-sub check {
-    my $self = shift;
-    $self->{_compiled_type_constraint}->(@_);
-}
+        if(blessed($check)){
+            Carp::cluck("Constraint must be a CODE reference");
+            $check = $check->{compiled_type_constraint};
+        }
+    }
 
-sub validate {
-    my ($self, $value) = @_;
-    if ($self->{_compiled_type_constraint}->($value)) {
-        return undef;
+    if($check){
+        $args{hand_optimized_type_constraint} = $check;
+        $args{compiled_type_constraint}       = $check;
     }
-    else {
-        $self->get_message($value);
+
+    $check = $args{constraint};
+
+    if(blessed($check)){
+        Carp::cluck("Constraint for $args{name} must be a CODE reference");
+        $check = $check->{compiled_type_constraint};
     }
+
+    if(defined($check) && ref($check) ne 'CODE'){
+        confess("Constraint for $args{name} is not a CODE reference");
+    }
+
+    $args{package_defined_in} ||= caller;
+
+    my $self = bless \%args, $class;
+    $self->compile_type_constraint() if !$self->{hand_optimized_type_constraint};
+
+    return $self;
 }
 
-sub assert_valid {
-    my ($self, $value) = @_;
+sub create_child_type{
+    my $self = shift;
+    # XXX: FIXME
+    return ref($self)->new(
+        # a child inherits its parent's attributes
+        %{$self},
+
+        # but does not inherit 'compiled_type_constraint' and 'hand_optimized_type_constraint'
+        compiled_type_constraint       => undef,
+        hand_optimized_type_constraint => undef,
 
-    my $error = $self->validate($value);
-    return 1 if ! defined $error;
+        # and is given child-specific args, of course.
+        @_,
 
-    Carp::confess($error);
+        # and its parent
+        parent => $self,
+   );
 }
 
+sub name    { $_[0]->{name}    }
+sub parent  { $_[0]->{parent}  }
+sub message { $_[0]->{message} }
+
+sub _compiled_type_constraint{ $_[0]->{compiled_type_constraint} }
+
+
+sub compile_type_constraint{
+    my($self) = @_;
 
-sub message {
-    return $_[0]->{message};
+    # add parents first
+    my @checks;
+    for(my $parent = $self->parent; defined $parent; $parent = $parent->parent){
+         if($parent->{hand_optimized_type_constraint}){
+            push @checks, $parent->{hand_optimized_type_constraint};
+            last; # a hand optimized constraint must include all the parents
+        }
+        elsif($parent->{constraint}){
+            push @checks, $parent->{constraint};
+        }
+    }
+
+    # then add child
+    if($self->{constraint}){
+        push @checks, $self->{constraint};
+    }
+
+    if($self->{type_constraints}){ # Union
+        my @types = map{ $_->_compiled_type_constraint } @{ $self->{type_constraints} };
+        push @checks, sub{
+            foreach my $c(@types){
+                return 1 if $c->($_[0]);
+            }
+            return 0;
+        };
+    }
+
+    if(@checks == 0){
+        $self->{compiled_type_constraint} = $null_check;
+    }
+    elsif(@checks == 1){
+        my $c = $checks[0];
+        $self->{compiled_type_constraint} = sub{
+            my(@args) = @_;
+            local $_ = $args[0];
+            return $c->(@args);
+        };
+    }
+    else{
+        $self->{compiled_type_constraint} =  sub{
+            my(@args) = @_;
+            local $_ = $args[0];
+            foreach my $c(@checks){
+                return undef if !$c->(@args);
+            }
+            return 1;
+        };
+    }
+    return;
+}
+
+sub check {
+    my $self = shift;
+    $self->_compiled_type_constraint->(@_);
 }
 
 sub get_message {
@@ -65,20 +147,34 @@ sub get_message {
     }
     else {
         $value = ( defined $value ? overload::StrVal($value) : 'undef' );
-        return
-            "Validation failed for '"
-          . $self->name
-          . "' failed with value $value";
+        return "Validation failed for '$self' failed with value $value";
     }
 }
 
 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__';
+
+    (my $other_name = $other) =~ s/\s+//g;
+
+    return 1 if $self->name eq $other_name;
 
-    return $self->name eq $tc_name
-        || $self->name =~ /\A $tc_name \[/xms; # "ArrayRef" =~ "ArrayRef[Foo]"
+    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;
 }
 
+
 1;
 __END__