X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FTypeConstraint%2FParameterized.pm;h=ac119ec86a44fcb2b4cb24e03e83945e2f4f2795;hb=0aca6c894339607ab07bc40a508ab47129f0f1ec;hp=68d1b4da8f92934fd2e3ee87745f8a9e9ea63fa5;hpb=acb8a5dbf003dd584c09b3e62f24484ccdeeeb80;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/TypeConstraint/Parameterized.pm b/lib/Moose/Meta/TypeConstraint/Parameterized.pm
index 68d1b4d..ac119ec 100644
--- a/lib/Moose/Meta/TypeConstraint/Parameterized.pm
+++ b/lib/Moose/Meta/TypeConstraint/Parameterized.pm
@@ -5,10 +5,11 @@ use warnings;
 use metaclass;
 
 use Scalar::Util 'blessed';
-use Carp         'confess';
 use Moose::Util::TypeConstraints;
+use Moose::Meta::TypeConstraint::Parameterizable;
 
-our $VERSION   = '0.01';
+our $VERSION   = '0.74';
+$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Moose::Meta::TypeConstraint';
@@ -18,65 +19,52 @@ __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;
     
-    ($self->has_type_parameter)
-        || confess "You cannot create a Higher Order type without a type parameter";
-        
+    unless ( $self->has_type_parameter ) {
+        require Moose;
+        Moose->throw_error("You cannot create a Higher Order type without a type parameter");
+    }
+
     my $type_parameter = $self->type_parameter;
     
-    (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;
-
-    my $array_constraint = sub {
-        foreach my $x (@$_) {
-            ($type_parameter->check($x)) || return
-        } 1;
-    };
-
-    my $hash_constraint = sub {
-        foreach my $x (values %$_) {
-            ($type_parameter->check($x)) || return
-        } 1;
-    };
-
-    if ($self->is_subtype_of('ArrayRef')) {
-        $constraint = $array_constraint;
-    }
-    elsif ($self->is_subtype_of('HashRef')) {
-        $constraint = $hash_constraint;
-    }
-    elsif ($array_coercion && $array_coercion->has_coercion_for_type($name)) {
-        $constraint = sub {
-            local $_ = $array_coercion->coerce($_);
-            $array_constraint->(@_);
-        };
+    unless ( blessed $type_parameter && $type_parameter->isa('Moose::Meta::TypeConstraint') ) {
+        require Moose;
+        Moose->throw_error("The type parameter must be a Moose meta type");
     }
-    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
+    require Moose;
+    Moose->throw_error("The " . $self->name . " constraint cannot be used, because " 
+          . $self->parent->name . " doesn't subtype or coerce from a parameterizable type.");
+}
+
+sub create_child_type {
+    my ($self, %opts) = @_;
+    return Moose::Meta::TypeConstraint::Parameterizable->new(%opts, parent=>$self);
 }
 
 1;
@@ -88,23 +76,17 @@ __END__
 
 =head1 NAME
 
-Moose::Meta::TypeConstraint::Parameterized - Higher Order type constraints for Moose
-
-=head1 DESCRIPTION
+Moose::Meta::TypeConstraint::Parameterized - Type constraints with a bound parameter (ArrayRef[Int])
 
 =head1 METHODS
 
-=over 4
-
-=item B<compile_type_constraint>
-
-=item B<type_parameter>
-
-=item B<has_type_parameter>
+This class is intentionally not documented because the API is
+confusing and needs some work.
 
-=item B<meta>
+=head1 INHERITANCE
 
-=back
+C<Moose::Meta::TypeConstraint::Parameterized> is a subclass of
+L<Moose::Meta::TypeConstraint>.
 
 =head1 BUGS
 
@@ -118,7 +100,7 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006, 2007 by Infinity Interactive, Inc.
+Copyright 2006-2009 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>