X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FMethod%2FConstructor.pm;h=40f7a9a7b6a666ef8a2b4a211263e78846ecc95c;hb=c14746bc8269ab593798469dc204aa0d8f72f7ee;hp=d80a93300209fa5c9223e5e34d12a55c22f9c75c;hpb=5cf3dbcf66d39c700f7b66a20c9bc7e2bbc025ab;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Method/Constructor.pm b/lib/Moose/Meta/Method/Constructor.pm index d80a933..40f7a9a 100644 --- a/lib/Moose/Meta/Method/Constructor.pm +++ b/lib/Moose/Meta/Method/Constructor.pm @@ -7,51 +7,41 @@ use warnings; use Carp 'confess'; use Scalar::Util 'blessed', 'weaken', 'looks_like_number'; -our $VERSION = '0.01'; +our $VERSION = '0.08'; our $AUTHORITY = 'cpan:STEVAN'; -use base 'Moose::Meta::Method'; +use base 'Moose::Meta::Method', + 'Class::MOP::Method::Generated'; sub new { my $class = shift; my %options = @_; - + (exists $options{options} && ref $options{options} eq 'HASH') - || confess "You must pass a hash of options"; - - (blessed $options{meta_instance} && $options{meta_instance}->isa('Class::MOP::Instance')) - || confess "You must supply a meta-instance"; - - (exists $options{attributes} && ref $options{attributes} eq 'ARRAY') - || confess "You must pass an array of options"; - - (blessed($_) && $_->isa('Class::MOP::Attribute')) - || confess "You must supply a list of attributes which is a 'Class::MOP::Attribute' instance" - for @{$options{attributes}}; - + || confess "You must pass a hash of options"; + my $self = bless { # from our superclass '&!body' => undef, # specific to this subclass '%!options' => $options{options}, - '$!meta_instance' => $options{meta_instance}, - '@!attributes' => $options{attributes}, + '$!meta_instance' => $options{metaclass}->get_meta_instance, + '@!attributes' => [ $options{metaclass}->compute_all_applicable_attributes ], # ... '$!associated_metaclass' => $options{metaclass}, } => $class; - # we don't want this creating - # a cycle in the code, if not + # we don't want this creating + # a cycle in the code, if not # needed - weaken($self->{'$!meta_instance'}); - weaken($self->{'$!associated_metaclass'}); + weaken($self->{'$!associated_metaclass'}); $self->intialize_body; - return $self; + return $self; } -## accessors +## accessors sub options { (shift)->{'%!options'} } sub meta_instance { (shift)->{'$!meta_instance'} } @@ -64,35 +54,56 @@ sub associated_metaclass { (shift)->{'$!associated_metaclass'} } sub intialize_body { my $self = shift; # TODO: - # the %options should also include a both - # a call 'initializer' and call 'SUPER::' - # options, which should cover approx 90% - # of the possible use cases (even if it - # requires some adaption on the part of + # the %options should also include a both + # a call 'initializer' and call 'SUPER::' + # options, which should cover approx 90% + # of the possible use cases (even if it + # 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 %params = (scalar @_ == 1) ? %{$_[0]} : @_;'; - + $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 = (scalar @_ == 1) ? %{$_[0]} : @_;'; + $source .= "\n" . 'my $instance = ' . $self->meta_instance->inline_create_instance('$class'); - - $source .= ";\n" . (join ";\n" => map { - $self->_generate_slot_initializer($_) + + $source .= ";\n" . (join ";\n" => map { + $self->_generate_slot_initializer($_) } 0 .. (@{$self->attributes} - 1)); - + $source .= ";\n" . $self->_generate_BUILDALL(); - + $source .= ";\n" . 'return $instance'; - $source .= ";\n" . '}'; - warn $source if $self->options->{debug}; - + $source .= ";\n" . '}'; + warn $source if $self->options->{debug}; + my $code; { # NOTE: # create the nessecary lexicals - # to be picked up in the eval + # 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; confess "Could not eval the constructor :\n\n$source\n\nbecause :\n\n$@" if $@; } @@ -102,82 +113,137 @@ sub intialize_body { sub _generate_BUILDALL { my $self = shift; my @BUILD_calls; - foreach my $method ($self->associated_metaclass->find_all_methods_by_name('BUILD')) { - push @BUILD_calls => '$instance->' . $method->{class} . '::BUILD(\%params);'; + foreach my $method (reverse $self->associated_metaclass->find_all_methods_by_name('BUILD')) { + push @BUILD_calls => '$instance->' . $method->{class} . '::BUILD(\%params)'; } - return join "\n" => @BUILD_calls; + return join ";\n" => @BUILD_calls; } sub _generate_slot_initializer { my $self = shift; my $index = shift; - + my $attr = $self->attributes->[$index]; - + my @source = ('## ' . $attr->name); - - if ($attr->is_required && !$attr->has_default) { - push @source => ('(exists $params{\'' . $attr->init_arg . '\'}) ' . + + my $is_moose = $attr->isa('Moose::Meta::Attribute'); # XXX FIXME + + if ($is_moose && defined($attr->init_arg) && $attr->is_required && !$attr->has_default && !$attr->has_builder) { + push @source => ('(exists $params{\'' . $attr->init_arg . '\'}) ' . '|| confess "Attribute (' . $attr->name . ') is required";'); } - - push @source => 'if ($params{\'' . $attr->init_arg . '\'}) {'; - - push @source => ('my $val = $params{\'' . $attr->init_arg . '\'};'); - if ($attr->has_type_constraint) { - push @source => ('my $type_constraint = $attrs->[' . $index . ']->type_constraint;'); - - if ($attr->should_coerce && $attr->type_constraint->has_coercion) { - push @source => $self->_generate_type_coercion($attr, '$type_constraint', '$val', '$val'); - } - push @source => $self->_generate_type_constraint_check($attr, '$type_constraint', '$val'); + + if (($attr->has_default || $attr->has_builder) && !($is_moose && $attr->is_lazy)) { + + if ( defined( my $init_arg = $attr->init_arg ) ) { + push @source => 'if (exists $params{\'' . $init_arg . '\'}) {'; + + push @source => ('my $val = $params{\'' . $init_arg . '\'};'); + + 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', + '$val' + ); + } + push @source => $self->_generate_type_constraint_check( + $attr, + '$type_constraint_bodies[' . $index . ']', + '$type_constraints[' . $index . ']', + '$val' + ); + } + push @source => $self->_generate_slot_assignment($attr, '$val', $index); + + push @source => "} else {"; } - push @source => $self->_generate_slot_assignment($attr, '$val'); - - if ($attr->has_default && !$attr->is_lazy) { - - push @source => "} else {"; - - my $default = $self->_generate_default_value($attr, $index); - + 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 overrite warnings push @source => ('my $val = ' . $default . ';'); push @source => $self->_generate_type_constraint_check( $attr, - ('$attrs->[' . $index . ']->type_constraint'), + ('$type_constraint_bodies[' . $index . ']'), + ('$type_constraints[' . $index . ']'), '$val' - ) if $attr->has_type_constraint; - push @source => $self->_generate_slot_assignment($attr, $default); - - push @source => "}"; - } - else { - push @source => "}"; + ) if ($is_moose && $attr->has_type_constraint); + push @source => $self->_generate_slot_assignment($attr, $default, $index); + push @source => '}'; # close - wrap this to avoid my $val overrite warnings + + push @source => "}" if defined $attr->init_arg; } - + elsif ( defined( my $init_arg = $attr->init_arg ) ) { + push @source => '(exists $params{\'' . $init_arg . '\'}) && do {'; + + push @source => ('my $val = $params{\'' . $init_arg . '\'};'); + 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', + '$val' + ); + } + push @source => $self->_generate_type_constraint_check( + $attr, + '$type_constraint_bodies[' . $index . ']', + '$type_constraints[' . $index . ']', + '$val' + ); + } + push @source => $self->_generate_slot_assignment($attr, '$val', $index); + + push @source => "}"; + } + return join "\n" => @source; } sub _generate_slot_assignment { - my ($self, $attr, $value) = @_; - my $source = ( - $self->meta_instance->inline_set_slot_value( - '$instance', - ("'" . $attr->name . "'"), - $value - ) . ';' - ); + my ($self, $attr, $value, $index) = @_; + + my $source; - if ($attr->is_weak_ref) { + if ($attr->has_initializer) { + $source = ( + '$attrs->[' . $index . ']->set_initial_value($instance, ' . $value . ');' + ); + } + else { + $source = ( + $self->meta_instance->inline_set_slot_value( + '$instance', + ("'" . $attr->name . "'"), + $value + ) . ';' + ); + } + + my $is_moose = $attr->isa('Moose::Meta::Attribute'); # XXX FIXME + + if ($is_moose && $attr->is_weak_ref) { $source .= ( "\n" . $self->meta_instance->inline_weaken_slot_value( - '$instance', + '$instance', ("'" . $attr->name . "'") - ) . + ) . ' if ref ' . $value . ';' - ); - } - + ); + } + return $source; } @@ -187,19 +253,21 @@ sub _generate_type_coercion { } sub _generate_type_constraint_check { - my ($self, $attr, $type_constraint_name, $value_name) = @_; + my ($self, $attr, $type_constraint_cv, $type_constraint_obj, $value_name) = @_; return ( - 'defined(' . $type_constraint_name . '->_compiled_type_constraint->(' . $value_name . '))' - . "\n\t" . '|| confess "Attribute (' . $attr->name . ') does not pass the type constraint (' - . $attr->type_constraint->name . ') with " . (defined() ? "' . $value_name . '" : "undef");' - ); + $type_constraint_cv . '->(' . $value_name . ')' + . "\n\t" . '|| confess "Attribute (' + . $attr->name + . ') does not pass the type constraint because: " . ' + . $type_constraint_obj . '->get_message(' . $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 + # 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. @@ -212,27 +280,28 @@ sub _generate_default_value { unless (looks_like_number($default)) { $default = "'$default'"; } - + return $default; - } + } } 1; -1; - __END__ =pod -=head1 NAME +=head1 NAME Moose::Meta::Method::Constructor - Method Meta Object for constructors -=head1 SYNOPSIS - =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. + =head1 METHODS =over 4 @@ -257,12 +326,12 @@ Stevan Little Estevan@iinteractive.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006 by Infinity Interactive, Inc. +Copyright 2006-2008 by Infinity Interactive, Inc. L This library is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. +it under the same terms as Perl itself. =cut