if( ! exists $self->attributes->{Args} ) {
# When 'Args' does not exist, that means we want 'any number of args'.
return undef;
- } elsif(!defined($self->attributes->{Args}[0])) {
+ } elsif(
+ !defined($self->attributes->{Args}[0]) ||
+ $self->attributes->{Args}[0] eq '' ) {
# When its 'Args' that internal cue for 'unlimited'
return undef;
} elsif(
return 1; # Its a normal 1 arg type constraint.
}
} else {
- # We need to loop thru and error on ref types. We don't allow a ref type
+ # We need to loop through and error on ref types. We don't allow a ref type
# in the middle.
my $total = 0;
foreach my $tc( @{$self->args_constraints}) {
return [] unless scalar(@arg_protos);
return [] unless defined($arg_protos[0]);
+ return [] if ($arg_protos[0] eq '' && scalar(@arg_protos) == 1);
# If there is only one arg and it looks like a number
# we assume its 'classic' and the number is the number of
return 1; # Its a normal 1 arg type constraint.
}
} else {
- # We need to loop thru and error on ref types. We don't allow a ref type
+ # We need to loop through and error on ref types. We don't allow a ref type
# in the middle.
my $total = 0;
foreach my $tc( @{$self->captures_constraints}) {
return $name;
}
+ # This is broken for when there is more than one constraint
if($name=~m/::/) {
eval "use Type::Registry; 1" || die "Can't resolve type constraint $name without installing Type::Tiny";
my $tc = Type::Registry->new->foreign_lookup($name);
- return defined $tc ? $tc : die "'$name' not a type constraint in ${\$self->private_path}";
+ return defined $tc ? $tc : die "'$name' not a full namespace type constraint in ${\$self->private_path}";
}
+
+ my @tc = grep { defined $_ } (eval("package ${\$self->class}; $name"));
- my @tc = eval "package ${\$self->class}; $name" or do {
+ unless(scalar @tc) {
# ok... so its not defined in the package. we need to look at all the roles
# and superclasses, look for attributes and figure it out.
# Superclasses take precedence;
- #
- my @supers = map { $_->meta } $self->class->meta->superclasses;
- my @roles = $self->class->meta->calculate_all_roles;
- # So look thru all the super and roles in order and return the
+ my @supers = $self->class->can('meta') ? map { $_->meta } $self->class->meta->superclasses : ();
+ my @roles = $self->class->can('meta') ? $self->class->meta->calculate_all_roles : ();
+
+ # So look through all the super and roles in order and return the
# first type constraint found. We should probably find all matching
# type constraints and try to do some sort of resolution.
@{$m->attributes};
next unless $value eq $name;
my @tc = eval "package ${\$parent->name}; $name";
- return @tc if @tc;
- }
+ if(scalar(@tc)) {
+ return map { ref($_) ? $_ : Moose::Util::TypeConstraints::find_or_parse_type_constraint($_) } @tc;
+ } else {
+ return;
+ }
+ }
}
}
+
+ my $classes = join(',', $self->class, @roles, @supers);
+ die "'$name' not a type constraint in '${\$self->private_path}', Looked in: $classes";
+ }
- die "'$name' not a type constraint in ${\$self->private_path}";
- };
-
- if($tc[0]) {
+ if(scalar(@tc)) {
return map { ref($_) ? $_ : Moose::Util::TypeConstraints::find_or_parse_type_constraint($_) } @tc;
} else {
return;
=head2 resolve_type_constraint
-Trys to find a type constraint if you have on on a type constrained method.
+Tries to find a type constraint if you have on on a type constrained method.
=head2 compare