use warnings;
use Carp 'confess';
-use Scalar::Util 'blessed', 'weaken', 'looks_like_number';
+use Scalar::Util 'blessed', 'weaken';
-our $VERSION = '0.78';
+our $VERSION = '1.09';
$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
-use base 'Class::MOP::Method::Generated';
+use base 'Class::MOP::Method::Inlined';
sub new {
my $class = shift;
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),
+
+ return Class::MOP::Class->initialize($class)->new_object(@_)
+ if $class ne __PACKAGE__;
+
+ my $params = @_ == 1 ? $_[0] : {@_};
+
+ return bless {
+ # inherited from Class::MOP::Method
+ body => $params->{body},
+ # associated_metaclass => $params->{associated_metaclass}, # overriden
+ package_name => $params->{package_name},
+ name => $params->{name},
+ original_method => $params->{original_method},
+
+ # inherited from Class::MOP::Generated
+ is_inline => $params->{is_inline} || 0,
+ definition_context => $params->{definition_context},
+
+ # inherited from Class::MOP::Inlined
+ _expected_method_class => $params->{_expected_method_class},
+
+ # defined in this subclass
+ options => $params->{options} || {},
+ associated_metaclass => $params->{metaclass},
}, $class;
}
-sub can_be_inlined { 1 }
-
## accessors
sub options { (shift)->{'options'} }
## cached values ...
-sub meta_instance {
+sub _attributes {
my $self = shift;
- $self->{'meta_instance'} ||= $self->associated_metaclass->get_meta_instance;
-}
-
-sub attributes {
- my $self = shift;
- $self->{'attributes'} ||= [ $self->associated_metaclass->compute_all_applicable_attributes ]
+ $self->{'attributes'} ||= [ $self->associated_metaclass->get_all_attributes ]
}
## method
-sub initialize_body {
- warn 'The initialize_body method has been made private.'
- . " The public version is deprecated and will be removed in a future release.\n";
- goto &_initialize_body;
-}
-
sub _initialize_body {
my $self = shift;
my $method_name = '_generate_constructor_method';
$self->{'body'} = $self->$method_name;
}
-sub generate_constructor_method {
- warn 'The generate_constructor_method method has been made private.'
- . " The public version is deprecated and will be removed in a future release.\n";
- goto &_generate_constructor_method;
-}
-
sub _generate_constructor_method {
return sub { Class::MOP::Class->initialize(shift)->new_object(@_) }
}
-sub generate_constructor_method_inline {
- warn 'The generate_constructor_method_inline method has been made private.'
- . " The public version is deprecated and will be removed in a future release.\n";
- goto &_generate_constructor_method_inline;
-}
-
sub _generate_constructor_method_inline {
my $self = shift;
- my $close_over = {};
+ my $defaults = [map { $_->default } @{ $self->_attributes }];
+
+ my $close_over = {
+ '$defaults' => \$defaults,
+ };
my $source = 'sub {';
$source .= "\n" . 'my $class = shift;';
$source .= "\n" . 'my $params = @_ == 1 ? $_[0] : {@_};';
- $source .= "\n" . 'my $instance = ' . $self->meta_instance->inline_create_instance('$class');
+ $source .= "\n" . 'my $instance = ' . $self->associated_metaclass->inline_create_instance('$class');
+ my $idx = 0;
$source .= ";\n" . (join ";\n" => map {
- $self->_generate_slot_initializer($_, $close_over)
- } @{$self->attributes});
+ $self->_generate_slot_initializer($_, $idx++)
+ } @{ $self->_attributes });
$source .= ";\n" . 'return $instance';
$source .= ";\n" . '}';
warn $source if $self->options->{debug};
- my $code = $self->_eval_closure(
+ my ( $code, $e ) = $self->_eval_closure(
$close_over,
$source
);
- confess "Could not eval the constructor :\n\n$source\n\nbecause :\n\n$@" if $@;
+ confess "Could not eval the constructor :\n\n$source\n\nbecause :\n\n$e" if $e;
return $code;
}
sub _generate_slot_initializer {
my $self = shift;
my $attr = shift;
- my $close = shift;
+ my $idx = shift;
my $default;
if ($attr->has_default) {
- # 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) {
- my $idx = @{$close->{'@defaults'}||=[]};
- push(@{$close->{'@defaults'}}, $attr->default);
- $default = '$defaults[' . $idx . ']->($instance)';
- }
- else {
- $default = $attr->default;
- # make sure to quote strings ...
- unless (looks_like_number($default)) {
- $default = "'$default'";
- }
- }
+ $default = $self->_generate_default_value($attr, $idx);
} elsif( $attr->has_builder ) {
$default = '$instance->'.$attr->builder;
}
- if ( defined $attr->init_arg ) {
- return (
- 'if(exists $params->{\'' . $attr->init_arg . '\'}){' . "\n" .
- $self->meta_instance->inline_set_slot_value(
- '$instance',
- $attr->name,
- '$params->{\'' . $attr->init_arg . '\'}' ) . "\n" .
- '} ' . (!defined $default ? '' : 'else {' . "\n" .
- $self->meta_instance->inline_set_slot_value(
+ if ( defined( my $init_arg = $attr->init_arg ) ) {
+ return (
+ 'if(exists $params->{\''
+ . $init_arg . '\'}){' . "\n"
+ . $attr->inline_set(
+ '$instance',
+ '$params->{\'' . $init_arg . '\'}'
+ )
+ . "\n" . '} '
+ . (
+ !defined $default ? '' : 'else {' . "\n"
+ . $attr->inline_set(
'$instance',
- $attr->name,
- $default ) . "\n" .
- '}')
+ $default
+ )
+ . "\n" . '}'
+ )
);
- } elsif ( defined $default ) {
+ }
+ elsif ( defined $default ) {
return (
- $self->meta_instance->inline_set_slot_value(
+ $attr->inline_set(
'$instance',
- $attr->name,
- $default ) . "\n"
+ $default
+ )
+ . "\n"
);
- } else { return '' }
+ }
+ else {
+ return '';
+ }
+}
+
+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 '$defaults->[' . $index . ']->($instance)';
+ }
+ else {
+ return '$defaults->[' . $index . ']';
+ }
}
1;
This returns the L<Class::MOP::Class> object for the method.
-=item B<< $metamethod->is_inline >>
-
-Returns a boolean indicating whether or not the constructor is
-inlined.
-
-=item B<< $metamethod->can_be_inlined >>
-
-This method always returns true in this class. It exists so that
-subclasses (as in Moose) can do some sort of checking to determine
-whether or not inlining the constructor is safe.
-
=back
=head1 AUTHORS
=head1 COPYRIGHT AND LICENSE
-Copyright 2006-2009 by Infinity Interactive, Inc.
+Copyright 2006-2010 by Infinity Interactive, Inc.
L<http://www.iinteractive.com>