$_[0]->{_create_args}
}
-sub inlined_name {
+sub _inlined_name {
my $self = shift;
- my $name = $self->name;
- my $key = "'" . $name . "'";
- return $key;
+ return sprintf '"%s"', quotemeta $self->name;
}
-sub generate_accessor {
- my $attribute = shift;
+sub _generate_accessor{
+ my ($attribute) = @_;
my $name = $attribute->name;
my $default = $attribute->default;
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 $key = $attribute->_inlined_name;
my $accessor =
'#line ' . __LINE__ . ' "' . __FILE__ . "\"\n" .
if ($attribute->_is_metadata eq 'rw') {
$accessor .=
'#line ' . __LINE__ . ' "' . __FILE__ . "\"\n" .
- 'if (@_ >= 2) {' . "\n";
+ 'if (scalar(@_) >= 2) {' . "\n";
my $value = '$_[1]';
if ($constraint) {
- $accessor .= 'my $val = ';
if ($should_coerce) {
$accessor .=
"\n".
'#line ' . __LINE__ . ' "' . __FILE__ . "\"\n" .
- 'Mouse::Util::TypeConstraints->typecast_constraints("'.$attribute->associated_class->name.'", $attribute->{type_constraint}, '.$value.');';
+ '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 .=
- "\n".
- '#line ' . __LINE__ . ' "' . __FILE__ . "\"\n" .
- 'unless ($constraint->check($val)) {
- $attribute->verify_type_constraint_error($name, $val, $attribute->{type_constraint});
- }' . "\n";
- $value = '$val';
}
# if there's nothing left to do for the attribute we can return during
$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->name 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 {
+
+sub _generate_predicate {
my $attribute = shift;
- my $key = $attribute->inlined_name;
+ my $key = $attribute->_inlined_name;
my $predicate = 'sub { exists($_[0]->{'.$key.'}) }';
return $sub;
}
-sub generate_clearer {
+sub _generate_clearer {
my $attribute = shift;
- my $key = $attribute->inlined_name;
+ my $key = $attribute->_inlined_name;
my $clearer = 'sub { delete($_[0]->{'.$key.'}) }';
return $sub;
}
-sub generate_handles {
+sub _generate_handles {
my $attribute = shift;
my $reader = $attribute->name;
my %handles = $attribute->_canonicalize_handles($attribute->handles);
# 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();
+ $class->add_method($name => $code);
}
for my $method (qw/predicate clearer/) {
my $predicate = "has_$method";
if ($attribute->$predicate) {
- my $generator = "generate_$method";
+ my $generator = "_generate_$method";
my $coderef = $attribute->$generator;
$class->add_method($attribute->$method => $coderef);
}
}
if ($attribute->has_handles) {
- my $method_map = $attribute->generate_handles;
+ my $method_map = $attribute->_generate_handles;
for my $method_name (keys %$method_map) {
$class->add_method($method_name => $method_map->{$method_name});
}
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]->{type_constraint}->check($_);
+ 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 '|', map { $_->name } @{ $type } : $type->name;
- my $display = defined($value) ? overload::StrVal($value) : '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) = @_;
Informational methods.
-=head2 generate_accessor -> CODE
-
-Creates a new code reference for the attribute's accessor.
-
-=head2 generate_predicate -> CODE
-
-Creates a new code reference for the attribute's predicate.
-
-=head2 generate_clearer -> CODE
-
-Creates a new code reference for the attribute's clearer.
-
-=head2 generate_handles -> { MethodName => CODE }
-
-Creates a new code reference for each of the attribute's handles methods.
-
=head2 verify_against_type_constraint Item -> 1 | ERROR
Checks that the given value passes this attribute's type constraint. Returns 1