use warnings;
use Scalar::Util qw(blessed);
-sub _install_accessor{
+sub _generate_accessor{
my (undef, $attribute, $method_name, $class, $type) = @_;
my $name = $attribute->name;
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 $accessor =
'#line ' . __LINE__ . ' "' . __FILE__ . "\"\n" .
- "sub {\n";
+ sprintf("sub %s {\n", defined($method_name) ? $class->name . '::' . $method_name : '');
+
if ($type eq 'accessor' || $type eq 'writer') {
if($type eq 'accessor'){
$accessor .=
else{ # writer
$accessor .=
'#line ' . __LINE__ . ' "' . __FILE__ . "\"\n" .
- 'if(@_ < 2){ Carp::confess("Not enough arguments for writer '.$method_name.'") }'.
+ 'if(@_ < 2){ Carp::confess("Not enough arguments for the writer of '.$name.'") }'.
'{' . "\n";
}
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";
}
$accessor .= 'return '.$self.'->{'.$key."};\n}";
#print $accessor, "\n";
- my $code = eval $accessor;
- $attribute->throw_error($@) if $@;
-
- $class->add_method($method_name => $code);
- return;
+ my $code;
+ my $e = do{
+ local $@;
+ $code = eval $accessor;
+ $@;
+ };
+ die $e if $e;
+
+ return $code; # returns a CODE ref unless $method_name is passed
}
-sub _install_reader{
+sub _generate_reader{
my $class = shift;
- $class->_install_accessor(@_, 'reader');
- return;
+ return $class->_generate_accessor(@_, 'reader');
}
-sub _install_writer{
+sub _generate_writer{
my $class = shift;
- $class->_install_accessor(@_, 'writer');
- return;
+ return $class->_generate_accessor(@_, 'writer');
}
-sub _install_predicate {
+sub _generate_predicate {
my (undef, $attribute, $method_name, $class) = @_;
my $slot = $attribute->name;
return;
}
-sub _install_clearer {
+sub _generate_clearer {
my (undef, $attribute, $method_name, $class) = @_;
my $slot = $attribute->name;
return;
}
-sub _install_handles {
+sub _generate_handles {
my (undef, $attribute, $handles, $class) = @_;
my $reader = $attribute->reader || $attribute->accessor