X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FMethod%2FConstructor.pm;h=7eb6606d43745158c3d2763bdb84355779c57c5b;hb=eae0508f6f8fca847956c2ed8c48ec23cebd3106;hp=42380d49ffeb39c54b4848a3f568e67b5c3f4b7f;hpb=cb5f4275cc545d6566664cbbac66e6ec5dcbca36;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Method/Constructor.pm b/lib/Moose/Meta/Method/Constructor.pm index 42380d4..7eb6606 100644 --- a/lib/Moose/Meta/Method/Constructor.pm +++ b/lib/Moose/Meta/Method/Constructor.pm @@ -4,9 +4,9 @@ package Moose::Meta::Method::Constructor; use strict; use warnings; -use Scalar::Util 'blessed', 'weaken', 'looks_like_number'; +use Scalar::Util 'blessed', 'weaken', 'looks_like_number', 'refaddr'; -our $VERSION = '0.75'; +our $VERSION = '0.81'; our $AUTHORITY = 'cpan:STEVAN'; use base 'Moose::Meta::Method', @@ -25,11 +25,12 @@ sub new { || $class->throw_error("You must supply the package_name and name parameters $Class::MOP::Method::UPGRADE_ERROR_TEXT"); my $self = bless { - 'body' => undef, + 'body' => undef, 'package_name' => $options{package_name}, 'name' => $options{name}, 'options' => $options{options}, 'associated_metaclass' => $meta, + '_expected_method_class' => $options{_expected_method_class} || 'Moose::Object', } => $class; # we don't want this creating @@ -42,62 +43,6 @@ 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'; @@ -118,7 +63,7 @@ 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 if \$class ne '" . $self->associated_metaclass->name . "';\n"; $source .= $self->_generate_params('$params', '$class'); @@ -160,7 +105,7 @@ sub _initialize_body { '@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; } @@ -268,18 +213,18 @@ sub _generate_slot_initializer { my $default; if ( $attr->has_default ) { $default = $self->_generate_default_value($attr, $index); - } + } else { my $builder = $attr->builder; $default = '$instance->' . $builder; } - + push @source => '{'; # wrap this to avoid my $val overwrite warnings push @source => ('my $val = ' . $default . ';'); push @source => $self->_generate_type_constraint_and_coercion($attr, $index) - if $is_moose; + if $is_moose; push @source => $self->_generate_slot_assignment($attr, '$val', $index); - push @source => '}'; # close - wrap this to avoid my $val overrite warnings + push @source => '}'; # close - wrap this to avoid my $val overrite warnings push @source => "}" if defined $attr->init_arg; } @@ -290,16 +235,16 @@ sub _generate_slot_initializer { if ($is_moose && $attr->has_type_constraint) { if ($attr->should_coerce && $attr->type_constraint->has_coercion) { push @source => $self->_generate_type_coercion( - $attr, - '$type_constraints[' . $index . ']', - '$val', + $attr, + '$type_constraints[' . $index . ']', + '$val', '$val' ); } push @source => $self->_generate_type_constraint_check( - $attr, - '$type_constraint_bodies[' . $index . ']', - '$type_constraints[' . $index . ']', + $attr, + '$type_constraint_bodies[' . $index . ']', + '$type_constraints[' . $index . ']', '$val' ); } @@ -315,11 +260,11 @@ sub _generate_slot_assignment { my ($self, $attr, $value, $index) = @_; my $source; - + if ($attr->has_initializer) { $source = ( '$attrs->[' . $index . ']->set_initial_value($instance, ' . $value . ');' - ); + ); } else { $source = ( @@ -328,10 +273,10 @@ sub _generate_slot_assignment { $attr->name, $value ) . ';' - ); + ); } - - my $is_moose = $attr->isa('Moose::Meta::Attribute'); # XXX FIXME + + my $is_moose = $attr->isa('Moose::Meta::Attribute'); # XXX FIXME if ($is_moose && $attr->is_weak_ref) { $source .= ( @@ -349,9 +294,9 @@ sub _generate_slot_assignment { sub _generate_type_constraint_and_coercion { my ($self, $attr, $index) = @_; - + return unless $attr->has_type_constraint; - + my @source; if ($attr->should_coerce && $attr->type_constraint->has_coercion) { push @source => $self->_generate_type_coercion( @@ -364,7 +309,7 @@ sub _generate_type_constraint_and_coercion { push @source => $self->_generate_type_constraint_check( $attr, ('$type_constraint_bodies[' . $index . ']'), - ('$type_constraints[' . $index . ']'), + ('$type_constraints[' . $index . ']'), '$val' ); return @source; @@ -379,8 +324,8 @@ sub _generate_type_constraint_check { my ($self, $attr, $type_constraint_cv, $type_constraint_obj, $value_name) = @_; return ( $self->_inline_throw_error('"Attribute (' # FIXME add 'dad' - . $attr->name - . ') does not pass the type constraint because: " . ' + . $attr->name + . ') does not pass the type constraint because: " . ' . $type_constraint_obj . '->get_message(' . $value_name . ')') . "\n\t unless " . $type_constraint_cv . '->(' . $value_name . ');' );