X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FUtil%2FTypeConstraints.pm;h=404cb3652823c1f9f906a6eace360c0e19f4e9e4;hp=79d9040319ac9894df81e5f38ce1e62bf9f6e430;hb=f48920c11c806b2a1fd60be145ff2cdf79750878;hpb=43e49d9325893d1293ffbc7ba2f1e5b9312716fa diff --git a/lib/Mouse/Util/TypeConstraints.pm b/lib/Mouse/Util/TypeConstraints.pm index 79d9040..404cb36 100644 --- a/lib/Mouse/Util/TypeConstraints.pm +++ b/lib/Mouse/Util/TypeConstraints.pm @@ -74,14 +74,6 @@ BEGIN { sub list_all_type_constraints { keys %TYPE } } -# is-a predicates -BEGIN{ - _generate_class_type_for('Mouse::Meta::TypeConstraint' => '_is_a_type_constraint'); - _generate_class_type_for('Mouse::Meta::Class' => '_is_a_metaclass'); - _generate_class_type_for('Mouse::Meta::Role' => '_is_a_metarole'); -} - - sub _create_type{ my $mode = shift; @@ -163,7 +155,7 @@ sub class_type { my $class = $options->{class} || $name; return _create_type 'subtype', $name => ( as => 'Object', - optimized_as => _generate_class_type_for($class), + optimized_as => Mouse::Util::_generate_isa_predicate_for($class), type => 'Class', ); @@ -217,7 +209,7 @@ sub _find_or_create_regular_type{ my $meta = Mouse::Util::get_metaclass_by_name($spec) or return undef; - if(_is_a_metarole($meta)){ + if(Mouse::Util::is_a_metarole($meta)){ return role_type($spec); } else{ @@ -351,7 +343,7 @@ sub _parse_type{ sub find_type_constraint { my($spec) = @_; - return $spec if _is_a_type_constraint($spec); + return $spec if Mouse::Util::is_a_type_constraint($spec); $spec =~ s/\s+//g; return $TYPE{$spec}; @@ -359,7 +351,7 @@ sub find_type_constraint { sub find_or_parse_type_constraint { my($spec) = @_; - return $spec if _is_a_type_constraint($spec); + return $spec if Mouse::Util::is_a_type_constraint($spec); $spec =~ s/\s+//g; return $TYPE{$spec} || do{