X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FTypeConstraint.pm;h=02bb03dc4c93e9425ddcf868b87b687b8bf94ca3;hb=43a41edeb57c090ba7f7f2ad44e7d31c09edbefc;hp=7a7cddf4c62f2a81ff61d989764b320a90836987;hpb=d67145edcc2653d4936d9395e5d63405332b4c1b;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/TypeConstraint.pm b/lib/Moose/Meta/TypeConstraint.pm index 7a7cddf..02bb03d 100644 --- a/lib/Moose/Meta/TypeConstraint.pm +++ b/lib/Moose/Meta/TypeConstraint.pm @@ -5,24 +5,25 @@ use strict; use warnings; use metaclass; -use overload '""' => sub { shift->name }, # stringify to tc name - fallback => 1; +#use overload '""' => sub { shift->name }, # stringify to tc name +# fallback => 1; use Sub::Name 'subname'; use Carp 'confess'; use Scalar::Util 'blessed'; -our $VERSION = '0.09'; +our $VERSION = '0.10'; our $AUTHORITY = 'cpan:STEVAN'; -use Moose::Meta::TypeConstraint::Union; -use Moose::Meta::TypeConstraint::Container; - -__PACKAGE__->meta->add_attribute('name' => (reader => 'name' )); -__PACKAGE__->meta->add_attribute('parent' => (reader => 'parent' )); +__PACKAGE__->meta->add_attribute('name' => (reader => 'name')); +__PACKAGE__->meta->add_attribute('parent' => ( + reader => 'parent', + predicate => 'has_parent', +)); __PACKAGE__->meta->add_attribute('constraint' => ( - reader => 'constraint', - writer => '_set_constraint', + reader => 'constraint', + writer => '_set_constraint', + default => sub { sub { 1 } } )); __PACKAGE__->meta->add_attribute('message' => ( accessor => 'message', @@ -32,95 +33,33 @@ __PACKAGE__->meta->add_attribute('coercion' => ( accessor => 'coercion', predicate => 'has_coercion' )); - -# private accessor -__PACKAGE__->meta->add_attribute('compiled_type_constraint' => ( - accessor => '_compiled_type_constraint' -)); - __PACKAGE__->meta->add_attribute('hand_optimized_type_constraint' => ( init_arg => 'optimized', accessor => 'hand_optimized_type_constraint', - predicate => 'has_hand_optimized_type_constraint', + predicate => 'has_hand_optimized_type_constraint', +)); + +# private accessors + +__PACKAGE__->meta->add_attribute('compiled_type_constraint' => ( + accessor => '_compiled_type_constraint', + predicate => '_has_compiled_type_constraint' +)); +__PACKAGE__->meta->add_attribute('package_defined_in' => ( + accessor => '_package_defined_in' )); -sub new { +sub new { my $class = shift; my $self = $class->meta->new_object(@_); - $self->compile_type_constraint(); + $self->compile_type_constraint() + unless $self->_has_compiled_type_constraint; return $self; } -sub coerce { - ((shift)->coercion || confess "Cannot coerce without a type coercion")->coerce(@_) -} - -sub _collect_all_parents { - my $self = shift; - my @parents; - my $current = $self->parent; - while (defined $current) { - push @parents => $current; - $current = $current->parent; - } - return @parents; -} - -sub compile_type_constraint { - my $self = shift; - - if ($self->has_hand_optimized_type_constraint) { - my $type_constraint = $self->hand_optimized_type_constraint; - $self->_compiled_type_constraint(sub { - return undef unless $type_constraint->($_[0]); - return 1; - }); - return; - } - - my $check = $self->constraint; - (defined $check) - || confess "Could not compile type constraint '" . $self->name . "' because no constraint check"; - my $parent = $self->parent; - if (defined $parent) { - # we have a subtype ... - # so we gather all the parents in order - # and grab their constraints ... - my @parents; - foreach my $parent ($self->_collect_all_parents) { - if ($parent->has_hand_optimized_type_constraint) { - unshift @parents => $parent->hand_optimized_type_constraint; - last; - } - else { - unshift @parents => $parent->constraint; - } - } - - # then we compile them to run without - # having to recurse as we did before - $self->_compiled_type_constraint(subname $self->name => sub { - local $_ = $_[0]; - foreach my $parent (@parents) { - return undef unless $parent->($_[0]); - } - return undef unless $check->($_[0]); - 1; - }); - } - else { - # we have a type .... - $self->_compiled_type_constraint(subname $self->name => sub { - local $_ = $_[0]; - return undef unless $check->($_[0]); - 1; - }); - } -} - -sub check { $_[0]->_compiled_type_constraint->($_[1]) } - -sub validate { +sub coerce { ((shift)->coercion || confess "Cannot coerce without a type coercion")->coerce(@_) } +sub check { $_[0]->_compiled_type_constraint->($_[1]) } +sub validate { my ($self, $value) = @_; if ($self->_compiled_type_constraint->($value)) { return undef; @@ -136,6 +75,8 @@ sub validate { } } +## type predicates ... + sub is_a_type_of { my ($self, $type_name) = @_; ($self->name eq $type_name || $self->is_subtype_of($type_name)); @@ -151,18 +92,99 @@ sub is_subtype_of { return 0; } -sub union { - my ($class, @type_constraints) = @_; - (scalar @type_constraints >= 2) - || confess "You must pass in at least 2 Moose::Meta::TypeConstraint instances to make a union"; - (blessed($_) && $_->isa('Moose::Meta::TypeConstraint')) - || confess "You must pass in only Moose::Meta::TypeConstraint instances to make unions" - foreach @type_constraints; - return Moose::Meta::TypeConstraint::Union->new( - type_constraints => \@type_constraints, - ); +## compiling the type constraint + +sub compile_type_constraint { + my $self = shift; + $self->_compiled_type_constraint($self->_actually_compile_type_constraint); } +## type compilers ... + +sub _actually_compile_type_constraint { + my $self = shift; + + return $self->_compile_hand_optimized_type_constraint + if $self->has_hand_optimized_type_constraint; + + my $check = $self->constraint; + (defined $check) + || confess "Could not compile type constraint '" + . $self->name + . "' because no constraint check"; + + return $self->_compile_subtype($check) + if $self->has_parent; + + return $self->_compile_type($check); +} + +sub _compile_hand_optimized_type_constraint { + my $self = shift; + + my $type_constraint = $self->hand_optimized_type_constraint; + + return sub { + confess unless ref $type_constraint; + return undef unless $type_constraint->($_[0]); + return 1; + }; +} + +sub _compile_subtype { + my ($self, $check) = @_; + + # so we gather all the parents in order + # and grab their constraints ... + my @parents; + foreach my $parent ($self->_collect_all_parents) { + if ($parent->has_hand_optimized_type_constraint) { + unshift @parents => $parent->hand_optimized_type_constraint; + last; + } + else { + unshift @parents => $parent->constraint; + } + } + + # then we compile them to run without + # having to recurse as we did before + return subname $self->name => sub { + local $_ = $_[0]; + foreach my $parent (@parents) { + return undef unless $parent->($_[0]); + } + return undef unless $check->($_[0]); + 1; + }; +} + +sub _compile_type { + my ($self, $check) = @_; + return subname $self->name => sub { + local $_ = $_[0]; + return undef unless $check->($_[0]); + 1; + }; +} + +## other utils ... + +sub _collect_all_parents { + my $self = shift; + my @parents; + my $current = $self->parent; + while (defined $current) { + push @parents => $current; + $current = $current->parent; + } + return @parents; +} + +## this should get deprecated actually ... + +sub union { die "DEPRECATED" } + 1; __END__ @@ -175,13 +197,13 @@ Moose::Meta::TypeConstraint - The Moose Type Constraint metaclass =head1 DESCRIPTION -For the most part, the only time you will ever encounter an -instance of this class is if you are doing some serious deep -introspection. This API should not be considered final, but -it is B that this will matter to a regular +For the most part, the only time you will ever encounter an +instance of this class is if you are doing some serious deep +introspection. This API should not be considered final, but +it is B that this will matter to a regular Moose user. -If you wish to use features at this depth, please come to the +If you wish to use features at this depth, please come to the #moose IRC channel on irc.perl.org and we can talk :) =head1 METHODS @@ -194,7 +216,7 @@ If you wish to use features at this depth, please come to the =item B -This checks the current type name, and if it does not match, +This checks the current type name, and if it does not match, checks if it is a subtype of it. =item B @@ -207,20 +229,22 @@ This will apply the type-coercion if applicable. =item B -This method will return a true (C<1>) if the C<$value> passes the +This method will return a true (C<1>) if the C<$value> passes the constraint, and false (C<0>) otherwise. =item B -This method is similar to C, but it deals with the error -message. If the C<$value> passes the constraint, C will be -returned. If the C<$value> does B pass the constraint, then -the C will be used to construct a custom error message. +This method is similar to C, but it deals with the error +message. If the C<$value> passes the constraint, C will be +returned. If the C<$value> does B pass the constraint, then +the C will be used to construct a custom error message. =item B =item B +=item B + =item B =item B @@ -237,15 +261,20 @@ the C will be used to construct a custom error message. =back +=head2 DEPRECATED METHOD + =over 4 -=item B +=item B + +This was just bad idea on my part,.. use the L +itself instead. =back =head1 BUGS -All complex software has bugs lurking in it, and this module is no +All complex software has bugs lurking in it, and this module is no exception. If you find a bug please either email me, or add the bug to cpan-RT. @@ -255,11 +284,11 @@ Stevan Little Estevan@iinteractive.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006, 2007 by Infinity Interactive, Inc. +Copyright 2006-2008 by Infinity Interactive, Inc. L This library is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. +it under the same terms as Perl itself. =cut