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.12';
+use base qw(Class::MOP::Object);
+
+our $VERSION = '0.65';
+$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
__PACKAGE__->meta->add_attribute('name' => (reader => 'name'));
reader => 'parent',
predicate => 'has_parent',
));
+
+my $null_constraint = sub { 1 };
__PACKAGE__->meta->add_attribute('constraint' => (
reader => 'constraint',
writer => '_set_constraint',
- default => sub { sub { 1 } }
+ default => sub { $null_constraint }
));
__PACKAGE__->meta->add_attribute('message' => (
accessor => 'message',
sub new {
my $class = shift;
- my $self = $class->meta->new_object(@_);
+ my ($first, @rest) = @_;
+ my %args = ref $first ? %$first : $first ? ($first, @rest) : ();
+ $args{name} = $args{name} ? "$args{name}" : "__ANON__";
+
+ my $self = $class->_new(%args);
$self->compile_type_constraint()
unless $self->_has_compiled_type_constraint;
return $self;
}
-sub coerce { ((shift)->coercion || confess "Cannot coerce without a type coercion")->coerce(@_) }
-sub check { $_[0]->_compiled_type_constraint->($_[1]) ? 1 : undef }
+
+
+sub coerce { ((shift)->coercion || Moose->throw_error("Cannot coerce without a type coercion"))->coerce(@_) }
+
+sub check {
+ my ($self, @args) = @_;
+ my $constraint_subref = $self->_compiled_type_constraint;
+ return $constraint_subref->(@args) ? 1 : undef;
+}
+
sub validate {
my ($self, $value) = @_;
if ($self->_compiled_type_constraint->($value)) {
sub get_message {
my ($self, $value) = @_;
- $value = (defined $value ? overload::StrVal($value) : 'undef');
if (my $msg = $self->message) {
local $_ = $value;
return $msg->($value);
}
else {
+ $value = (defined $value ? overload::StrVal($value) : 'undef');
return "Validation failed for '" . $self->name . "' failed with value $value";
}
}
sub equals {
my ( $self, $type_or_name ) = @_;
- my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name);
-
- # this is so utterly broken
- # any anon type constraint equals any other, because their names are both '__ANON__'
- # I think the correct implementation is:
- # refaddr == refaddr
- # ||
- # constraint_coderef == constraint_coderef && parent->equals(parent)
- # but we need tests first
- # the Enum constraint can compare it's elements in a subclass
- # refaddr eq will DWIM for all registered types
- # the Class tc will already do the right thing even if the name is different
- $self->name eq $type->name;
+ my $other = Moose::Util::TypeConstraints::find_type_constraint($type_or_name) or return;
+
+ 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_or_name) = @_;
- my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name);
+ my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name) or return;
($self->equals($type) || $self->is_subtype_of($type));
}
sub is_subtype_of {
my ($self, $type_or_name) = @_;
- my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name);
+ my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name) or return;
my $current = $self;
my $check = $self->constraint;
(defined $check)
- || confess "Could not compile type constraint '"
+ || Moose->throw_error("Could not compile type constraint '"
. $self->name
- . "' because no constraint check";
+ . "' because no constraint check");
return $self->_compile_subtype($check)
if $self->has_parent;
my $type_constraint = $self->hand_optimized_type_constraint;
- confess unless ref $type_constraint;
+ Moose->throw_error("Hand optimized type constraint is not a code reference") unless ref $type_constraint;
return $type_constraint;
}
sub _compile_subtype {
my ($self, $check) = @_;
- # so we gather all the parents in order
- # and grab their constraints ...
+ # gather all the parent constraintss in order
my @parents;
+ my $optimized_parent;
foreach my $parent ($self->_collect_all_parents) {
+ # if a parent is optimized, the optimized constraint already includes
+ # all of its parents tcs, so we can break the loop
if ($parent->has_hand_optimized_type_constraint) {
- unshift @parents => $parent->hand_optimized_type_constraint;
+ push @parents => $optimized_parent = $parent->hand_optimized_type_constraint;
last;
}
else {
- unshift @parents => $parent->constraint;
+ push @parents => $parent->constraint;
}
}
- # 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]);
+ @parents = grep { $_ != $null_constraint } reverse @parents;
+
+ unless ( @parents ) {
+ return $self->_compile_type($check);
+ } elsif( $optimized_parent and @parents == 1 ) {
+ # the case of just one optimized parent is optimized to prevent
+ # looping and the unnecessary localization
+ if ( $check == $null_constraint ) {
+ return $optimized_parent;
+ } else {
+ return Class::MOP::subname($self->name, sub {
+ return undef unless $optimized_parent->($_[0]);
+ my (@args) = @_;
+ local $_ = $args[0];
+ $check->(@args);
+ });
}
- return undef unless $check->($_[0]);
- 1;
- };
+ } else {
+ # general case, check all the constraints, from the first parent to ourselves
+ my @checks = @parents;
+ push @checks, $check if $check != $null_constraint;
+ return Class::MOP::subname($self->name => sub {
+ my (@args) = @_;
+ local $_ = $args[0];
+ foreach my $check (@checks) {
+ return undef unless $check->(@args);
+ }
+ return 1;
+ });
+ }
}
sub _compile_type {
my ($self, $check) = @_;
- return subname $self->name => sub {
- local $_ = $_[0];
- return undef unless $check->($_[0]);
- 1;
- };
+
+ return $check if $check == $null_constraint; # Item, Any
+
+ return Class::MOP::subname($self->name => sub {
+ my (@args) = @_;
+ local $_ = $args[0];
+ $check->(@args);
+ });
}
## other utils ...
return @parents;
}
+sub create_child_type {
+ my ($self, %opts) = @_;
+ my $class = ref $self;
+ return $class->new(%opts, parent => $self);
+}
+
## this should get deprecated actually ...
sub union { Carp::croak "DEPRECATED" }
=item B<equals ($type_name_or_object)>
+This checks the current type against the supplied type (only).
+Returns false if the two types are not equal. It also returns false if
+you provide the type as a name, and the type name isn't found in the
+type registry.
+
=item B<is_a_type_of ($type_name_or_object)>
-This checks the current type name, and if it does not match,
-checks if it is a subtype of it.
+This checks the current type against the supplied type, or if the
+current type is a sub-type of the type name or object supplied. It
+also returns false if you provide the type as a name, and the type
+name isn't found in the type registry.
=item B<is_subtype_of ($type_name_or_object)>
+This checks the current type is a sub-type of the type name or object
+supplied. It also returns false if you provide the type as a name, and
+the type name isn't found in the type registry.
+
=item B<compile_type_constraint>
=item B<coerce ($value)>
=item B<name>
+The name of the type in the global type registry.
+
=item B<parent>
+This type's parent type.
+
=item B<has_parent>
+Returns true if this type has a parent type.
+
=item B<parents>
+Synonym for C<parent>.
+
=item B<constraint>
+Returns this type's constraint. This is the value of C<where> provided
+when defining a type.
+
=item B<has_message>
+Returns true if this type has a message.
+
=item B<message>
+Returns this type's message.
+
=item B<get_message ($value)>
+Generate message for $value.
+
=item B<has_coercion>
+Returns true if this type has a coercion.
+
=item B<coercion>
+Returns this type's L<Moose::Meta::TypeCoercion> if one exists.
+
=item B<hand_optimized_type_constraint>
=item B<has_hand_optimized_type_constraint>
+=item B<create_child_type>
+
=back
=head2 DEPRECATED METHOD
projects / gitmo/Moose.git / blobdiff