Simplify compile_type_constraint

[gitmo/Mouse.git] / lib / Mouse / Meta / TypeConstraint.pm

diff --git a/lib/Mouse/Meta/TypeConstraint.pm b/lib/Mouse/Meta/TypeConstraint.pm
index ca8671b..2e97406 100644 (file)
--- a/lib/Mouse/Meta/TypeConstraint.pm
+++ b/lib/Mouse/Meta/TypeConstraint.pm
@@ -2,7 +2,17 @@ package Mouse::Meta::TypeConstraint;
 use Mouse::Util qw(:meta); # enables strict and warnings
 
 use overload
+    '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]",
+        );
+    },
+
     fallback => 1;
 
 use Carp         ();
@@ -86,7 +96,7 @@ sub compile_type_constraint{
 
     # add parents first
     my @checks;
-    for(my $parent = $self->parent; defined $parent; $parent = $parent->parent){
+    for(my $parent = $self->{parent}; defined $parent; $parent = $parent->{parent}){
          if($parent->{hand_optimized_type_constraint}){
             unshift @checks, $parent->{hand_optimized_type_constraint};
             last; # a hand optimized constraint must include all the parents
@@ -102,7 +112,7 @@ sub compile_type_constraint{
     }
 
     if($self->{type_constraints}){ # Union
-        my @types = map{ $_->_compiled_type_constraint } @{ $self->{type_constraints} };
+        my @types = map{ $_->{compiled_type_constraint} } @{ $self->{type_constraints} };
         push @checks, sub{
             foreach my $c(@types){
                 return 1 if $c->($_[0]);
@@ -114,14 +124,6 @@ sub compile_type_constraint{
     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) = @_;
@@ -224,6 +226,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__
@@ -234,7 +259,7 @@ Mouse::Meta::TypeConstraint - The Mouse Type Constraint metaclass
 
 =head1 VERSION
 
-This document describes Mouse version 0.40_01
+This document describes Mouse version 0.40_03
 
 =head1 DESCRIPTION