}
sub normalized_arg_number {
+ return $_[0]->number_of_args;
+}
+
+sub comparable_arg_number {
return defined($_[0]->number_of_args) ? $_[0]->number_of_args : ~0;
}
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}) {
handles => {
has_args_constraints => 'count',
args_constraint_count => 'count',
+ all_args_constraints => 'elements',
});
sub _build_args_constraints {
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}) {
handles => {
has_captures_constraints => 'count',
captures_constraints_count => 'count',
+ all_captures_constraints => 'elements',
});
sub _build_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 = $self->class->can('meta') ? map { $_->meta } $self->class->meta->superclasses : ();
my @roles = $self->class->can('meta') ? $self->class->meta->calculate_all_roles : ();
- # So look thru all the super and roles in order and return the
+ # 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.
-
- warn "--> Hunting for TC $name in controller hierarchy\n" if $ENV{CATALYST_CONSTRAINTS_DEBUG};
foreach my $parent (@roles, @supers) {
- warn " Looking for TC $name in ${\$parent->name}\n" if $ENV{CATALYST_CONSTRAINTS_DEBUG};
if(my $m = $parent->get_method($self->name)) {
if($m->can('attributes')) {
- warn " method $m has attributes\n" if $ENV{CATALYST_CONSTRAINTS_DEBUG};
my ($key, $value) = map { $_ =~ /^(.*?)(?:\(\s*(.+?)\s*\))?$/ }
grep { $_=~/^Args\(/ or $_=~/^CaptureArgs\(/ }
@{$m->attributes};
- warn " about to evaluate any found attrs\n" if $ENV{CATALYST_CONSTRAINTS_DEBUG};
next unless $value eq $name;
- warn " found attr info $key and $value\n" if $ENV{CATALYST_CONSTRAINTS_DEBUG};
my @tc = eval "package ${\$parent->name}; $name";
- return @tc if scalar(@tc);
- } else {
- warn " method $m does not have method attributes\n" if $ENV{CATALYST_CONSTRAINTS_DEBUG};
- }
+ 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";
- };
+ }
- if($tc[0]) {
+ if(scalar(@tc)) {
return map { ref($_) ? $_ : Moose::Util::TypeConstraints::find_or_parse_type_constraint($_) } @tc;
} else {
return;
# Optimization since Tuple[Int, Int] would fail on 3,4,5 anyway, but this
# way we can avoid calling the constraint when the arg length is incorrect.
if(
- $self->normalized_arg_number == ~0 ||
- scalar( @args ) == $self->normalized_arg_number
+ $self->comparable_arg_number == ~0 ||
+ scalar( @args ) == $self->comparable_arg_number
) {
return $self->args_constraints->[0]->check($args);
} else {
} else {
# Because of the way chaining works, we can expect args that are totally not
# what you'd expect length wise. When they don't match length, thats a fail
- return 0 unless scalar( @args ) == $self->normalized_arg_number;
+ return 0 unless scalar( @args ) == $self->comparable_arg_number;
for my $i(0..$#args) {
$self->args_constraints->[$i]->check($args[$i]) || return 0;
}
} else {
# If infinite args with no constraints, we always match
- return 1 if $self->normalized_arg_number == ~0;
+ return 1 if $self->comparable_arg_number == ~0;
# Otherwise, we just need to match the number of args.
- return scalar( @args ) == $self->normalized_arg_number;
+ return scalar( @args ) == $self->comparable_arg_number;
}
}
sub compare {
my ($a1, $a2) = @_;
- return $a1->normalized_arg_number <=> $a2->normalized_arg_number;
+ return $a1->comparable_arg_number <=> $a2->comparable_arg_number;
}
sub scheme {
=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
=head2 normalized_arg_number
+The number of arguments (starting with zero) that the current action defines, or
+undefined if there is not defined number of args (which is later treated as, "
+as many arguments as you like").
+
+=head2 comparable_arg_number
+
For the purposes of comparison we normalize 'number_of_args' so that if it is
undef we mean ~0 (as many args are we can think of).
projects / catagits/Catalyst-Runtime.git / blobdiff