X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod%2FConstructor.pm;h=016f9ba87f9649257452f4804caeaef1e4a298c2;hb=e00524a03329f89358767302ffc62cd15ec33571;hp=fcff479d60bb18d7deee498d4d6be7dc5efc4e9c;hpb=2367814a108bbb85efbf76b57fc58bf464d68455;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Method/Constructor.pm b/lib/Class/MOP/Method/Constructor.pm index fcff479..016f9ba 100644 --- a/lib/Class/MOP/Method/Constructor.pm +++ b/lib/Class/MOP/Method/Constructor.pm @@ -7,106 +7,161 @@ use warnings; use Carp 'confess'; use Scalar::Util 'blessed', 'weaken', 'looks_like_number'; -our $VERSION = '0.01'; +our $VERSION = '0.83'; +$VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; -use base 'Class::MOP::Method'; +use base 'Class::MOP::Method::Inlined'; sub new { my $class = shift; my %options = @_; - - (exists $options{options} && ref $options{options} eq 'HASH') - || confess "You must pass a hash of options"; - - my $self = bless { - # from our superclass - '&!body' => undef, - # specific to this subclass - '%!options' => $options{options}, - '$!meta_instance' => $options{metaclass}->get_meta_instance, - '@!attributes' => [ $options{metaclass}->compute_all_applicable_attributes ], - # ... - '$!associated_metaclass' => $options{metaclass}, - } => $class; - - # we don't want this creating - # a cycle in the code, if not + + (blessed $options{metaclass} && $options{metaclass}->isa('Class::MOP::Class')) + || confess "You must pass a metaclass instance if you want to inline" + if $options{is_inline}; + + ($options{package_name} && $options{name}) + || confess "You must supply the package_name and name parameters $Class::MOP::Method::UPGRADE_ERROR_TEXT"; + + my $self = $class->_new(\%options); + + # we don't want this creating + # a cycle in the code, if not # needed -# weaken($self->{'$!meta_instance'}); - weaken($self->{'$!associated_metaclass'}); + weaken($self->{'associated_metaclass'}); - $self->intialize_body; + $self->_initialize_body; - return $self; + return $self; } -## predicates +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'} } + +## 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; +} -# NOTE: -# if it is blessed into this class, -# then it is always inlined, that is -# pretty much what this class is for. -sub is_inline { 1 } +sub _meta_instance { + my $self = shift; + $self->{'meta_instance'} ||= $self->associated_metaclass->get_meta_instance; +} -## accessors +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"); -sub options { (shift)->{'%!options'} } -sub meta_instance { (shift)->{'$!meta_instance'} } -sub attributes { (shift)->{'@!attributes'} } + return shift->_attributes; +} -sub associated_metaclass { (shift)->{'$!associated_metaclass'} } +sub _attributes { + my $self = shift; + $self->{'attributes'} ||= [ $self->associated_metaclass->get_all_attributes ] +} ## method -sub intialize_body { +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'; + + $method_name .= '_inline' if $self->is_inline; + + $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; - # TODO: - # the %options should also include a both - # a call 'initializer' and call 'SUPER::' - # options, which should cover approx 90% - # of the possible use cases (even if it - # requires some adaption on the part of - # the author, after all, nothing is free) + + my $close_over = {}; + my $source = 'sub {'; - $source .= "\n" . 'my ($class, %params) = @_;'; - $source .= "\n" . 'my $instance = ' . $self->meta_instance->inline_create_instance('$class'); - $source .= ";\n" . (join ";\n" => map { - $self->_generate_slot_initializer($_) - } 0 .. (@{$self->attributes} - 1)); + $source .= "\n" . 'my $class = shift;'; + + $source .= "\n" . 'return Class::MOP::Class->initialize($class)->new_object(@_)'; + $source .= "\n" . ' if $class ne \'' . $self->associated_metaclass->name . '\';'; + + $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; - { - # NOTE: - # create the nessecary lexicals - # to be picked up in the eval - my $attrs = $self->attributes; - - $code = eval $source; - confess "Could not eval the constructor :\n\n$source\n\nbecause :\n\n$@" if $@; - } - $self->{'&!body'} = $code; + $source .= ";\n" . '}'; + warn $source if $self->options->{debug}; + + my $code = $self->_eval_closure( + $close_over, + $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) { # NOTE: # default values can either be CODE refs - # in which case we need to call them. Or + # 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) { - $default = '$attrs->[' . $index . ']->default($instance)'; + my $idx = @{$close->{'@defaults'}||=[]}; + push(@{$close->{'@defaults'}}, $attr->default); + $default = '$defaults[' . $idx . ']->($instance)'; } else { $default = $attr->default; @@ -115,15 +170,33 @@ sub _generate_slot_initializer { $default = "'$default'"; } } + } elsif( $attr->has_builder ) { + $default = '$instance->'.$attr->builder; } - $self->meta_instance->inline_set_slot_value( - '$instance', - ("'" . $attr->name . "'"), - ('$params{\'' . $attr->init_arg . '\'}' . (defined $default ? (' || ' . $default) : '')) - ); -} -1; + 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 '' } +} 1; @@ -131,31 +204,67 @@ __END__ =pod -=head1 NAME +=head1 NAME Class::MOP::Method::Constructor - Method Meta Object for constructors =head1 SYNOPSIS + use Class::MOP::Method::Constructor; + + my $constructor = Class::MOP::Method::Constructor->new( + metaclass => $metaclass, + options => { + debug => 1, # this is all for now + }, + ); + + # calling the constructor ... + $constructor->body->execute($metaclass->name, %params); + =head1 DESCRIPTION +This is a subclass of C which generates +constructor methods. + =head1 METHODS =over 4 -=item B +=item B<< Class::MOP::Method::Constructor->new(%options) >> + +This creates a new constructor object. It accepts a hash reference of +options. + +=over 8 + +=item * metaclass -=item B +This should be a L object. It is required. -=item B +=item * name + +The method name (without a package name). This is required. + +=item * package_name + +The package name for the method. This is required. + +=item * is_inline + +This indicates whether or not the constructor should be inlined. This +defaults to false. + +=back -=item B +=item B<< $metamethod->is_inline >> -=item B +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 @@ -165,12 +274,12 @@ Stevan Little Estevan@iinteractive.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006, 2007 by Infinity Interactive, Inc. +Copyright 2006-2009 by Infinity Interactive, Inc. L This library is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. +it under the same terms as Perl itself. =cut