X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FTypeConstraint.pm;h=c0c425e98ba32cf97882643131075ffae981b717;hp=3d2f19525096dc636fa2260ee1879d93709da100;hb=506fb74dbff3e8f756230c643d8bff7b85ae9ca3;hpb=5a363f78184c2c5ab4eeeaec0cf2dba9487f0d8e diff --git a/lib/Mouse/Meta/TypeConstraint.pm b/lib/Mouse/Meta/TypeConstraint.pm index 3d2f195..c0c425e 100644 --- a/lib/Mouse/Meta/TypeConstraint.pm +++ b/lib/Mouse/Meta/TypeConstraint.pm @@ -17,8 +17,6 @@ use overload use Carp (); -my $null_check = sub { 1 }; - sub new { my($class, %args) = @_; @@ -28,7 +26,7 @@ sub new { if($args{_compiled_type_constraint}){ Carp::cluck("'_compiled_type_constraint' has been deprecated, use 'optimized' instead") - if _MOUSE_VERBOSE; + if Mouse::Util::_MOUSE_VERBOSE; $check = $args{_compiled_type_constraint}; } @@ -90,61 +88,6 @@ sub create_child_type{ ); } - -sub compile_type_constraint{ - my($self) = @_; - - # add parents first - my @checks; - for(my $parent = $self->parent; defined $parent; $parent = $parent->parent){ - if($parent->{hand_optimized_type_constraint}){ - unshift @checks, $parent->{hand_optimized_type_constraint}; - last; # a hand optimized constraint must include all the parents - } - elsif($parent->{constraint}){ - unshift @checks, $parent->{constraint}; - } - } - - # then add child - if($self->{constraint}){ - push @checks, $self->{constraint}; - } - - if($self->{type_constraints}){ # Union - my @types = map{ $_->_compiled_type_constraint } @{ $self->{type_constraints} }; - push @checks, sub{ - foreach my $c(@types){ - return 1 if $c->($_[0]); - } - return 0; - }; - } - - if(@checks == 0){ - $self->{compiled_type_constraint} = $null_check; - } - elsif(@checks == 1){ - my $c = $checks[0]; - $self->{compiled_type_constraint} = sub{ - my(@args) = @_; - local $_ = $args[0]; - return $c->(@args); - }; - } - else{ - $self->{compiled_type_constraint} = sub{ - my(@args) = @_; - local $_ = $args[0]; - foreach my $c(@checks){ - return undef if !$c->(@args); - } - return 1; - }; - } - return; -} - sub _add_type_coercions{ my $self = shift; @@ -267,7 +210,7 @@ Mouse::Meta::TypeConstraint - The Mouse Type Constraint metaclass =head1 VERSION -This document describes Mouse version 0.40_03 +This document describes Mouse version 0.40_09 =head1 DESCRIPTION