use Carp 'confess';
use Scalar::Util ();
+use Mouse::Meta::TypeConstraint;
sub new {
- my $class = shift;
- my %args = @_;
+ my ($class, $name, %options) = @_;
- my $name = $args{name};
+ $options{name} = $name;
- $args{init_arg} = $name
- unless exists $args{init_arg};
+ $options{init_arg} = $name
+ unless exists $options{init_arg};
- $args{is} ||= '';
+ $options{is} ||= '';
- bless \%args, $class;
+ bless \%options, $class;
}
sub name { $_[0]->{name} }
sub is_weak_ref { $_[0]->{weak_ref} }
sub init_arg { $_[0]->{init_arg} }
sub type_constraint { $_[0]->{type_constraint} }
+sub find_type_constraint {
+ Carp::carp("This method was deprecated");
+ $_[0]->type_constraint();
+}
sub trigger { $_[0]->{trigger} }
sub builder { $_[0]->{builder} }
sub should_auto_deref { $_[0]->{auto_deref} }
sub should_coerce { $_[0]->{should_coerce} }
-sub find_type_constraint { $_[0]->{find_type_constraint} }
sub has_default { exists $_[0]->{default} }
sub has_predicate { exists $_[0]->{predicate} }
return $key;
}
-sub generate_accessor {
- my $attribute = shift;
+sub generate_accessor_method_inline {
+ my ($attribute) = @_;
my $name = $attribute->name;
my $default = $attribute->default;
- my $constraint = $attribute->find_type_constraint;
+ my $constraint = $attribute->type_constraint;
my $builder = $attribute->builder;
my $trigger = $attribute->trigger;
my $is_weak = $attribute->is_weak_ref;
my $should_deref = $attribute->should_auto_deref;
my $should_coerce = $attribute->should_coerce;
+ my $compiled_type_constraint = $constraint ? $constraint->{_compiled_type_constraint} : undef;
+
my $self = '$_[0]';
my $key = $attribute->inlined_name;
- my $accessor = "sub {\n";
+ my $accessor =
+ '#line ' . __LINE__ . ' "' . __FILE__ . "\"\n" .
+ "sub {\n";
if ($attribute->_is_metadata eq 'rw') {
- $accessor .= 'if (scalar(@_) >= 2) {' . "\n";
+ $accessor .=
+ '#line ' . __LINE__ . ' "' . __FILE__ . "\"\n" .
+ 'if (scalar(@_) >= 2) {' . "\n";
my $value = '$_[1]';
if ($constraint) {
- $accessor .= 'my $val = ';
if ($should_coerce) {
- $accessor .= 'Mouse::Util::TypeConstraints->typecast_constraints("'.$attribute->associated_class->name.'", $attribute->{find_type_constraint}, $attribute->{type_constraint}, '.$value.');';
+ $accessor .=
+ "\n".
+ '#line ' . __LINE__ . ' "' . __FILE__ . "\"\n" .
+ 'my $val = Mouse::Util::TypeConstraints->typecast_constraints("'.$attribute->associated_class->name.'", $attribute->{type_constraint}, '.$value.');';
+ $value = '$val';
+ }
+ if ($compiled_type_constraint) {
+ $accessor .=
+ "\n".
+ '#line ' . __LINE__ . ' "' . __FILE__ . "\"\n" .
+ 'unless ($compiled_type_constraint->('.$value.')) {
+ $attribute->verify_type_constraint_error($name, '.$value.', $attribute->{type_constraint});
+ }' . "\n";
} else {
- $accessor .= $value.';';
+ $accessor .=
+ "\n".
+ '#line ' . __LINE__ . ' "' . __FILE__ . "\"\n" .
+ 'unless ($constraint->check('.$value.')) {
+ $attribute->verify_type_constraint_error($name, '.$value.', $attribute->{type_constraint});
+ }' . "\n";
}
- $accessor .= 'local $_ = $val;';
- $accessor .= '
- unless ($constraint->()) {
- $attribute->verify_type_constraint_error($name, $_, $attribute->type_constraint);
- }' . "\n";
- $value = '$val';
}
# if there's nothing left to do for the attribute we can return during
}
if ($trigger) {
- $accessor .= '$trigger->('.$self.', '.$value.', $attribute);' . "\n";
+ $accessor .= '$trigger->('.$self.', '.$value.');' . "\n";
}
$accessor .= "}\n";
}
else {
- $accessor .= 'confess "Cannot assign a value to a read-only accessor" if scalar(@_) >= 2;' . "\n";
+ $accessor .= 'Carp::confess("Cannot assign a value to a read-only accessor") if scalar(@_) >= 2;' . "\n";
}
if ($attribute->is_lazy) {
}
if ($should_deref) {
- my $type_constraint = $attribute->type_constraint;
- if (!ref($type_constraint) && $type_constraint eq 'ArrayRef') {
+ if (ref($constraint) && $constraint->name =~ '^ArrayRef\b') {
$accessor .= 'if (wantarray) {
return @{ '.$self.'->{'.$key.'} || [] };
}';
}';
my $sub = eval $accessor;
- confess $@ if $@;
+ Carp::confess($@) if $@;
return $sub;
}
+
sub generate_predicate {
my $attribute = shift;
my $key = $attribute->inlined_name;
if exists $args{coerce};
if (exists $args{isa}) {
+ confess "Got isa => $args{isa}, but Mouse does not yet support parameterized types for containers other than ArrayRef and HashRef (rt.cpan.org #39795)"
+ if $args{isa} =~ /^([^\[]+)\[.+\]$/ &&
+ $1 ne 'ArrayRef' &&
+ $1 ne 'HashRef' &&
+ $1 ne 'Maybe'
+ ;
+
my $type_constraint = delete $args{isa};
- $type_constraint =~ s/\s//g;
- my @type_constraints = split /\|/, $type_constraint;
-
- my $code;
- my $optimized_constraints = Mouse::Util::TypeConstraints->optimized_constraints;
- if (@type_constraints == 1) {
- $code = $optimized_constraints->{$type_constraints[0]} ||
- sub { Scalar::Util::blessed($_) && $_->isa($type_constraints[0]) };
- $args{type_constraint} = $type_constraints[0];
- } else {
- my @code_list = map {
- my $type = $_;
- $optimized_constraints->{$type} ||
- sub { Scalar::Util::blessed($_) && $_->isa($type) }
- } @type_constraints;
- $code = sub {
- for my $code (@code_list) {
- return 1 if $code->();
- }
- return 0;
- };
- $args{type_constraint} = \@type_constraints;
- }
- $args{find_type_constraint} = $code;
+ $args{type_constraint}= Mouse::Util::TypeConstraints::find_or_create_isa_type_constraint($type_constraint);
}
- my $attribute = $self->new(%args);
+ my $attribute = $self->new($name, %args);
$attribute->_create_args(\%args);
# install an accessor
if ($attribute->_is_metadata eq 'rw' || $attribute->_is_metadata eq 'ro') {
- my $accessor = $attribute->generate_accessor;
- $class->add_method($name => $accessor);
+ my $code = $attribute->generate_accessor_method_inline();
+ $class->add_method($name => $code);
}
for my $method (qw/predicate clearer/) {
confess "You cannot auto-dereference anything other than a ArrayRef or HashRef on attribute ($name)"
if $args->{auto_deref}
- && $args->{isa} ne 'ArrayRef'
- && $args->{isa} ne 'HashRef';
+ && $args->{isa} !~ /^(?:ArrayRef|HashRef)(?:\[.*\])?$/;
if ($args->{trigger}) {
if (ref($args->{trigger}) eq 'HASH') {
}
sub verify_against_type_constraint {
- return 1 unless $_[0]->{type_constraint};
+ my ($self, $value) = @_;
+ my $tc = $self->type_constraint;
+ return 1 unless $tc;
- local $_ = $_[1];
- return 1 if $_[0]->{find_type_constraint}->($_);
+ local $_ = $value;
+ return 1 if $tc->check($value);
- my $self = shift;
- $self->verify_type_constraint_error($self->name, $_, $self->type_constraint);
+ $self->verify_type_constraint_error($self->name, $value, $tc);
}
sub verify_type_constraint_error {
my($self, $name, $value, $type) = @_;
- $type = ref($type) eq 'ARRAY' ? join '|', @{ $type } : $type;
- my $display = defined($_) ? overload::StrVal($_) : 'undef';
- Carp::confess("Attribute ($name) does not pass the type constraint because: Validation failed for \'$type\' failed with value $display");
+ Carp::confess("Attribute ($name) does not pass the type constraint because: " . $type->get_message($value));
}
sub coerce_constraint { ## my($self, $value) = @_;
my $type = $_[0]->{type_constraint}
or return $_[1];
- return Mouse::Util::TypeConstraints->typecast_constraints($_[0]->associated_class->name, $_[0]->find_type_constraint, $type, $_[1]);
+ return Mouse::Util::TypeConstraints->typecast_constraints($_[0]->associated_class->name, $_[0]->type_constraint, $_[1]);
}
sub _canonicalize_handles {
Creates a new code reference for each of the attribute's handles methods.
-=head2 find_type_constraint -> CODE
-
-Returns a code reference which can be used to check that a given value passes
-this attribute's type constraint;
-
=head2 verify_against_type_constraint Item -> 1 | ERROR
Checks that the given value passes this attribute's type constraint. Returns 1
projects / gitmo/Mouse.git / blobdiff