my $set_value = do {
my @code;
- if ($attr->should_coerce) {
- push @code, "my \$value = \$attrs[$index]->coerce_constraint( \$args->{'$from'});";
+ if ($attr->should_coerce && $attr->type_constraint) {
+ push @code, "my \$value = Mouse::TypeRegistry->typecast_constraints('".$attr->associated_class->name."', \$attrs[$index]->{find_type_constraint}, \$attrs[$index]->{type_constraint}, \$args->{'$from'});";
}
else {
push @code, "my \$value = \$args->{'$from'};";
}
if ($attr->has_type_constraint) {
- push @code, "\$attrs[$index]->verify_type_constraint( \$value );";
+ push @code, "{local \$_ = \$value; unless (\$attrs[$index]->{find_type_constraint}->(\$_)) {";
+ push @code, "\$attrs[$index]->verify_type_constraint_error('$key', \$_, \$attrs[$index]->type_constraint)}}";
}
push @code, "\$instance->{'$key'} = \$value;";
if ($attr->is_weak_ref) {
- push @code, "weaken( \$instance->{'$key'} ) if ref( \$value );";
+ push @code, "Scalar::Util::weaken( \$instance->{'$key'} ) if ref( \$value );";
}
if ( $attr->has_trigger ) {
- push @code, "\$attrs[$index]->trigger->( \$instance, \$value, \$attrs[$index] );";
+ push @code, "\$attrs[$index]->{trigger}->( \$instance, \$value, \$attrs[$index] );";
}
join "\n", @code;
push @code, "my \$value = ";
- if ($attr->should_coerce) {
- push @code, "\$attrs[$index]->coerce_constraint(";
+ if ($attr->should_coerce && $attr->type_constraint) {
+ push @code, "Mouse::TypeRegistry->typecast_constraints('".$attr->associated_class->name."', \$attrs[$index]->{find_type_constraint}, \$attrs[$index]->{type_constraint}, ";
}
if ($attr->has_builder) {
push @code, "\$instance->$builder";
}
elsif (ref($default) eq 'CODE') {
- push @code, "\$attrs[$index]->default()->()";
+ push @code, "\$attrs[$index]->{default}->(\$instance)";
}
elsif (!defined($default)) {
push @code, 'undef';
}
if ($attr->has_type_constraint) {
- push @code, "\$attrs[$index]->verify_type_constraint(\$value);";
+ push @code, "{local \$_ = \$value; unless (\$attrs[$index]->{find_type_constraint}->(\$_)) {";
+ push @code, "\$attrs[$index]->verify_type_constraint_error('$key', \$_, \$attrs[$index]->type_constraint)}}";
}
push @code, "\$instance->{'$key'} = \$value;";
if ($attr->is_weak_ref) {
- push @code, "weaken( \$instance->{'$key'} ) if ref( \$value );";
+ push @code, "Scalar::Util::weaken( \$instance->{'$key'} ) if ref( \$value );";
}
}
join "\n", @code;