X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FTypeConstraint%2FParameterized.pm;h=42b949e501d48344c6f1eb7b2b52becfff967b53;hb=df8260e9a27a9d7532a21525223975fcf8e26562;hp=1eaba7dec9b0665b170b65bf45ed19c2f67b6c4d;hpb=0fbd4b0a825a44f70a4e8537f50712dafac3c938;p=gitmo%2FMoose.git
diff --git a/lib/Moose/Meta/TypeConstraint/Parameterized.pm b/lib/Moose/Meta/TypeConstraint/Parameterized.pm
index 1eaba7d..42b949e 100644
--- a/lib/Moose/Meta/TypeConstraint/Parameterized.pm
+++ b/lib/Moose/Meta/TypeConstraint/Parameterized.pm
@@ -5,9 +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.63';
+$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
use base 'Moose::Meta::TypeConstraint';
@@ -17,42 +19,47 @@ __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";
+ || 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 $parent_name = $self->parent->name;
-
- if ($parent_name eq 'ArrayRef') {
- $constraint = sub {
- foreach my $x (@$_) {
- ($type_parameter->check($x)) || return
- } 1;
- };
- }
- elsif ($parent_name eq 'HashRef') {
- $constraint = sub {
- foreach my $x (values %$_) {
- ($type_parameter->check($x)) || return
- } 1;
- };
- }
- else {
- confess "Your isa must be either ArrayRef or HashRef (sorry no subtype support yet)";
+ || Moose->throw_error("The type parameter must be a Moose meta type");
+
+ 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
+ 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;
@@ -66,8 +73,6 @@ __END__
Moose::Meta::TypeConstraint::Parameterized - Higher Order type constraints for Moose
-=head1 DESCRIPTION
-
=head1 METHODS
=over 4
@@ -80,6 +85,10 @@ Moose::Meta::TypeConstraint::Parameterized - Higher Order type constraints for M
=item B
+=item B
+
+=item B
+
=back
=head1 BUGS
@@ -94,7 +103,7 @@ Stevan Little Estevan@iinteractive.comE
=head1 COPYRIGHT AND LICENSE
-Copyright 2006, 2007 by Infinity Interactive, Inc.
+Copyright 2006-2008 by Infinity Interactive, Inc.
L