X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod%2FConstructor.pm;h=29017edb231b9081de289c746166aac50bf3e068;hb=d004c8d565f9b314da7652e9368aeb4587ffaa3d;hp=65a35071f3f57c5ba624dd5a1aa61380795e22b2;hpb=780f14c23e5ae0579d96c830bc668f94c3d248b1;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Method/Constructor.pm b/lib/Class/MOP/Method/Constructor.pm index 65a3507..29017ed 100644 --- a/lib/Class/MOP/Method/Constructor.pm +++ b/lib/Class/MOP/Method/Constructor.pm @@ -5,13 +5,14 @@ use strict; use warnings; use Carp 'confess'; -use Scalar::Util 'blessed', 'weaken', 'looks_like_number'; +use Scalar::Util 'blessed', 'weaken'; +use Try::Tiny; -our $VERSION = '0.80'; +our $VERSION = '1.12'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; -use base 'Class::MOP::Method::Generated'; +use base 'Class::MOP::Method::Inlined'; sub new { my $class = shift; @@ -38,60 +39,50 @@ 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), - }, $class; -} -sub can_be_inlined { 1 } + return Class::MOP::Class->initialize($class)->new_object(@_) + if $class ne __PACKAGE__; -## accessors + my $params = @_ == 1 ? $_[0] : {@_}; -sub options { (shift)->{'options'} } -sub associated_metaclass { (shift)->{'associated_metaclass'} } + 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}, -## cached values ... + # inherited from Class::MOP::Generated + is_inline => $params->{is_inline} || 0, + definition_context => $params->{definition_context}, -sub meta_instance { - warn '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; -} + # inherited from Class::MOP::Inlined + _expected_method_class => $params->{_expected_method_class}, -sub _meta_instance { - my $self = shift; - $self->{'meta_instance'} ||= $self->associated_metaclass->get_meta_instance; + # defined in this subclass + options => $params->{options} || {}, + associated_metaclass => $params->{metaclass}, + }, $class; } -sub attributes { - warn 'The attributes method is deprecated.' - . " Use _attributes instead.\n"; +## accessors - return shift->_attributes; -} +sub options { (shift)->{'options'} } +sub associated_metaclass { (shift)->{'associated_metaclass'} } + +## cached values ... sub _attributes { my $self = shift; - $self->{'attributes'} ||= [ $self->associated_metaclass->get_all_attributes ] + $self->{'attributes'} ||= [ + sort { $a->name cmp $b->name } + $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"; - shift->_initialize_body; -} - sub _initialize_body { my $self = shift; my $method_name = '_generate_constructor_method'; @@ -101,103 +92,40 @@ sub _initialize_body { $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"; - shift->_generate_constructor_method; +sub _eval_environment { + my $self = shift; + my $defaults = [map { $_->default } @{ $self->_attributes }]; + return { + '$defaults' => \$defaults, + }; } 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"; - shift->_generate_constructor_method_inline; -} - sub _generate_constructor_method_inline { my $self = shift; - my $close_over = {}; - - my $source = 'sub {'; - $source .= "\n" . 'my $class = shift;'; - - $source .= "\n" . 'return Class::MOP::Class->initialize($class)->new_object(@_)'; - $source .= "\n" . ' if $class ne \'' . $self->associated_metaclass->name . '\';'; + my $meta = $self->associated_metaclass; - $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($_, $close_over) - } @{ $self->_attributes }); - $source .= ";\n" . 'return $instance'; - $source .= ";\n" . '}'; - warn $source if $self->options->{debug}; - - my $code = $self->_eval_closure( - $close_over, - $source + my @source = ( + 'sub {', + $meta->_inline_new_object, + '}', ); - confess "Could not eval the constructor :\n\n$source\n\nbecause :\n\n$@" if $@; - return $code; -} + warn join("\n", @source) if $self->options->{debug}; -sub _generate_slot_initializer { - my $self = shift; - my $attr = shift; - my $close = 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'"; - } - } - } elsif( $attr->has_builder ) { - $default = '$instance->'.$attr->builder; + my $code = try { + $self->_compile_code(\@source); } + catch { + my $source = join("\n", @source); + confess "Could not eval the constructor :\n\n$source\n\nbecause :\n\n$_"; + }; - 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( - '$instance', - $attr->name, - $default ) . "\n" . - '}') - ); - } elsif ( defined $default ) { - return ( - $self->_meta_instance->inline_set_slot_value( - '$instance', - $attr->name, - $default ) . "\n" - ); - } else { return '' } + return $code; } 1; @@ -268,12 +196,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 @@ -282,7 +204,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