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=853717188f7060b530e06b3bcbe735f0e6cf92db;hpb=aead17e74252e3884f9f8e39912ca98fdf4b4dd5;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Method/Constructor.pm b/lib/Moose/Meta/Method/Constructor.pm index 8537171..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.62'; +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; @@ -47,19 +47,91 @@ sub new { return $self; } +sub can_be_inlined { + my $self = shift; + my $metaclass = $self->associated_metaclass; + + my $expected_class = $self->_expected_constructor_class; + + # If any of our parents have been made immutable, we are okay to + # inline our own new method. The assumption is that an inlined new + # method provided by a parent does not actually get used by + # children anyway. + for my $meta ( + grep { $_->is_immutable } + map { ( ref $metaclass )->initialize($_) } + grep { $_ ne $expected_class } + $metaclass->linearized_isa + ) { + 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 + # should be), and the real expected class is actually + # immutable itself (see Fey::Object::Table for an example of + # how this can happen). I'm not sure how to actually handle + # that case, since it's effectively a bug in the subclass (for + # not overriding _expected_constructor_class). + return 1 if $transformer->inlined_constructor; + } + + if ( my $constructor = $metaclass->find_method_by_name( $self->name ) ) { + my $class = $self->associated_metaclass->name; + + 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" + . "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'); + + warn $warning; + + return 0; + } + else { + return 1; + } + } + + # This would be a rather weird case where we have no constructor + # in the inheritance chain. + return 1; +} + +# This is here so can_be_inlined can be inherited by MooseX modules. +sub _expected_constructor_class { + return 'Moose::Object'; +} + ## 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 { Moose->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; @@ -74,52 +146,49 @@ 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 .= $self->_generate_params('$params', '$class'); + $source .= $self->_generate_instance('$instance', '$class'); + $source .= $self->_generate_slot_initializers; - $source .= ";\n" . (join ";\n" => map { - $self->_generate_slot_initializer($_) - } 0 .. (@{$self->attributes} - 1)); - - $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}; - my $code; - { - my $meta = $self; # FIXME for _inline_throw_error... - - # NOTE: - # create the nessecary lexicals - # to be picked up in the eval - my $attrs = $self->attributes; - - # We need to check if the attribute ->can('type_constraint') - # since we may be trying to immutabilize a Moose meta class, - # which in turn has attributes which are Class::MOP::Attribute - # objects, rather than Moose::Meta::Attribute. And - # Class::MOP::Attribute attributes have no type constraints. - # However we need to make sure we leave an undef value there - # because the inlined code is using the index of the attributes - # to determine where to find the type constraint - - my @type_constraints = map { - $_->can('type_constraint') ? $_->type_constraint : undef - } @$attrs; - - my @type_constraint_bodies = map { - defined $_ ? $_->_compiled_type_constraint : undef; - } @type_constraints; - - $code = eval $source; - $self->throw_error("Could not eval the constructor :\n\n$source\n\nbecause :\n\n$@", error => $@, data => $source ) if $@; - } + # We need to check if the attribute ->can('type_constraint') + # since we may be trying to immutabilize a Moose meta class, + # which in turn has attributes which are Class::MOP::Attribute + # objects, rather than Moose::Meta::Attribute. And + # Class::MOP::Attribute attributes have no type constraints. + # However we need to make sure we leave an undef value there + # because the inlined code is using the index of the attributes + # to determine where to find the type constraint + + my $attrs = $self->attributes; + + my @type_constraints = map { + $_->can('type_constraint') ? $_->type_constraint : undef + } @$attrs; + + my @type_constraint_bodies = map { + defined $_ ? $_->_compiled_type_constraint : undef; + } @type_constraints; + + my $code = $self->_compile_code( + code => $source, + environment => { + '$meta' => \$self, + '$attrs' => \$attrs, + '@type_constraints' => \@type_constraints, + '@type_constraint_bodies' => \@type_constraint_bodies, + }, + ) or $self->throw_error("Could not eval the constructor :\n\n$source\n\nbecause :\n\n$@", error => $@, data => $source ); + $self->{'body'} = $code; } @@ -132,7 +201,7 @@ sub _generate_BUILDARGS { return join("\n", 'do {', $self->_inline_throw_error('"Single parameters to new() must be a HASH ref"', 'data => $_[0]'), - ' if scalar @_ == 1 && defined $_[0] && ref($_[0]) ne q{HASH};', + ' if scalar @_ == 1 && !( defined $_[0] && ref $_[0] eq q{HASH} );', '(scalar @_ == 1) ? {%{$_[0]}} : {@_};', '}', ); @@ -153,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 { @@ -261,7 +336,7 @@ sub _generate_slot_assignment { $source = ( $self->meta_instance->inline_set_slot_value( '$instance', - ("'" . $attr->name . "'"), + $attr->name, $value ) . ';' ); @@ -274,7 +349,7 @@ sub _generate_slot_assignment { "\n" . $self->meta_instance->inline_weaken_slot_value( '$instance', - ("'" . $attr->name . "'") + $attr->name ) . ' if ref ' . $value . ';' ); @@ -334,10 +409,7 @@ sub _generate_default_value { return '$attrs->[' . $index . ']->default($instance)'; } else { - my $default = $attr->default; - # make sure to quote strings ... - return "'$default'"; - + return q{"} . quotemeta( $attr->default ) . q{"}; } } @@ -353,26 +425,37 @@ Moose::Meta::Method::Constructor - Method Meta Object for constructors =head1 DESCRIPTION -This is a subclass of L which handles -constructing an approprate 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<< $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 @@ -382,7 +465,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