X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FMethod%2FConstructor.pm;h=5a83ddcf61de2c5a3a6876a80e754c5ea32c7696;hb=55d05fb16429c2150b5337b1a0130ae334e129d0;hp=ffa78a7193837f3c66c97339097af8b75f115a04;hpb=6302a7e870c9ed9bce511891a74e5bdd140fcc74;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Method/Constructor.pm b/lib/Moose/Meta/Method/Constructor.pm index ffa78a7..5a83ddc 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.73_02'; +our $VERSION = '1.12'; 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,67 +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'; -} - ## method sub _initialize_body { @@ -115,11 +55,15 @@ sub _initialize_body { # requires some adaption on the part of # the author, after all, nothing is free) my $source = 'sub {'; - $source .= "\n" . 'my $class = shift;'; + $source .= "\n" . 'my $_instance = shift;'; - $source .= "\n" . 'return $class->Moose::Object::new(@_)'; - $source .= "\n if \$class ne '" . $self->associated_metaclass->name - . "';\n"; + $source .= "\n" . 'my $class = Scalar::Util::blessed($_instance) || $_instance;'; + + $source .= "\n" . "if (\$class ne '" . $self->associated_metaclass->name + . "') {"; + $source .= "\n return " + . $self->_generate_fallback_constructor('$class') . ";"; + $source .= "\n}\n"; $source .= $self->_generate_params('$params', '$class'); $source .= $self->_generate_instance('$instance', '$class'); @@ -151,19 +95,32 @@ sub _initialize_body { defined $_ ? $_->_compiled_type_constraint : undef; } @type_constraints; - my $code = $self->_compile_code( + my $defaults = [map { $_->default } @$attrs]; + + my ( $code, $e ) = $self->_compile_code( code => $source, environment => { '$meta' => \$self, '$attrs' => \$attrs, + '$defaults' => \$defaults, '@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->throw_error( + "Could not eval the constructor :\n\n$source\n\nbecause :\n\n$e", + error => $e, data => $source ) + if $e; + $self->{'body'} = $code; } +sub _generate_fallback_constructor { + my ( $self, $class_var ) = @_; + "${class_var}->Moose::Object::new(\@_)"; +} + sub _generate_params { my ( $self, $var, $class_var ) = @_; "my $var = " . $self->_generate_BUILDARGS( $class_var, '@_' ) . ";\n"; @@ -252,7 +209,7 @@ sub _generate_slot_initializer { if ($is_moose && defined($attr->init_arg) && $attr->is_required && !$attr->has_default && !$attr->has_builder) { push @source => ('(exists $params->{\'' . $attr->init_arg . '\'}) ' . - '|| ' . $self->_inline_throw_error('"Attribute (' . $attr->name . ') is required"') .';'); + '|| ' . $self->_inline_throw_error('"Attribute (' . quotemeta($attr->name) . ') is required"') .';'); } if (($attr->has_default || $attr->has_builder) && !($is_moose && $attr->is_lazy)) { @@ -268,18 +225,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 +247,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 +272,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 +285,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 +306,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 +321,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,29 +336,13 @@ 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: " . ' + . quotemeta( $attr->name ) + . ') does not pass the type constraint because: " . ' . $type_constraint_obj . '->get_message(' . $value_name . ')') . "\n\t unless " . $type_constraint_cv . '->(' . $value_name . ');' ); } -sub _generate_default_value { - my ($self, $attr, $index) = @_; - # NOTE: - # default values can either be CODE refs - # 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) { - return '$attrs->[' . $index . ']->default($instance)'; - } - else { - return q{"} . quotemeta( $attr->default ) . q{"}; - } -} - 1; __END__ @@ -414,39 +355,20 @@ Moose::Meta::Method::Constructor - Method Meta Object for constructors =head1 DESCRIPTION -This class is a subclass of L that +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. +L documentation as well. =head1 INHERITANCE C is a subclass of L I L. -=head1 METHODS - -=over 4 - -=item B<< $metamethod->can_be_inlined >> - -This returns true if the method can inlined. - -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. - -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. - -By default, it expects this constructor come from L, -but subclasses can change this expectation. - -If the constructor cannot be inlined it warns that this is the case. +=head1 BUGS -=back +See L for details on reporting bugs. =head1 AUTHORS @@ -454,7 +376,7 @@ Stevan Little Estevan@iinteractive.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006-2009 by Infinity Interactive, Inc. +Copyright 2006-2010 by Infinity Interactive, Inc. L