From: Kent Fredric <kentfredric@gmail.com>
Date: Wed, 17 Aug 2011 02:16:14 +0000 (+1200)
Subject: Update the Intersection TC package to more closely reflect the Union TC package,... 
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=fc148ee82ef69706639db6412d135b3eaf1743a0;p=gitmo%2FMoose.git

Update the Intersection TC package to more closely reflect the Union TC package, and pass its tests
---

diff --git a/lib/Moose/Meta/TypeConstraint/Intersection.pm b/lib/Moose/Meta/TypeConstraint/Intersection.pm
index 9655bc1..c4cd3c1 100644
--- a/lib/Moose/Meta/TypeConstraint/Intersection.pm
+++ b/lib/Moose/Meta/TypeConstraint/Intersection.pm
@@ -7,34 +7,26 @@ use metaclass;
 
 use Moose::Meta::TypeCoercion::Intersection;
 
-our $VERSION   = '0.70';
-$VERSION = eval $VERSION;
-our $AUTHORITY = 'cpan:STEVAN';
+use List::Util qw(first);
+use List::MoreUtils qw(all);
 
 use base 'Moose::Meta::TypeConstraint';
 
 __PACKAGE__->meta->add_attribute('type_constraints' => (
     accessor  => 'type_constraints',
-    default   => sub { [] }
+    default   => sub { [] },
+    Class::MOP::_definition_context(),
 ));
 
 sub new {
     my ($class, %options) = @_;
+
+    my $name = join '&' => sort {$a cmp $b}
+         map { $_->name } @{$options{type_constraints}};
+
     my $self = $class->SUPER::new(
-        name     => (join '&' => sort {$a cmp $b}
-                     map { $_->name } @{$options{type_constraints}}),
-        parent   => undef,
-        message  => undef,
-        hand_optimized_type_constraint => undef,
-        compiled_type_constraint => sub {
-            my $value = shift;
-            my $count = 0;
-            foreach my $type (@{$options{type_constraints}}) {
-                $count++ if $type->check($value);
-            }
-            return $count == scalar @{$options{type_constraints}} ? 1 : undef;
-        },
-        %options
+        name     => $name,
+        %options,
     );
     $self->_set_constraint(sub { $self->check($_[0]) });
     $self->coercion(Moose::Meta::TypeCoercion::Intersection->new(
@@ -43,6 +35,44 @@ sub new {
     return $self;
 }
 
+sub _actually_compile_type_constraint {
+    my $self = shift;
+
+    my @constraints = @{ $self->type_constraints };
+
+    return sub {
+      my $value = shift;
+      my $count = 0;
+      foreach my $type (@constraints){
+        $count++ if $type->check($value);
+      }
+      return $count==scalar @constraints ? 1: undef;
+    };
+}
+
+sub can_be_inlined {
+    my $self = shift;
+    for my $tc ( @{ $self->type_constraints }) {
+      return 0 unless $tc->can_be_inlined;
+    }
+    return 1;
+}
+
+sub _inline_check {
+    my $self = shift;
+    my $val  = shift;
+    return '(' .
+      (
+        join ' && ' , map { '(' . $_->_inline_check($val) . ')' } @{ $self->type_constraints }
+      ) . ')';
+}
+
+sub inline_environment {
+    my $self = shift;
+
+    return { map { %{ $_->inline_environment } } @{ $self->type_constraints } };
+}
+
 sub equals {
     my ( $self, $type_or_name ) = @_;
 
@@ -85,6 +115,11 @@ sub validate {
     return ($message . ' in (' . $self->name . ')') ;
 }
 
+sub find_type_for {
+    my ($self, $value) = @_;
+    return first { $_->check($value) } @{ $self->type_constraints };
+}
+
 sub is_a_type_of {
     my ($self, $type_name) = @_;
     foreach my $type (@{$self->type_constraints}) {