X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FTypeConstraint%2FUnion.pm;h=14731988a44e1ebc2e3964c891a138880ad080cf;hb=4b7538e78407d5c3cdb60791fd8ff8a29948f14e;hp=2a24f22e060077f0962c15e908dbb758bbcd3474;hpb=d1e11f1b9587b09a4231416b7272c3787578730d;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/TypeConstraint/Union.pm b/lib/Moose/Meta/TypeConstraint/Union.pm
index 2a24f22..1473198 100644
--- a/lib/Moose/Meta/TypeConstraint/Union.pm
+++ b/lib/Moose/Meta/TypeConstraint/Union.pm
@@ -5,85 +5,74 @@ use strict;
 use warnings;
 use metaclass;
 
-our $VERSION   = '0.05';
+use Moose::Meta::TypeCoercion::Union;
+
+our $VERSION   = '0.57';
+$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
+use base 'Moose::Meta::TypeConstraint';
+
 __PACKAGE__->meta->add_attribute('type_constraints' => (
     accessor  => 'type_constraints',
     default   => sub { [] }
 ));
 
 sub new { 
-    my $class = shift;
-    my $self  = $class->meta->new_object(@_);
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(
+        name     => (join '|' => map { $_->name } @{$options{type_constraints}}),
+        parent   => undef,
+        message  => undef,
+        hand_optimized_type_constraint => undef,
+        compiled_type_constraint => sub {
+            my $value = shift;
+            foreach my $type (@{$options{type_constraints}}) {
+                return 1 if $type->check($value);
+            }
+            return undef;    
+        },
+        %options
+    );
+    $self->_set_constraint(sub { $self->check($_[0]) });
+    $self->coercion(Moose::Meta::TypeCoercion::Union->new(
+        type_constraint => $self
+    ));
     return $self;
 }
 
-sub name { join ' | ' => map { $_->name } @{$_[0]->type_constraints} }
+sub equals {
+    my ( $self, $type_or_name ) = @_;
 
-# NOTE:
-# this should probably never be used
-# but we include it here for completeness
-sub constraint    { 
-    my $self = shift;
-    sub { $self->check($_[0]) }; 
-}
+    my $other = Moose::Util::TypeConstraints::find_type_constraint($type_or_name);
 
-# conform to the TypeConstraint API
-sub parent        { undef  }
-sub message       { undef  }
-sub has_message   { 0      }
+    return unless $other->isa(__PACKAGE__);
 
-# FIXME:
-# not sure what this should actually do here
-sub coercion { undef  }
+    my @self_constraints  = @{ $self->type_constraints };
+    my @other_constraints = @{ $other->type_constraints };
 
-# this should probably be memoized
-sub has_coercion  {
-    my $self  = shift;
-    foreach my $type (@{$self->type_constraints}) {
-        return 1 if $type->has_coercion
-    }
-    return 0;    
-}
+    return unless @self_constraints == @other_constraints;
 
-# NOTE:
-# this feels too simple, and may not always DWIM
-# correctly, especially in the presence of 
-# close subtype relationships, however it should 
-# work for a fair percentage of the use cases
-sub coerce { 
-    my $self  = shift;
-    my $value = shift;
-    foreach my $type (@{$self->type_constraints}) {
-        if ($type->has_coercion) {
-            my $temp = $type->coerce($value);
-            return $temp if $self->check($temp);
+    # FIXME presort type constraints for efficiency?
+    constraint: foreach my $constraint ( @self_constraints ) {
+        for ( my $i = 0; $i < @other_constraints; $i++ ) {
+            if ( $constraint->equals($other_constraints[$i]) ) {
+                splice @other_constraints, $i, 1;
+                next constraint;
+            }
         }
     }
-    return undef;    
-}
 
-sub _compiled_type_constraint {
-    my $self  = shift;
-    return sub {
-        my $value = shift;
-        foreach my $type (@{$self->type_constraints}) {
-            return 1 if $type->check($value);
-        }
-        return undef;    
-    }
+    return @other_constraints == 0;
 }
 
-sub check {
-    my $self  = shift;
-    my $value = shift;
-    $self->_compiled_type_constraint->($value);
+sub parents {
+    my $self = shift;
+    $self->type_constraints;
 }
 
 sub validate {
-    my $self  = shift;
-    my $value = shift;
+    my ($self, $value) = @_;
     my $message;
     foreach my $type (@{$self->type_constraints}) {
         my $err = $type->validate($value);
@@ -110,20 +99,6 @@ sub is_subtype_of {
     return 0;
 }
 
-## hand optimized constraints 
-
-# NOTE:
-# it will just use all the hand optimized 
-# type constraints from it's list of type 
-# constraints automatically, but there is 
-# no simple way to optimize it even more 
-# (without B::Deparse or something). So  
-# we just stop here.
-# - SL
-
-sub has_hand_optimized_type_constraint { 0 }
-sub hand_optimized_type_constraint     { undef }
-
 1;
 
 __END__
@@ -137,7 +112,7 @@ Moose::Meta::TypeConstraint::Union - A union of Moose type constraints
 =head1 DESCRIPTION
 
 This metaclass represents a union of Moose type constraints. More 
-details to be explained later (possibly in a Cookbook::Recipe).
+details to be explained later (possibly in a Cookbook recipe).
 
 This actually used to be part of Moose::Meta::TypeConstraint, but it 
 is now better off in it's own file. 
@@ -157,8 +132,14 @@ but it does provide the same API
 
 =item B<type_constraints>
 
+=item B<parents>
+
 =item B<constraint>
 
+=item B<includes_type>
+
+=item B<equals>
+
 =back
 
 =head2 Overriden methods 
@@ -196,6 +177,10 @@ anyway. They are here for completeness.
 
 =item B<has_message>
 
+=item B<hand_optimized_type_constraint>
+
+=item B<has_hand_optimized_type_constraint>
+
 =back
 
 =head1 BUGS
@@ -210,7 +195,7 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006, 2007 by Infinity Interactive, Inc.
+Copyright 2006-2008 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>