X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FMethod%2FConstructor.pm;h=4474207902e0bb7b6c24c5fd2d0db8472d2801ef;hb=74397c13ad55fc865db34721aed512d4f605fadf;hp=91da69eb1c4c04b691422a42d9492e2e88624f0a;hpb=5e60e7d6b0f2d65aa4d735f9b8a8e575467a2b06;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Method/Constructor.pm b/lib/Moose/Meta/Method/Constructor.pm index 91da69e..4474207 100644 --- a/lib/Moose/Meta/Method/Constructor.pm +++ b/lib/Moose/Meta/Method/Constructor.pm @@ -4,13 +4,13 @@ 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.62_01'; +our $VERSION = '0.75_01'; our $AUTHORITY = 'cpan:STEVAN'; use base 'Moose::Meta::Method', - 'Class::MOP::Method::Generated'; + 'Class::MOP::Method::Constructor'; sub new { my $class = shift; @@ -25,16 +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 { - # from our superclass 'body' => undef, 'package_name' => $options{package_name}, 'name' => $options{name}, - # specific to this subclass 'options' => $options{options}, - 'meta_instance' => $meta->get_meta_instance, - 'attributes' => [ $meta->compute_all_applicable_attributes ], - # ... 'associated_metaclass' => $meta, + '_expected_method_class' => $options{_expected_method_class} || 'Moose::Object', } => $class; # we don't want this creating @@ -42,84 +38,19 @@ sub new { # needed weaken($self->{'associated_metaclass'}); - $self->initialize_body; + $self->_initialize_body; 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->get_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"; - - $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 initialize_body { +sub _initialize_body { my $self = shift; # TODO: # the %options should also include a both @@ -132,54 +63,70 @@ 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 .= "\n" . 'my $params = ' . $self->_generate_BUILDARGS('$class', '@_'); + $source .= $self->_generate_params('$params', '$class'); + $source .= $self->_generate_instance('$instance', '$class'); + $source .= $self->_generate_slot_initializers; - $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 .= ";\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 $environment = q{ - 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 = $self->_eval_closure($environment, $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; } +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 _generate_BUILDARGS { my ( $self, $class, $args ) = @_; @@ -189,7 +136,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]}} : {@_};', '}', ); @@ -210,34 +157,39 @@ sub _generate_BUILDALL { sub _generate_triggers { my $self = shift; my @trigger_calls; - 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}" - ); - } - } + foreach my $i ( 0 .. $#{ $self->_attributes } ) { + my $attr = $self->_attributes->[$i]; + + 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, + ) + . ', ' + . ');' . "\n}"; } - return join ";\n" => @trigger_calls; + + return join ";\n" => @trigger_calls; } sub _generate_slot_initializer { my $self = shift; my $index = shift; - my $attr = $self->attributes->[$index]; + my $attr = $self->_attributes->[$index]; my @source = ('## ' . $attr->name); @@ -316,9 +268,9 @@ sub _generate_slot_assignment { } else { $source = ( - $self->meta_instance->inline_set_slot_value( + $self->_meta_instance->inline_set_slot_value( '$instance', - ("'" . $attr->name . "'"), + $attr->name, $value ) . ';' ); @@ -329,9 +281,9 @@ sub _generate_slot_assignment { if ($is_moose && $attr->is_weak_ref) { $source .= ( "\n" . - $self->meta_instance->inline_weaken_slot_value( + $self->_meta_instance->inline_weaken_slot_value( '$instance', - ("'" . $attr->name . "'") + $attr->name ) . ' if ref ' . $value . ';' ); @@ -391,10 +343,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{"}; } } @@ -410,28 +359,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 +=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 @@ -441,7 +399,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