X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod%2FConstructor.pm;h=32af420f63dbba2ecfa09d675180abee40f264f0;hb=db130c70dd57d254d55a30d0a6c58df44505ce8a;hp=a4dc3d39c8deda438a7691a5b8f4ff8d05c52741;hpb=95e647f01bdb9147b9d27cb9ac49d2adebff27b8;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Method/Constructor.pm b/lib/Class/MOP/Method/Constructor.pm index a4dc3d3..32af420 100644 --- a/lib/Class/MOP/Method/Constructor.pm +++ b/lib/Class/MOP/Method/Constructor.pm @@ -5,9 +5,9 @@ use strict; use warnings; use Carp 'confess'; -use Scalar::Util 'blessed', 'weaken', 'looks_like_number'; +use Scalar::Util 'blessed', 'weaken'; -our $VERSION = '0.82_01'; +our $VERSION = '1.05'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; @@ -38,17 +38,30 @@ sub new { 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; } @@ -59,24 +72,11 @@ sub associated_metaclass { (shift)->{'associated_metaclass'} } ## cached values ... -sub meta_instance { - Carp::cluck('The meta_instance method has been made private.' - . " The public version is deprecated and will be removed in a future release.\n"); - shift->_meta_instance; -} - sub _meta_instance { my $self = shift; $self->{'meta_instance'} ||= $self->associated_metaclass->get_meta_instance; } -sub attributes { - Carp::cluck('The attributes method has been made private.' - . " The public version is deprecated and will be removed in a future release.\n"); - - return shift->_attributes; -} - sub _attributes { my $self = shift; $self->{'attributes'} ||= [ $self->associated_metaclass->get_all_attributes ] @@ -84,12 +84,6 @@ sub _attributes { ## method -sub initialize_body { - Carp::cluck('The initialize_body method has been made private.' - . " The public version is deprecated and will be removed in a future release.\n"); - shift->_initialize_body; -} - sub _initialize_body { my $self = shift; my $method_name = '_generate_constructor_method'; @@ -99,26 +93,18 @@ sub _initialize_body { $self->{'body'} = $self->$method_name; } -sub generate_constructor_method { - Carp::cluck('The generate_constructor_method method has been made private.' - . " The public version is deprecated and will be removed in a future release.\n"); - shift->_generate_constructor_method; -} - sub _generate_constructor_method { return sub { Class::MOP::Class->initialize(shift)->new_object(@_) } } -sub generate_constructor_method_inline { - Carp::cluck('The generate_constructor_method_inline method has been made private.' - . " The public version is deprecated and will be removed in a future release.\n"); - shift->_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;'; @@ -129,18 +115,19 @@ sub _generate_constructor_method_inline { $source .= "\n" . 'my $params = @_ == 1 ? $_[0] : {@_};'; $source .= "\n" . 'my $instance = ' . $self->_meta_instance->inline_create_instance('$class'); + my $idx = 0; $source .= ";\n" . (join ";\n" => map { - $self->_generate_slot_initializer($_, $close_over) + $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; } @@ -148,54 +135,68 @@ sub _generate_constructor_method_inline { 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 ) ) { + my $mi = $self->_meta_instance; + my $attr_name = $attr->name; + + return ( + 'if(exists $params->{\'' + . $init_arg . '\'}){' . "\n" + . $mi->inline_set_slot_value( + '$instance', + $attr_name, + '$params->{\'' . $init_arg . '\'}' + ) + . "\n" . '} ' + . ( + !defined $default ? '' : 'else {' . "\n" + . $mi->inline_set_slot_value( '$instance', - $attr->name, - $default ) . "\n" . - '}') + $attr_name, + $default + ) + . "\n" . '}' + ) ); - } elsif ( defined $default ) { + } + elsif ( defined $default ) { return ( $self->_meta_instance->inline_set_slot_value( '$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; @@ -266,12 +267,6 @@ inlined. This returns the L object for the method. -=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 @@ -280,7 +275,7 @@ Stevan Little Estevan@iinteractive.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006-2009 by Infinity Interactive, Inc. +Copyright 2006-2010 by Infinity Interactive, Inc. L