my $should_deref = $attribute->should_auto_deref;
my $should_coerce = $attribute->should_coerce;
- my $compiled_type_constraint = $constraint ? $constraint->{_compiled_type_constraint} : undef;
+ my $compiled_type_constraint = $constraint ? $constraint->_compiled_type_constraint : undef;
my $self = '$_[0]';
my $key = sprintf q{"%s"}, quotemeta $name;
my $value = '$_[1]';
- if ($constraint) {
+ if (defined $constraint) {
+ if(!$compiled_type_constraint){
+ Carp::confess("[BUG] Missing compiled type constraint for $constraint");
+ }
if ($should_coerce) {
$accessor .=
"\n".
'#line ' . __LINE__ . ' "' . __FILE__ . "\"\n" .
- 'my $val = Mouse::Util::TypeConstraints->typecast_constraints("'.$attribute->associated_class->name.'", $attribute->{type_constraint}, '.$value.');';
+ 'my $val = $constraint->coerce('.$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 .=
- "\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 ($compiled_type_constraint->('.$value.')) {
+ $attribute->verify_type_constraint_error($name, '.$value.', $attribute->{type_constraint});
+ }' . "\n";
}
# if there's nothing left to do for the attribute we can return during
if ($attribute->is_lazy) {
$accessor .= $self.'->{'.$key.'} = ';
- $accessor .= $attribute->has_builder
- ? $self.'->$builder'
- : ref($default) eq 'CODE'
- ? '$default->('.$self.')'
- : '$default';
+ if($should_coerce && defined($constraint)){
+ $accessor .= '$attribute->_coerce_and_verify(';
+ }
+ $accessor .= $attribute->has_builder ? $self.'->$builder'
+ : ref($default) eq 'CODE' ? '$default->('.$self.')'
+ : '$default';
+
+ if($should_coerce && defined $constraint){
+ $accessor .= ')';
+ }
$accessor .= ' if !exists '.$self.'->{'.$key.'};' . "\n";
}
foreach my $handle_name (keys %handles) {
my $method_to_call = $handles{$handle_name};
- my $code = sub {\r
- my $instance = shift;\r
- my $proxy = $instance->$reader();\r
-\r
- my $error = !defined($proxy) ? ' is not defined'\r
- : ref($proxy) && !blessed($proxy) ? qq{ is not an object (got '$proxy')}\r
- : undef;\r
+ my $code = sub {
+ my $instance = shift;
+ my $proxy = $instance->$reader();
+
+ my $error = !defined($proxy) ? ' is not defined'
+ : ref($proxy) && !blessed($proxy) ? qq{ is not an object (got '$proxy')}
+ : undef;
if ($error) {
- $instance->meta->throw_error(\r
- "Cannot delegate $handle_name to $method_to_call because "\r
- . "the value of "\r
- . $attribute->name\r
+ $instance->meta->throw_error(
+ "Cannot delegate $handle_name to $method_to_call because "
+ . "the value of "
+ . $attribute->name
. $error
- );\r
- }\r
- $proxy->$method_to_call(@_);\r
+ );
+ }
+ $proxy->$method_to_call(@_);
};
$class->add_method($handle_name => $code);
}