use B 'perlstring';
sub register_attribute_specs {
- my ($self, %spec) = @_;
- @{$self->{attribute_specs}||={}}{keys %spec} = values %spec;
+ my ($self, @new_specs) = @_;
+ my $specs = $self->{attribute_specs}||={};
+ while (my ($name, $new_spec) = splice @new_specs, 0, 2) {
+ if ($name =~ s/^\+//) {
+ die "has '+${name}' given but no ${name} attribute already exists"
+ unless my $old_spec = $specs->{$name};
+ foreach my $key (keys %$old_spec) {
+ $new_spec->{$key} = $old_spec->{$key}
+ unless exists $new_spec->{$key};
+ }
+ }
+ $new_spec->{index} = scalar keys %$specs
+ unless defined $new_spec->{index};
+ $specs->{$name} = $new_spec;
+ }
$self;
}
sub construction_string {
my ($self) = @_;
- $self->{construction_string} or 'bless({}, $class);'
+ $self->{construction_string}
+ or 'bless('
+ .$self->accessor_generator->default_construction_string
+ .', $class);'
}
sub install_delayed {
$spec->{$no_init}{init_arg} = $no_init;
}
local $self->{captures} = {};
- my $body = ' my $class = shift;'."\n";
- $body .= $self->_generate_args;
+ my $body = ' my $class = shift;'."\n"
+ .' $class = ref($class) if ref($class);'."\n";
+ $body .= $self->_handle_subconstructor($into, $name);
+ my $into_buildargs = $into->can('BUILDARGS');
+ if ( $into_buildargs && $into_buildargs != \&Moo::Object::BUILDARGS ) {
+ $body .= $self->_generate_args_via_buildargs;
+ } else {
+ $body .= $self->_generate_args;
+ }
$body .= $self->_check_required($spec);
$body .= ' my $new = '.$self->construction_string.";\n";
$body .= $self->_assign_new($spec);
);
}
$body .= ' return $new;'."\n";
+ if ($into->can('DEMOLISH')) {
+ require Method::Generate::DemolishAll;
+ Method::Generate::DemolishAll->new->generate_method($into);
+ }
quote_sub
"${into}::${name}" => $body,
$self->{captures}, $quote_opts||{}
;
}
+sub _handle_subconstructor {
+ my ($self, $into, $name) = @_;
+ if (my $gen = $self->{subconstructor_handler}) {
+ ' if ($class ne '.perlstring($into).') {'."\n".
+ $gen.
+ ' }'."\n";
+ } else {
+ ''
+ }
+}
+
sub _cap_call {
my ($self, $code, $captures) = @_;
@{$self->{captures}}{keys %$captures} = values %$captures if $captures;
$code;
}
+sub _generate_args_via_buildargs {
+ my ($self) = @_;
+ q{ my $args = $class->BUILDARGS(@_);}."\n"
+ .q{ die "BUILDARGS did not return a hashref" unless ref($args) eq 'HASH';}
+ ."\n";
+}
+
+# inlined from Moo::Object - update that first.
sub _generate_args {
my ($self) = @_;
- q{ my $args = ref($_[0]) eq 'HASH' ? $_[0] : { @_ };}."\n";
+ return <<'_EOA';
+ my $args;
+ if ( scalar @_ == 1 ) {
+ unless ( defined $_[0] && ref $_[0] eq 'HASH' ) {
+ die "Single parameters to new() must be a HASH ref"
+ ." data => ". $_[0] ."\n";
+ }
+ $args = { %{ $_[0] } };
+ }
+ elsif ( @_ % 2 ) {
+ die "The new() method for $class expects a hash reference or a key/value list."
+ . " You passed an odd number of arguments\n";
+ }
+ else {
+ $args = {@_};
+ }
+_EOA
+
}
sub _assign_new {
my ($self, $spec) = @_;
- my (@init, @slots, %test);
my $ag = $self->accessor_generator;
+ my %test;
NAME: foreach my $name (sort keys %$spec) {
my $attr_spec = $spec->{$name};
- unless ($ag->is_simple_attribute($name, $attr_spec)) {
- 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;
+ next NAME unless defined($attr_spec->{init_arg})
+ or $ag->has_eager_default($name, $attr_spec);
+ $test{$name} = $attr_spec->{init_arg};
}
- return '' unless @init or %test;
- join '', (
- @init
- ? ' '.$self->_cap_call($ag->generate_multi_set(
- '$new', [ @slots ], '@{$args}{qw('.join(' ',@init).')}'
- )).";\n"
- : ''
- ), map {
+ join '', map {
my $arg_key = perlstring($test{$_});
my $test = "exists \$args->{$arg_key}";
my $source = "\$args->{$arg_key}";
my ($self, $spec) = @_;
my @required_init =
map $spec->{$_}{init_arg},
- grep $spec->{$_}{required},
- sort keys %$spec;
+ grep {
+ my %s = %{$spec->{$_}}; # ignore required if default or builder set
+ $s{required} and not($s{builder} or $s{default})
+ } sort keys %$spec;
return '' unless @required_init;
' if (my @missing = grep !exists $args->{$_}, qw('
.join(' ',@required_init).')) {'."\n"
my ($init, $trigger) = @{$spec->{$name}}{qw(init_arg trigger)};
next unless $init && $trigger;
my ($code, $add_captures) = $acc->generate_trigger(
- $name, '$new', $acc->generate_simple_get('$new', $name), $trigger
+ $name, '$new', $acc->generate_simple_get('$new', $name, $spec), $trigger
);
@{$captures}{keys %$add_captures} = values %$add_captures;
$fire .= " ${code} if exists \$args->{${\perlstring $init}};\n";