use Scalar::Util 'blessed', 'weaken', 'looks_like_number', 'refaddr';
-our $VERSION = '1.00';
+our $VERSION = '1.12';
our $AUTHORITY = 'cpan:STEVAN';
use base 'Moose::Meta::Method',
$source .= "\n" . 'my $class = Scalar::Util::blessed($_instance) || $_instance;';
- $source .= "\n" . 'return $class->Moose::Object::new(@_)';
- $source .= "\n if \$class ne '" . $self->associated_metaclass->name
- . "';\n";
+ $source .= "\n" . "if (\$class ne '" . $self->associated_metaclass->name
+ . "') {";
+ $source .= "\n return "
+ . $self->_generate_fallback_constructor('$class') . ";";
+ $source .= "\n}\n";
$source .= $self->_generate_params('$params', '$class');
$source .= $self->_generate_instance('$instance', '$class');
defined $_ ? $_->_compiled_type_constraint : undef;
} @type_constraints;
+ my $defaults = [map { $_->default } @$attrs];
+
my ( $code, $e ) = $self->_compile_code(
code => $source,
environment => {
'$meta' => \$self,
'$attrs' => \$attrs,
+ '$defaults' => \$defaults,
'@type_constraints' => \@type_constraints,
'@type_constraint_bodies' => \@type_constraint_bodies,
},
$self->{'body'} = $code;
}
+sub _generate_fallback_constructor {
+ my ( $self, $class_var ) = @_;
+ "${class_var}->Moose::Object::new(\@_)";
+}
+
sub _generate_params {
my ( $self, $var, $class_var ) = @_;
"my $var = " . $self->_generate_BUILDARGS( $class_var, '@_' ) . ";\n";
);
}
-sub _generate_default_value {
- my ($self, $attr, $index) = @_;
- # NOTE:
- # default values can either be CODE refs
- # in which case we need to call them. Or
- # they can be scalars (strings/numbers)
- # in which case we can just deal with them
- # in the code we eval.
- if ($attr->is_default_a_coderef) {
- return '$attrs->[' . $index . ']->default($instance)';
- }
- else {
- return q{"} . quotemeta( $attr->default ) . q{"};
- }
-}
-
1;
__END__