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=2593b8250a3bb7bf64636b1fc0679d1f3163d9f1;hp=05b9c5f8c02b2188de5aab824aabfb222a7ffe50;hb=de0d4152ac07ed26a928841729e97366187b2915;hpb=a25ca8d637c040b2f929b1a23dd62ff63d85f5d1

diff --git a/lib/Mouse/Meta/TypeConstraint.pm b/lib/Mouse/Meta/TypeConstraint.pm
index 05b9c5f..2593b82 100644
--- a/lib/Mouse/Meta/TypeConstraint.pm
+++ b/lib/Mouse/Meta/TypeConstraint.pm
@@ -2,13 +2,20 @@ package Mouse::Meta::TypeConstraint;
 use Mouse::Util qw(:meta); # enables strict and warnings
 
 use overload
-    '""'     => sub { shift->{name} },   # stringify to tc name
-    fallback => 1;
+    'bool'   => sub { 1 },             # always true
+
+    '""'     => sub { $_[0]->name },   # stringify to tc name
+
+    '|'      => sub {                  # or-combination
+        require Mouse::Util::TypeConstraints;
+        return Mouse::Util::TypeConstraints::find_or_parse_type_constraint(
+            "$_[0] | $_[1]",
+        );
+    },
 
-use Carp qw(confess);
-use Scalar::Util qw(blessed reftype);
+    fallback => 1;
 
-my $null_check = sub { 1 };
+use Carp         ();
 
 sub new {
     my($class, %args) = @_;
@@ -17,13 +24,6 @@ sub new {
 
     my $check = delete $args{optimized};
 
-    if($args{_compiled_type_constraint}){
-        Carp::cluck("'_compiled_type_constraint' has been deprecated, use 'optimized' instead")
-            if _MOUSE_VERBOSE;
-
-        $check = $args{_compiled_type_constraint};
-    }
-
     if($check){
         $args{hand_optimized_type_constraint} = $check;
         $args{compiled_type_constraint}       = $check;
@@ -31,13 +31,8 @@ sub new {
 
     $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");
+        Carp::confess("Constraint for $args{name} is not a CODE reference");
     }
 
     $args{package_defined_in} ||= caller;
@@ -86,67 +81,14 @@ sub create_child_type{
    );
 }
 
-sub name    { $_[0]->{name}    }
-sub parent  { $_[0]->{parent}  }
-sub message { $_[0]->{message} }
-
-sub _compiled_type_constraint{ $_[0]->{compiled_type_constraint} }
-
-sub has_coercion{ exists $_[0]->{_compiled_type_coercion} }
-
-sub compile_type_constraint{
-    my($self) = @_;
-
-    # 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;
-        };
-    }
+sub name;
+sub parent;
+sub message;
+sub has_coercion;
+sub _compiled_type_constraint;
+sub _compiled_type_coercion;
 
-    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 compile_type_constraint;
 
 sub _add_type_coercions{
     my $self = shift;
@@ -159,30 +101,30 @@ sub _add_type_coercions{
         my $action = $_[++$i];
 
         if(exists $has{$from}){
-            confess("A coercion action already exists for '$from'");
+            Carp::confess("A coercion action already exists for '$from'");
         }
 
         my $type = Mouse::Util::TypeConstraints::find_or_parse_type_constraint($from)
-            or confess("Could not find the type constraint ($from) to coerce from");
+            or Carp::confess("Could not find the type constraint ($from) to coerce from");
 
         push @{$coercions}, [ $type => $action ];
     }
 
     # compile
     if(exists $self->{type_constraints}){ # union type
-        confess("Cannot add additional type coercions to Union types");
+        Carp::confess("Cannot add additional type coercions to Union types");
     }
     else{
         $self->{_compiled_type_coercion} = sub {
-           my($thing) = @_;
-           foreach my $pair (@{$coercions}) {
-                #my ($constraint, $converter) = @$pair;
-                if ($pair->[0]->check($thing)) {
+           my($thing) = @_;
+           foreach my $pair (@{$coercions}) {
+                #my ($constraint, $converter) = @$pair;
+                if ($pair->[0]->check($thing)) {
                   local $_ = $thing;
                   return $pair->[1]->($thing);
-                }
-           }
-           return $thing;
+                }
+           }
+           return $thing;
         };
     }
     return;
@@ -195,13 +137,15 @@ sub check {
 
 sub coerce {
     my $self = shift;
-    if(!$self->{_compiled_type_coercion}){
-        confess("Cannot coerce without a type coercion ($self)");
+
+    my $coercion = $self->_compiled_type_coercion;
+    if(!$coercion){
+        Carp::confess("Cannot coerce without a type coercion");
     }
 
     return $_[0] if $self->_compiled_type_constraint->(@_);
 
-    return $self->{_compiled_type_coercion}->(@_);
+    return  $coercion->(@_);
 }
 
 sub get_message {
@@ -220,7 +164,7 @@ sub is_a_type_of{
     my($self, $other) = @_;
 
     # ->is_a_type_of('__ANON__') is always false
-    return 0 if !blessed($other) && $other eq '__ANON__';
+    return 0 if !ref($other) && $other eq '__ANON__';
 
     (my $other_name = $other) =~ s/\s+//g;
 
@@ -239,6 +183,29 @@ sub is_a_type_of{
     return 0;
 }
 
+# See also Moose::Meta::TypeConstraint::Parameterizable
+sub parameterize{
+    my($self, $param, $name) = @_;
+
+    if(!ref $param){
+        require Mouse::Util::TypeConstraints;
+        $param = Mouse::Util::TypeConstraints::find_or_create_isa_type_constraint($param);
+    }
+
+    $name ||= sprintf '%s[%s]', $self->name, $param->name;
+
+    my $generator = $self->{constraint_generator}
+        || Carp::confess("The $name constraint cannot be used, because $param doesn't subtype from a parameterizable type");
+
+    return Mouse::Meta::TypeConstraint->new(
+        name        => $name,
+        parent      => $self,
+        parameter   => $param,
+        constraint  => $generator->($param), # must be 'constraint', not 'optimized'
+
+        type        => 'Parameterized',
+    );
+}
 
 1;
 __END__
@@ -249,7 +216,7 @@ Mouse::Meta::TypeConstraint - The Mouse Type Constraint metaclass
 
 =head1 VERSION
 
-This document describes Mouse version 0.37_06
+This document describes Mouse version 0.49
 
 =head1 DESCRIPTION