X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod%2FConstructor.pm;h=c30e0f47d48bd9ecf8ba7ab7e693322b8143c6b9;hb=e24b19fbbf5a62172dad0d8dfb86e03eed9a51c1;hp=9a71a708c46b71447b296a3dbd6a5ce898d3f02a;hpb=6c34db07326ebe4a50267275bdea7ed9d83ea510;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Method/Constructor.pm b/lib/Class/MOP/Method/Constructor.pm index 9a71a70..c30e0f4 100644 --- a/lib/Class/MOP/Method/Constructor.pm +++ b/lib/Class/MOP/Method/Constructor.pm @@ -7,10 +7,11 @@ use warnings; use Carp 'confess'; use Scalar::Util 'blessed', 'weaken', 'looks_like_number'; -our $VERSION = '0.05'; +our $VERSION = '0.86'; +$VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; -use base 'Class::MOP::Method::Generated'; +use base 'Class::MOP::Method::Inlined'; sub new { my $class = shift; @@ -21,96 +22,133 @@ sub new { if $options{is_inline}; ($options{package_name} && $options{name}) - || confess "You must supply the package_name and name parameters"; + || 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 # needed - weaken($self->{'$!associated_metaclass'}); + 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), + }, $class; +} + ## accessors -sub options { (shift)->{'%!options'} } -sub associated_metaclass { (shift)->{'$!associated_metaclass'} } +sub options { (shift)->{'options'} } +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; + $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; - $self->{'&!body'} = $self->$method_name; + $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 $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 $instance = ' . $self->meta_instance->inline_create_instance('$class'); + $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($_) - } 0 .. (@{$self->attributes} - 1)); + $self->_generate_slot_initializer($_, $close_over) + } @{ $self->_attributes }); $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, $e ) = $self->_eval_closure( + $close_over, + $source + ); + confess "Could not eval the constructor :\n\n$source\n\nbecause :\n\n$e" if $e; - $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 $attr = $self->attributes->[$index]; + my $attr = shift; + my $close = shift; my $default; if ($attr->has_default) { @@ -121,7 +159,9 @@ sub _generate_slot_initializer { # 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; @@ -136,23 +176,23 @@ sub _generate_slot_initializer { if ( defined $attr->init_arg ) { return ( - 'if(exists $params{\'' . $attr->init_arg . '\'}){' . "\n" . - $self->meta_instance->inline_set_slot_value( + '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( + $self->_meta_instance->inline_set_slot_value( '$instance', - ("'" . $attr->name . "'"), + $attr->name, $default ) . "\n" . '}') ); } elsif ( defined $default ) { return ( - $self->meta_instance->inline_set_slot_value( + $self->_meta_instance->inline_set_slot_value( '$instance', - ("'" . $attr->name . "'"), + $attr->name, $default ) . "\n" ); } else { return '' } @@ -160,8 +200,6 @@ sub _generate_slot_initializer { 1; -1; - __END__ =pod @@ -182,56 +220,51 @@ Class::MOP::Method::Constructor - Method Meta Object for constructors ); # calling the constructor ... - $constructor->body->($metaclass->name, %params); + $constructor->body->execute($metaclass->name, %params); =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<< Class::MOP::Method::Constructor->new(%options) >> -=item B +This creates a new constructor object. It accepts a hash reference of +options. -This returns the options HASH which is passed into C. +=over 8 -=item B +=item * metaclass -This returns the metaclass which is passed into C. +This should be a L object. It is required. -=item B +=item * name -This returns the list of attributes which are 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 the meta instance which is associated with the -metaclass which is passed into C. +The package name for the method. This is required. -=item B +=item * is_inline -This returns a boolean, but since constructors are very rarely -not inlined, this always returns true for now. - -=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 @@ -241,7 +274,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