X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FMethod%2FConstructor.pm;h=0a6dd36fe40af110148d674bed0d2f8da2b8d524;hb=baf46b9edc7dc3665c7eaf9d1684b157efb09e1a;hp=9d8fc18204fa7d5e236abad958d054a738acb736;hpb=a62dcd43575e3069a70277082c7be85fb71322bf;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Method/Constructor.pm b/lib/Moose/Meta/Method/Constructor.pm index 9d8fc18..0a6dd36 100644 --- a/lib/Moose/Meta/Method/Constructor.pm +++ b/lib/Moose/Meta/Method/Constructor.pm @@ -6,11 +6,11 @@ use warnings; use Scalar::Util 'blessed', 'weaken', 'looks_like_number'; -our $VERSION = '0.71_01'; +our $VERSION = '0.72_01'; our $AUTHORITY = 'cpan:STEVAN'; use base 'Moose::Meta::Method', - 'Class::MOP::Method::Generated'; + 'Class::MOP::Method::Constructor'; sub new { my $class = shift; @@ -63,7 +63,7 @@ sub can_be_inlined { grep { $_ ne $expected_class } $metaclass->linearized_isa ) { - my $transformer = $meta->get_immutable_transformer; + my $transformer = $meta->immutable_transformer; # This is actually a false positive if we're in a subclass of # this class, _and_ the expected class is not overridden (but @@ -81,7 +81,10 @@ sub can_be_inlined { if ( $constructor->body != $expected_class->can('new') ) { my $warning = "Not inlining a constructor for $class since it is not" - . " inheriting the default $expected_class constructor\n"; + . " inheriting the default $expected_class constructor\n" + . "If you are certain you don't need to inline your" + . " constructor, specify inline_constructor => 0 in your" + . " call to $class->meta->make_immutable\n"; $warning .= " (constructor has method modifiers which would be lost if it were inlined)\n" if $constructor->isa('Class::MOP::Method::Wrapped'); @@ -107,17 +110,28 @@ sub _expected_constructor_class { ## accessors -sub options { (shift)->{'options'} } sub meta_instance { (shift)->{'meta_instance'} } sub attributes { (shift)->{'attributes'} } -sub associated_metaclass { (shift)->{'associated_metaclass'} } - ## method -# this was changed in 0.41, but broke MooseX::Singleton, so try to catch -# any other code using the original broken spelling -sub intialize_body { $_[0]->throw_error("Please correct the spelling of 'intialize_body' to 'initialize_body'") } +sub _generate_params { + my ($self, $var, $class_var) = @_; + "my $var = " . $self->_generate_BUILDARGS($class_var, '@_') . ";\n"; +} + +sub _generate_instance { + my ($self, $var, $class_var) = @_; + "my $var = " . $self->meta_instance->inline_create_instance($class_var) + . ";\n"; +} + +sub _generate_slot_initializers { + my ($self) = @_; + return (join ";\n" => map { + $self->_generate_slot_initializer($_) + } 0 .. (@{$self->attributes} - 1)) . ";\n"; +} sub initialize_body { my $self = shift; @@ -132,20 +146,17 @@ sub initialize_body { $source .= "\n" . 'my $class = shift;'; $source .= "\n" . 'return $class->Moose::Object::new(@_)'; - $source .= "\n" . ' if $class ne \'' . $self->associated_metaclass->name . '\';'; - - $source .= "\n" . 'my $params = ' . $self->_generate_BUILDARGS('$class', '@_'); + $source .= "\n if \$class ne '" . $self->associated_metaclass->name + . "';\n"; - $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 .= $self->_generate_params('$params', '$class'); + $source .= $self->_generate_instance('$instance', '$class'); + $source .= $self->_generate_slot_initializers; - $source .= ";\n" . $self->_generate_triggers(); + $source .= $self->_generate_triggers(); $source .= ";\n" . $self->_generate_BUILDALL(); - $source .= ";\n" . 'return $instance'; + $source .= ";\nreturn \$instance"; $source .= ";\n" . '}'; warn $source if $self->options->{debug}; @@ -211,27 +222,33 @@ sub _generate_BUILDALL { sub _generate_triggers { my $self = shift; my @trigger_calls; - foreach my $i (0 .. $#{ $self->attributes }) { + foreach my $i ( 0 .. $#{ $self->attributes } ) { my $attr = $self->attributes->[$i]; - if ($attr->can('has_trigger') && $attr->has_trigger) { - if (defined(my $init_arg = $attr->init_arg)) { - push @trigger_calls => ( - '(exists $params->{\'' . $init_arg . '\'}) && do {' . "\n " - . '$attrs->[' . $i . ']->trigger->(' - . '$instance, ' - . $self->meta_instance->inline_get_slot_value( - '$instance', - $attr->name, - ) - . ', ' - . '$attrs->[' . $i . ']' - . ');' - ."\n}" - ); - } - } + + next unless $attr->can('has_trigger') && $attr->has_trigger; + + my $init_arg = $attr->init_arg; + + next unless defined $init_arg; + + push @trigger_calls => '(exists $params->{\'' + . $init_arg + . '\'}) && do {' + . "\n " + . '$attrs->[' + . $i + . ']->trigger->(' + . '$instance, ' + . $self->meta_instance->inline_get_slot_value( + '$instance', + $attr->name, + ) + . ', ' + . '$attrs->[' + . $i . ']' . ');' . "\n}"; } - return join ";\n" => @trigger_calls; + + return join ";\n" => @trigger_calls; } sub _generate_slot_initializer { @@ -408,28 +425,37 @@ Moose::Meta::Method::Constructor - Method Meta Object for constructors =head1 DESCRIPTION -This is a subclass of L which handles -constructing an appropriate Constructor methods. This is primarily -used in the making of immutable metaclasses, otherwise it is -not particularly useful. +This class is a subclass of L that +provides additional Moose-specific functionality + +To understand this class, you should read the the +L documentation as well. + +=head1 INHERITANCE + +C is a subclass of +L I L. =head1 METHODS =over 4 -=item B - -=item B +=item B<< $metamethod->can_be_inlined >> -=item B +This returns true if the method can inlined. -=item B +First, it looks at all of the parents of the associated class. If any +of them have an inlined constructor, then the constructor can be +inlined. -=item B +If none of them have been inlined, it checks to make sure that the +pre-inlining constructor for the class matches the constructor from +the expected class. -=item B +By default, it expects this constructor come from L, +but subclasses can change this expectation. -=item B +If the constructor cannot be inlined it warns that this is the case. =back