X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod%2FConstructor.pm;h=4a6b9f2c8a6cf305b67cf8ac81becc0b1eee50a0;hb=7813a0c5d3003a9604d810184231b09f3e206023;hp=77910e9358fa4b87d15b5bdce2db2eb955062ab9;hpb=eca95e0476ae5a66144c4fd1f4a23c2ba4bdbf26;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Method/Constructor.pm b/lib/Class/MOP/Method/Constructor.pm index 77910e9..4a6b9f2 100644 --- a/lib/Class/MOP/Method/Constructor.pm +++ b/lib/Class/MOP/Method/Constructor.pm @@ -7,11 +7,11 @@ use warnings; use Carp 'confess'; use Scalar::Util 'blessed', 'weaken', 'looks_like_number'; -our $VERSION = '0.78'; +our $VERSION = '0.91'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; -use base 'Class::MOP::Method::Generated'; +use base 'Class::MOP::Method::Inlined'; sub new { my $class = shift; @@ -31,29 +31,40 @@ sub new { # needed weaken($self->{'associated_metaclass'}); - $self->initialize_body; + $self->_initialize_body; 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), + + 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'} } @@ -62,20 +73,39 @@ 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->compute_all_applicable_attributes ] + $self->{'attributes'} ||= [ $self->associated_metaclass->get_all_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'; + my $method_name = '_generate_constructor_method'; $method_name .= '_inline' if $self->is_inline; @@ -83,10 +113,35 @@ sub initialize_body { } 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 _inline_set_slot_value{ + my($self,$attr, $instance, $attr_var, $value) = @_; + + if($attr->has_trigger){ + return sprintf q{ my $value = %s; %s->call_trigger(%s, $value); }, + $self->_meta_instance->inline_set_slot_value($instance, $attr->name, $value), + $attr_var, $instance, $value; + } + else{ + return $self->_meta_instance->inline_set_slot_value($instance, $attr->name, $value); + } +} + 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 = {}; @@ -99,29 +154,34 @@ sub generate_constructor_method_inline { $source .= "\n" . 'my $params = @_ == 1 ? $_[0] : {@_};'; - $source .= "\n" . 'my $instance = ' . $self->meta_instance->inline_create_instance('$class'); + $source .= "\n" . 'my $instance = ' . $self->_meta_instance->inline_create_instance('$class'); $source .= ";\n" . (join ";\n" => map { $self->_generate_slot_initializer($_, $close_over) - } 0 .. (@{$self->attributes} - 1)); + } @{ $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 $index = shift; + my $attr = shift; my $close = shift; - my $attr = $self->attributes->[$index]; + + my $attr_var = do{ + my $attrs = ($close->{'@attrs'} ||= []); + push @{$attrs}, $attr; + sprintf q{$attrs[%d]}, scalar(@{$attrs}) - 1; + }; my $default; if ($attr->has_default) { @@ -147,25 +207,28 @@ sub _generate_slot_initializer { $default = '$instance->'.$attr->builder; } - if ( defined $attr->init_arg ) { + if ( defined(my $init_arg = $attr->init_arg) ) { return ( - 'if(exists $params->{\'' . $attr->init_arg . '\'}){' . "\n" . - $self->meta_instance->inline_set_slot_value( + 'if(exists $params->{\'' . $init_arg . '\'}){' . "\n" . + $self->_inline_set_slot_value( + $attr, '$instance', - $attr->name, - '$params->{\'' . $attr->init_arg . '\'}' ) . "\n" . + $attr_var, + '$params->{\'' . $init_arg . '\'}' ) . "\n" . '} ' . (!defined $default ? '' : 'else {' . "\n" . - $self->meta_instance->inline_set_slot_value( + $self->_inline_set_slot_value( + $attr, '$instance', - $attr->name, + $attr_var, $default ) . "\n" . '}') ); } elsif ( defined $default ) { return ( - $self->meta_instance->inline_set_slot_value( + $self->_inline_set_slot_value( + $attr, '$instance', - $attr->name, + $attr_var, $default ) . "\n" ); } else { return '' } @@ -197,58 +260,47 @@ Class::MOP::Method::Constructor - Method Meta Object for constructors =head1 DESCRIPTION -This is a subclass of C which deals with -class constructors. This is used when making a class immutable -to generate an optimized constructor. +This is a subclass of C which generates +constructor methods. =head1 METHODS =over 4 -=item B $meta, options => \%options)> - -=item B - -This returns the options HASH which is passed into C. +=item B<< Class::MOP::Method::Constructor->new(%options) >> -=item B +This creates a new constructor object. It accepts a hash reference of +options. -This returns the metaclass which is passed into C. +=over 8 -=item B +=item * metaclass -This returns the list of attributes which are associated with the -metaclass which is passed into C. +This should be a L object. It is required. -=item B +=item * name -This returns the meta instance which is associated with the -metaclass which is passed into C. +The method name (without a package name). This is required. -=item B +=item * package_name -This returns a boolean, but since constructors are very rarely -not inlined, this always returns true for now. +The package name for the method. This is required. -=item B +=item * is_inline -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 - -This creates the code reference for the constructor itself. +This indicates whether or not the constructor should be inlined. This +defaults to false. =back -=head2 Method Generators +=item B<< $metamethod->is_inline >> -=over 4 +Returns a boolean indicating whether or not the constructor is +inlined. -=item B +=item B<< $metamethod->associated_metaclass >> -=item B +This returns the L object for the method. =back @@ -258,7 +310,7 @@ Stevan Little Estevan@iinteractive.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006-2008 by Infinity Interactive, Inc. +Copyright 2006-2009 by Infinity Interactive, Inc. L