use warnings;
sub generate_constructor_method_inline {
- my ($class, $meta) = @_;
- my $code = $class->_generate_constructor_method_inline($meta);
- warn $code if $ENV{DEBUG};
-
- local $@;
- my $res = eval $code;
- die $@ if $@;
- $res;
-}
-
-sub _generate_constructor_method_inline {
my ($class, $meta) = @_;
+
+ my @attrs = $meta->compute_all_applicable_attributes; # this one is using by evaled code
my $buildall = $class->_generate_BUILDALL($meta);
my $buildargs = $class->_generate_BUILDARGS();
- my $classname = $meta->name;
- my $processattrs = $class->_generate_processattrs($meta);
+ my $processattrs = $class->_generate_processattrs($meta, \@attrs);
- return <<"...";
+ my $code = <<"...";
sub {
my \$class = shift;
my \$args = $buildargs;
- my \$instance = bless {}, '$classname';
- my \$meta = \$instance->meta;
+ my \$instance = bless {}, \$class;
$processattrs;
$buildall;
return \$instance;
}
...
+
+ warn $code if $ENV{DEBUG};
+
+ local $@;
+ my $res = eval $code;
+ die $@ if $@;
+ $res;
}
sub _generate_processattrs {
- my ($class, $meta, ) = @_;
- my @attrs = $meta->compute_all_applicable_attributes;
+ my ($class, $meta, $attrs) = @_;
my @res;
- for my $attr (@attrs) {
+ for my $index (0..scalar(@$attrs)-1) {
+ my $attr = $attrs->[$index];
my $from = $attr->init_arg;
my $key = $attr->name;
my $part1 = do {
if ($attr->has_type_constraint) {
push @code, "\$attr->verify_type_constraint( \$args->{\$from} );";
}
- push @code, "\$instance->{\$key} = \$args->{\$from};";
+ push @code, "\$instance->{'$key'} = \$args->{\$from};";
if ($attr->is_weak_ref) {
- push @code, "weaken( \$instance->{\$key} ) if ref( \$instance->{\$key} );";
+ push @code, "weaken( \$instance->{'$key'} ) if ref( \$instance->{'$key'} );";
}
if ( $attr->has_trigger ) {
push @code, "\$attr->trigger->( \$instance, \$args->{\$from}, \$attr );";
if ($attr->has_type_constraint) {
push @code, "\$attr->verify_type_constraint(\$value);";
}
- push @code, "\$instance->{\$key} = \$value;";
+ push @code, "\$instance->{'$key'} = \$value;";
if ($attr->is_weak_ref) {
- push @code, "weaken( \$instance->{\$key} ) if ref( \$instance->{\$key} );";
+ push @code, "weaken( \$instance->{'$key'} ) if ref( \$instance->{'$key'} );";
}
}
join "\n", @code;
};
my $code = <<"...";
{
- my \$attr = \$meta->get_attribute('$key');
+ my \$attr = \$attrs[$index];
my \$from = '$from';
- my \$key = '$key';
if (defined(\$from) && exists(\$args->{\$from})) {
$part1;
} else {