X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FTypeConstraint%2FParameterized.pm;h=e71881cf8d7c34c724b0ecf74a590f5ec57badfa;hb=462a3e15a74078a0544eeeba2ebe1efd26ac2327;hp=702050727764c35ede3270f19155b8f33354721d;hpb=28412c0b280c30cfd1eac1579b9f5953b5e1850e;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/TypeConstraint/Parameterized.pm b/lib/Moose/Meta/TypeConstraint/Parameterized.pm
index 7020507..e71881c 100644
--- a/lib/Moose/Meta/TypeConstraint/Parameterized.pm
+++ b/lib/Moose/Meta/TypeConstraint/Parameterized.pm
@@ -8,7 +8,7 @@ use Scalar::Util 'blessed';
 use Carp         'confess';
 use Moose::Util::TypeConstraints;
 
-our $VERSION   = '0.02';
+our $VERSION   = '0.55';
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Moose::Meta::TypeConstraint';
@@ -18,6 +18,20 @@ __PACKAGE__->meta->add_attribute('type_parameter' => (
     predicate => 'has_type_parameter',
 ));
 
+sub equals {
+    my ( $self, $type_or_name ) = @_;
+
+    my $other = Moose::Util::TypeConstraints::find_type_constraint($type_or_name);
+
+    return unless $other->isa(__PACKAGE__);
+    
+    return (
+        $self->type_parameter->equals( $other->type_parameter )
+            and
+        $self->parent->equals( $other->parent )
+    );
+}
+
 sub compile_type_constraint {
     my $self = shift;
     
@@ -28,65 +42,18 @@ sub compile_type_constraint {
     
     (blessed $type_parameter && $type_parameter->isa('Moose::Meta::TypeConstraint'))
         || confess "The type parameter must be a Moose meta type";
-    
-    my $constraint;
-    my $name = $self->parent->name;
-
-    my $array_coercion =
-        Moose::Util::TypeConstraints::find_type_constraint('ArrayRef')
-        ->coercion;
-
-    my $hash_coercion =
-        Moose::Util::TypeConstraints::find_type_constraint('HashRef')
-        ->coercion;
-
-    # ArrayRef[Foo] will check each element for the Foo constraint
-    my $array_constraint = sub {
-        foreach my $x (@$_) {
-            ($type_parameter->check($x)) || return
-        } 1;
-    };
-
-    # HashRef[Foo] will check each value for the Foo constraint
-    my $hash_constraint = sub {
-        foreach my $x (values %$_) {
-            ($type_parameter->check($x)) || return
-        } 1;
-    };
-
-    # if this is a subtype of ArrayRef, then we can use the ArrayRef[Foo]
-    # constraint directly
-    if ($self->is_subtype_of('ArrayRef')) {
-        $constraint = $array_constraint;
-    }
-    # if this is a subtype of HashRef, then we can use the HashRef[Foo]
-    # constraint directly
-    elsif ($self->is_subtype_of('HashRef')) {
-        $constraint = $hash_constraint;
-    }
-    # if we can coerce this type to an ArrayRef, do it and use the regular
-    # ArrayRef[Foo] constraint
-    elsif ($array_coercion && $array_coercion->has_coercion_for_type($name)) {
-        $constraint = sub {
-            local $_ = $array_coercion->coerce($_);
-            $array_constraint->(@_);
-        };
-    }
-    # if we can coerce this type to a HashRef, do it and use the regular
-    # HashRef[Foo] constraint
-    elsif ($hash_coercion && $hash_coercion->has_coercion_for_type($name)) {
-        $constraint = sub {
-            local $_ = $hash_coercion->coerce($_);
-            $hash_constraint->(@_);
-        };
-    }
-    else {
-        confess "The " . $self->name . " constraint cannot be used, because " . $name . " doesn't subtype or coerce ArrayRef or HashRef.";
+
+    foreach my $type (Moose::Util::TypeConstraints::get_all_parameterizable_types()) {
+        if (my $constraint = $type->generate_constraint_for($self)) {
+            $self->_set_constraint($constraint);
+            return $self->SUPER::compile_type_constraint;            
+        }
     }
     
-    $self->_set_constraint($constraint);
-    
-    $self->SUPER::compile_type_constraint;
+    # if we get here, then we couldn't 
+    # find a way to parameterize this type
+    confess "The " . $self->name . " constraint cannot be used, because " 
+          . $self->parent->name . " doesn't subtype or coerce from a parameterizable type.";
 }
 
 1;
@@ -112,6 +79,8 @@ Moose::Meta::TypeConstraint::Parameterized - Higher Order type constraints for M
 
 =item B<meta>
 
+=item B<equals>
+
 =back
 
 =head1 BUGS