X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FTypeConstraint.pm;h=cc12df9971bb886cbf93b5aedd04b93ea2328639;hb=c32c2c61eb96d01d5e41f479b191c5f62b9b798d;hp=1ae35e2cf8351691d45fc99be80ebd9314b0661b;hpb=b26e162e732896d5965cda7e6f633e9718855944;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/TypeConstraint.pm b/lib/Moose/Meta/TypeConstraint.pm index 1ae35e2..cc12df9 100644 --- a/lib/Moose/Meta/TypeConstraint.pm +++ b/lib/Moose/Meta/TypeConstraint.pm @@ -5,15 +5,26 @@ use strict; use warnings; use metaclass; +use overload '""' => sub { shift->name }, # stringify to tc name + fallback => 1; + use Sub::Name 'subname'; use Carp 'confess'; -use Scalar::Util 'blessed'; +use Scalar::Util qw(blessed refaddr); -our $VERSION = '0.04'; +our $VERSION = '0.12'; +our $AUTHORITY = 'cpan:STEVAN'; -__PACKAGE__->meta->add_attribute('name' => (reader => 'name' )); -__PACKAGE__->meta->add_attribute('parent' => (reader => 'parent' )); -__PACKAGE__->meta->add_attribute('constraint' => (reader => 'constraint')); +__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', + default => sub { sub { 1 } } +)); __PACKAGE__->meta->add_attribute('message' => ( accessor => 'message', predicate => 'has_message' @@ -22,147 +33,198 @@ __PACKAGE__->meta->add_attribute('coercion' => ( accessor => 'coercion', predicate => 'has_coercion' )); +__PACKAGE__->meta->add_attribute('hand_optimized_type_constraint' => ( + init_arg => 'optimized', + accessor => 'hand_optimized_type_constraint', + predicate => 'has_hand_optimized_type_constraint', +)); + +sub parents { + my $self; + $self->parent; +} + +# private accessors -# private accessor __PACKAGE__->meta->add_attribute('compiled_type_constraint' => ( - accessor => '_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 compile_type_constraint { - my $self = shift; - 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 ... - $parent = $parent->_compiled_type_constraint; - $self->_compiled_type_constraint(subname $self->name => sub { - local $_ = $_[0]; - return undef unless defined $parent->($_[0]) && $check->($_[0]); - 1; - }); +sub coerce { ((shift)->coercion || confess "Cannot coerce without a type coercion")->coerce(@_) } +sub check { $_[0]->_compiled_type_constraint->($_[1]) ? 1 : undef } +sub validate { + my ($self, $value) = @_; + if ($self->_compiled_type_constraint->($value)) { + return undef; } else { - # we have a type .... - $self->_compiled_type_constraint(subname $self->name => sub { - local $_ = $_[0]; - return undef unless $check->($_[0]); - 1; - }); + $self->get_message($value); } } -sub check { $_[0]->_compiled_type_constraint->($_[1]) } - -sub validate { +sub get_message { my ($self, $value) = @_; - if ($self->_compiled_type_constraint->($value)) { - return undef; + $value = (defined $value ? overload::StrVal($value) : 'undef'); + if (my $msg = $self->message) { + local $_ = $value; + return $msg->($value); } else { - if ($self->has_message) { - local $_ = $value; - return $self->message->($value); - } - else { - return "Validation failed for '" . $self->name . "' failed"; - } + return "Validation failed for '" . $self->name . "' failed with value $value"; + } +} + +## type predicates ... + +sub equals { + my ( $self, $type_or_name ) = @_; + + my $other = Moose::Util::TypeConstraints::find_type_constraint($type_or_name); + + return 1 if refaddr($self) == refaddr($other); + + if ( $self->has_hand_optimized_type_constraint and $other->has_hand_optimized_type_constraint ) { + return 1 if $self->hand_optimized_type_constraint == $other->hand_optimized_type_constraint; + } + + return unless $self->constraint == $other->constraint; + + if ( $self->has_parent ) { + return unless $other->has_parent; + return unless $self->parent->equals( $other->parent ); + } else { + return if $other->has_parent; } + + return 1; } sub is_a_type_of { - my ($self, $type_name) = @_; - ($self->name eq $type_name || $self->is_subtype_of($type_name)); + my ($self, $type_or_name) = @_; + + my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name); + + ($self->equals($type) || $self->is_subtype_of($type)); } sub is_subtype_of { - my ($self, $type_name) = @_; + my ($self, $type_or_name) = @_; + + my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name); + my $current = $self; + while (my $parent = $current->parent) { - return 1 if $parent->name eq $type_name; + return 1 if $parent->equals($type); $current = $parent; } + 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); } -package Moose::Meta::TypeConstraint::Union; +## type compilers ... -use strict; -use warnings; -use metaclass; +sub _actually_compile_type_constraint { + my $self = shift; -our $VERSION = '0.01'; + return $self->_compile_hand_optimized_type_constraint + if $self->has_hand_optimized_type_constraint; -__PACKAGE__->meta->add_attribute('type_constraints' => ( - accessor => 'type_constraints', - default => sub { [] } -)); + my $check = $self->constraint; + (defined $check) + || confess "Could not compile type constraint '" + . $self->name + . "' because no constraint check"; -sub new { - my $class = shift; - my $self = $class->meta->new_object(@_); - return $self; -} + return $self->_compile_subtype($check) + if $self->has_parent; -sub name { join ' | ' => map { $_->name } @{$_[0]->type_constraints} } + return $self->_compile_type($check); +} -# NOTE: -# this should probably never be used -# but we include it here for completeness -sub constraint { +sub _compile_hand_optimized_type_constraint { my $self = shift; - sub { $self->check($_[0]) }; + + my $type_constraint = $self->hand_optimized_type_constraint; + + confess unless ref $type_constraint; + + return $type_constraint; } -# conform to the TypeConstraint API -sub parent { undef } -sub coercion { undef } -sub has_coercion { 0 } -sub message { undef } -sub has_message { 0 } - -sub check { - my $self = shift; - my $value = shift; - foreach my $type (@{$self->type_constraints}) { - return 1 if $type->check($value); +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; + } } - return undef; + + # 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 validate { - my $self = shift; - my $value = shift; - my $message; - foreach my $type (@{$self->type_constraints}) { - my $err = $type->validate($value); - return unless defined $err; - $message .= ($message ? ' and ' : '') . $err - if defined $err; +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 ($message . ' in (' . $self->name . ')') ; + return @parents; } +## this should get deprecated actually ... + +sub union { Carp::croak "DEPRECATED" } + 1; __END__ @@ -175,13 +237,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 @@ -192,52 +254,73 @@ If you wish to use features at this depth, please come to the =item B -=item B +=item B + +=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 +=item B =item B +=item B + +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 =item B =item B +=item B + =item B =item B +=item B + +=item B + =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. @@ -247,11 +330,11 @@ Stevan Little Estevan@iinteractive.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006 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 \ No newline at end of file +=cut