use Carp 'confess';
use Scalar::Util 'blessed', 'weaken', 'looks_like_number';
-our $VERSION = '0.65';
+our $VERSION = '0.78';
+$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
use base 'Class::MOP::Method::Generated';
($options{package_name} && $options{name})
|| confess "You must supply the package_name and name parameters $Class::MOP::Method::UPGRADE_ERROR_TEXT";
- my $self = bless {
- # from our superclass
- 'body' => undef,
- 'package_name' => $options{package_name},
- 'name' => $options{name},
- # specific to this subclass
- 'options' => $options{options} || {},
- 'associated_metaclass' => $options{metaclass},
- 'is_inline' => ($options{is_inline} || 0),
- } => $class;
+ my $self = $class->_new(\%options);
# we don't want this creating
# a cycle in the code, if not
return $self;
}
+sub _new {
+ my $class = shift;
+ my $options = @_ == 1 ? $_[0] : {@_};
+
+ bless {
+ # from our superclass
+ 'body' => undef,
+ 'package_name' => $options->{package_name},
+ 'name' => $options->{name},
+ # specific to this subclass
+ 'options' => $options->{options} || {},
+ 'associated_metaclass' => $options->{metaclass},
+ 'is_inline' => ($options->{is_inline} || 0),
+ }, $class;
+}
+
+sub can_be_inlined { 1 }
+
## accessors
sub options { (shift)->{'options'} }
sub generate_constructor_method_inline {
my $self = shift;
+ my $close_over = {};
+
my $source = 'sub {';
- $source .= "\n" . 'my ($class, %params) = @_;';
+ $source .= "\n" . 'my $class = shift;';
- $source .= "\n" . 'return Class::MOP::Class->initialize($class)->new_object(%params)';
+ $source .= "\n" . 'return Class::MOP::Class->initialize($class)->new_object(@_)';
$source .= "\n" . ' if $class ne \'' . $self->associated_metaclass->name . '\';';
+ $source .= "\n" . 'my $params = @_ == 1 ? $_[0] : {@_};';
+
$source .= "\n" . 'my $instance = ' . $self->meta_instance->inline_create_instance('$class');
$source .= ";\n" . (join ";\n" => map {
- $self->_generate_slot_initializer($_)
+ $self->_generate_slot_initializer($_, $close_over)
} 0 .. (@{$self->attributes} - 1));
$source .= ";\n" . 'return $instance';
$source .= ";\n" . '}';
warn $source if $self->options->{debug};
- my $code;
- {
- # NOTE:
- # create the nessecary lexicals
- # to be picked up in the eval
- my $attrs = $self->attributes;
+ my $code = $self->_eval_closure(
+ $close_over,
+ $source
+ );
+ confess "Could not eval the constructor :\n\n$source\n\nbecause :\n\n$@" if $@;
- $code = eval $source;
- confess "Could not eval the constructor :\n\n$source\n\nbecause :\n\n$@" if $@;
- }
return $code;
}
sub _generate_slot_initializer {
my $self = shift;
my $index = shift;
+ my $close = shift;
my $attr = $self->attributes->[$index];
# in which case we can just deal with them
# in the code we eval.
if ($attr->is_default_a_coderef) {
- $default = '$attrs->[' . $index . ']->default($instance)';
+ my $idx = @{$close->{'@defaults'}||=[]};
+ push(@{$close->{'@defaults'}}, $attr->default);
+ $default = '$defaults[' . $idx . ']->($instance)';
}
else {
$default = $attr->default;
if ( defined $attr->init_arg ) {
return (
- 'if(exists $params{\'' . $attr->init_arg . '\'}){' . "\n" .
+ 'if(exists $params->{\'' . $attr->init_arg . '\'}){' . "\n" .
$self->meta_instance->inline_set_slot_value(
'$instance',
- ("'" . $attr->name . "'"),
- '$params{\'' . $attr->init_arg . '\'}' ) . "\n" .
+ $attr->name,
+ '$params->{\'' . $attr->init_arg . '\'}' ) . "\n" .
'} ' . (!defined $default ? '' : 'else {' . "\n" .
$self->meta_instance->inline_set_slot_value(
'$instance',
- ("'" . $attr->name . "'"),
+ $attr->name,
$default ) . "\n" .
'}')
);
return (
$self->meta_instance->inline_set_slot_value(
'$instance',
- ("'" . $attr->name . "'"),
+ $attr->name,
$default ) . "\n"
);
} else { return '' }
);
# calling the constructor ...
- $constructor->body->($metaclass->name, %params);
+ $constructor->body->execute($metaclass->name, %params);
=head1 DESCRIPTION
This returns a boolean, but since constructors are very rarely
not inlined, this always returns true for now.
+=item B<can_be_inlined>
+
+This method always returns true in this class. It exists so that
+subclasses (like in Moose) can override and do some sort of checking
+to determine whether or not inlining the constructor is safe.
+
=item B<initialize_body>
This creates the code reference for the constructor itself.
=head1 COPYRIGHT AND LICENSE
-Copyright 2006-2008 by Infinity Interactive, Inc.
+Copyright 2006-2009 by Infinity Interactive, Inc.
L<http://www.iinteractive.com>