X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod%2FConstructor.pm;h=1f196271e532648befd41d71eab0f1242334549d;hb=28fa06b5d932b8a2f9bc1b6b394893c0d7c9efac;hp=9439beb734c9b519d967218fd945d8695af27ee0;hpb=565f0cbbe40a1aa08b7b85574c408dc7e58b2211;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Method/Constructor.pm b/lib/Class/MOP/Method/Constructor.pm index 9439beb..1f19627 100644 --- a/lib/Class/MOP/Method/Constructor.pm +++ b/lib/Class/MOP/Method/Constructor.pm @@ -7,7 +7,8 @@ use warnings; use Carp 'confess'; use Scalar::Util 'blessed', 'weaken', 'looks_like_number'; -our $VERSION = '0.02'; +our $VERSION = '0.78'; +$VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use base 'Class::MOP::Method::Generated'; @@ -15,44 +16,59 @@ use base 'Class::MOP::Method::Generated'; 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}, - '$!associated_metaclass' => $options{metaclass}, - '$!is_inline' => ($options{is_inline} || 0), - } => $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->{'$!associated_metaclass'}); + weaken($self->{'associated_metaclass'}); $self->initialize_body; - return $self; + return $self; } -## accessors +sub _new { + my $class = shift; + my $options = @_ == 1 ? $_[0] : {@_}; -sub options { (shift)->{'%!options'} } -sub associated_metaclass { (shift)->{'$!associated_metaclass'} } + 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 } + +## accessors + +sub options { (shift)->{'options'} } +sub associated_metaclass { (shift)->{'associated_metaclass'} } ## cached values ... -sub 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 { +sub attributes { my $self = shift; - $self->{'@!attributes'} ||= [ $self->associated_metaclass->compute_all_applicable_attributes ] + $self->{'attributes'} ||= [ $self->associated_metaclass->compute_all_applicable_attributes ] } ## method @@ -60,62 +76,62 @@ sub attributes { sub initialize_body { my $self = shift; 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 { - return sub { (shift)->meta->new_object(@_) } + return sub { Class::MOP::Class->initialize(shift)->new_object(@_) } } sub generate_constructor_method_inline { my $self = shift; + my $close_over = {}; + my $source = 'sub {'; - $source .= "\n" . 'my ($class, %params) = @_;'; - - $source .= "\n" . 'return $class->meta->new_object(%params)'; - $source .= "\n" . ' if $class ne \'' . $self->associated_metaclass->name . '\';'; - + $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($_) + $source .= ";\n" . (join ";\n" => map { + $self->_generate_slot_initializer($_, $close_over) } 0 .. (@{$self->attributes} - 1)); $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 $@; - } - return $code; + $source .= ";\n" . '}'; + warn $source if $self->options->{debug}; + + return $self->_eval_closure( + $close_over, + $source + ); } sub _generate_slot_initializer { my $self = shift; my $index = shift; - + my $close = shift; + my $attr = $self->attributes->[$index]; - + 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; @@ -124,15 +140,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; @@ -140,28 +174,29 @@ __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, + metaclass => $metaclass, options => { debug => 1, # this is all for now - }, + }, ); - + # 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 a subclass of C which deals with +class constructors. This is used when making a class immutable +to generate an optimized constructor. =head1 METHODS @@ -179,26 +214,32 @@ This returns the metaclass which is passed into C. =item B -This returns the list of attributes which are associated with the +This returns the list of attributes which are associated with the metaclass which is passed into C. =item B -This returns the meta instance which is associated with the +This returns the meta instance which is associated with the metaclass which is passed into C. =item B -This returns a boolean, but since constructors are very rarely +This returns a boolean, but since constructors are very rarely not inlined, this always returns true for now. +=item B + +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 creates the code reference for the constructor itself. =back -=head2 Method Generators +=head2 Method Generators =over 4 @@ -214,12 +255,12 @@ Stevan Little Estevan@iinteractive.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006, 2007 by Infinity Interactive, Inc. +Copyright 2006-2008 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