use strictures 1;
use Sub::Quote;
-use base qw(Class::Tiny::Object);
+use base qw(Moo::Object);
use Sub::Defer;
use B 'perlstring';
$_[0]->{accessor_generator}
}
+sub construction_string {
+ my ($self) = @_;
+ $self->{construction_string} or 'bless({}, $class);'
+}
+
sub install_delayed {
my ($self) = @_;
my $package = $self->{package};
}
local $self->{captures} = {};
my $body = ' my $class = shift;'."\n";
+ $body .= $self->_handle_subconstructor($into, $name);
$body .= $self->_generate_args;
$body .= $self->_check_required($spec);
- $body .= ' my $new = bless({}, $class);'."\n";
+ $body .= ' my $new = '.$self->construction_string.";\n";
$body .= $self->_assign_new($spec);
if ($into->can('BUILD')) {
require Method::Generate::BuildAll;
;
}
+sub _handle_subconstructor {
+ my ($self, $into, $name) = @_;
+ if (my $gen = $self->{subconstructor_generator}) {
+ ' if ($class ne '.perlstring($into).') {'."\n".
+ ' '.$gen.";\n".
+ ' return $class->'.$name.'(@_)'.";\n".
+ ' }'."\n";
+ } else {
+ ''
+ }
+}
+
sub _cap_call {
my ($self, $code, $captures) = @_;
@{$self->{captures}}{keys %$captures} = values %$captures if $captures;
sub _generate_args {
my ($self) = @_;
- q{ my $args = ref($_[0]) eq 'HASH' ? $_[0] : { @_ };}."\n";
+ q{ my $args = $class->BUILDARGS(@_);}."\n";
}
sub _assign_new {
my $ag = $self->accessor_generator;
NAME: foreach my $name (sort keys %$spec) {
my $attr_spec = $spec->{$name};
- next NAME unless defined(my $i = $attr_spec->{init_arg});
unless ($ag->is_simple_attribute($name, $attr_spec)) {
- $test{$name} = $i;
+ next NAME unless defined($attr_spec->{init_arg})
+ or $ag->has_eager_default($name, $attr_spec);
+ $test{$name} = $attr_spec->{init_arg};
next NAME;
}
+ next NAME unless defined(my $i = $attr_spec->{init_arg});
push @init, $i;
push @slots, $name;
}