X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod%2FAccessor.pm;h=d1a5403d45b15c130382320f27c60613cd735eb7;hb=436d2a84bd01a0a9798178c57d89e5edbc9b5f02;hp=046114f2f7976ae64c7adc5ab18c97ea1d291232;hpb=7fe03d203ea938d46cfb8f546181ef271d5a81bd;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Method/Accessor.pm b/lib/Class/MOP/Method/Accessor.pm index 046114f..d1a5403 100644 --- a/lib/Class/MOP/Method/Accessor.pm +++ b/lib/Class/MOP/Method/Accessor.pm @@ -7,7 +7,8 @@ use warnings; use Carp 'confess'; use Scalar::Util 'blessed', 'weaken'; -our $VERSION = '0.64'; +our $VERSION = '0.93'; +$VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use base 'Class::MOP::Method::Generated'; @@ -28,51 +29,67 @@ sub new { ($options{package_name} && $options{name}) || confess "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 - '$!attribute' => $options{attribute}, - '$!is_inline' => ($options{is_inline} || 0), - '$!accessor_type' => $options{accessor_type}, - } => $class; + my $self = $class->_new(\%options); # we don't want this creating # a cycle in the code, if not # needed - weaken($self->{'$!attribute'}); + weaken($self->{'attribute'}); - $self->initialize_body; + $self->_initialize_body; return $self; } +sub _new { + my $class = shift; + + return Class::MOP::Class->initialize($class)->new_object(@_) + if $class ne __PACKAGE__; + + my $params = @_ == 1 ? $_[0] : {@_}; + + return bless { + # inherited from Class::MOP::Method + body => $params->{body}, + associated_metaclass => $params->{associated_metaclass}, + package_name => $params->{package_name}, + name => $params->{name}, + original_method => $params->{original_method}, + + # inherit from Class::MOP::Generated + is_inline => $params->{is_inline} || 0, + definition_context => $params->{definition_context}, + + # defined in this class + attribute => $params->{attribute}, + accessor_type => $params->{accessor_type}, + } => $class; +} + ## accessors -sub associated_attribute { (shift)->{'$!attribute'} } -sub accessor_type { (shift)->{'$!accessor_type'} } +sub associated_attribute { (shift)->{'attribute'} } +sub accessor_type { (shift)->{'accessor_type'} } ## factory -sub initialize_body { +sub _initialize_body { my $self = shift; my $method_name = join "_" => ( - 'generate', + '_generate', $self->accessor_type, 'method', ($self->is_inline ? 'inline' : ()) ); - eval { $self->{'&!body'} = $self->$method_name() }; - die $@ if $@; + $self->{'body'} = $self->$method_name(); } ## generators -sub generate_accessor_method { +sub _generate_accessor_method { my $attr = (shift)->associated_attribute; return sub { $attr->set_value($_[0], $_[1]) if scalar(@_) == 2; @@ -80,7 +97,7 @@ sub generate_accessor_method { }; } -sub generate_reader_method { +sub _generate_reader_method { my $attr = (shift)->associated_attribute; return sub { confess "Cannot assign a value to a read-only accessor" if @_ > 1; @@ -88,21 +105,22 @@ sub generate_reader_method { }; } -sub generate_writer_method { + +sub _generate_writer_method { my $attr = (shift)->associated_attribute; return sub { $attr->set_value($_[0], $_[1]); }; } -sub generate_predicate_method { +sub _generate_predicate_method { my $attr = (shift)->associated_attribute; return sub { $attr->has_value($_[0]) }; } -sub generate_clearer_method { +sub _generate_clearer_method { my $attr = (shift)->associated_attribute; return sub { $attr->clear_value($_[0]) @@ -111,71 +129,90 @@ sub generate_clearer_method { ## Inline methods - -sub generate_accessor_method_inline { - my $attr = (shift)->associated_attribute; +sub _generate_accessor_method_inline { + my $self = shift; + my $attr = $self->associated_attribute; my $attr_name = $attr->name; my $meta_instance = $attr->associated_class->instance_metaclass; - my $code = eval 'sub {' - . $meta_instance->inline_set_slot_value('$_[0]', "'$attr_name'", '$_[1]') . ' if scalar(@_) == 2; ' - . $meta_instance->inline_get_slot_value('$_[0]', "'$attr_name'") - . '}'; - confess "Could not generate inline accessor because : $@" if $@; + my ( $code, $e ) = $self->_eval_closure( + {}, + 'sub {' + . $meta_instance->inline_set_slot_value('$_[0]', $attr_name, '$_[1]') + . ' if scalar(@_) == 2; ' + . $meta_instance->inline_get_slot_value('$_[0]', $attr_name) + . '}' + ); + confess "Could not generate inline accessor because : $e" if $e; return $code; } -sub generate_reader_method_inline { - my $attr = (shift)->associated_attribute; +sub _generate_reader_method_inline { + my $self = shift; + my $attr = $self->associated_attribute; my $attr_name = $attr->name; my $meta_instance = $attr->associated_class->instance_metaclass; - my $code = eval 'sub {' + my ( $code, $e ) = $self->_eval_closure( + {}, + 'sub {' . 'confess "Cannot assign a value to a read-only accessor" if @_ > 1;' - . $meta_instance->inline_get_slot_value('$_[0]', "'$attr_name'") - . '}'; - confess "Could not generate inline accessor because : $@" if $@; + . $meta_instance->inline_get_slot_value('$_[0]', $attr_name) + . '}' + ); + confess "Could not generate inline reader because : $e" if $e; return $code; } -sub generate_writer_method_inline { - my $attr = (shift)->associated_attribute; +sub _generate_writer_method_inline { + my $self = shift; + my $attr = $self->associated_attribute; my $attr_name = $attr->name; my $meta_instance = $attr->associated_class->instance_metaclass; - my $code = eval 'sub {' - . $meta_instance->inline_set_slot_value('$_[0]', "'$attr_name'", '$_[1]') - . '}'; - confess "Could not generate inline accessor because : $@" if $@; + my ( $code, $e ) = $self->_eval_closure( + {}, + 'sub {' + . $meta_instance->inline_set_slot_value('$_[0]', $attr_name, '$_[1]') + . '}' + ); + confess "Could not generate inline writer because : $e" if $e; return $code; } - -sub generate_predicate_method_inline { - my $attr = (shift)->associated_attribute; +sub _generate_predicate_method_inline { + my $self = shift; + my $attr = $self->associated_attribute; my $attr_name = $attr->name; my $meta_instance = $attr->associated_class->instance_metaclass; - my $code = eval 'sub {' . - $meta_instance->inline_is_slot_initialized('$_[0]', "'$attr_name'") - . '}'; - confess "Could not generate inline predicate because : $@" if $@; + my ( $code, $e ) = $self->_eval_closure( + {}, + 'sub {' + . $meta_instance->inline_is_slot_initialized('$_[0]', $attr_name) + . '}' + ); + confess "Could not generate inline predicate because : $e" if $e; return $code; } -sub generate_clearer_method_inline { - my $attr = (shift)->associated_attribute; +sub _generate_clearer_method_inline { + my $self = shift; + my $attr = $self->associated_attribute; my $attr_name = $attr->name; my $meta_instance = $attr->associated_class->instance_metaclass; - my $code = eval 'sub {' - . $meta_instance->inline_deinitialize_slot('$_[0]', "'$attr_name'") - . '}'; - confess "Could not generate inline clearer because : $@" if $@; + my ( $code, $e ) = $self->_eval_closure( + {}, + 'sub {' + . $meta_instance->inline_deinitialize_slot('$_[0]', $attr_name) + . '}' + ); + confess "Could not generate inline clearer because : $e" if $e; return $code; } @@ -200,90 +237,70 @@ Class::MOP::Method::Accessor - Method Meta Object for accessors accessor_type => 'reader', ); - $reader->body->($instance); # call the reader method + $reader->body->execute($instance); # call the reader method =head1 DESCRIPTION -This is a C subclass which is used interally -by C to generate accessor code. It can -handle generation of readers, writers, predicate and clearer -methods, both as closures and as more optimized inline methods. +This is a subclass of which is used by +C to generate accessor code. It handles +generation of readers, writers, predicates and clearers. For each type +of method, it can either create a subroutine reference, or actually +inline code by generating a string and C'ing it. =head1 METHODS =over 4 -=item B +=item B<< Class::MOP::Method::Accessor->new(%options) >> -This creates the method based on the criteria in C<%options>, -these options are: +This returns a new C based on the +C<%options> provided. =over 4 -=item I - -This must be an instance of C which this -accessor is being generated for. This paramter is B. - -=item I - -This is a string from the following set; reader, writer, accessor, -predicate or clearer. This is used to determine which type of -method is to be generated. - -=item I - -This is a boolean to indicate if the method should be generated -as a closure, or as a more optimized inline version. +=item * attribute -=back +This is the C for which accessors are being +generated. This option is required. -=item B +=item * accessor_type -This returns the accessor type which was passed into C. +This is a string which should be one of "reader", "writer", +"accessor", "predicate", or "clearer". This is the type of method +being generated. This option is required. -=item B +=item * is_inline -This returns the boolean which was passed into C. +This indicates whether or not the accessor should be inlined. This +defaults to false. -=item B +=item * name -This returns the attribute instance which was passed into C. +The method name (without a package name). This is required. -=item B +=item * package_name -This will actually generate the method based on the specified -criteria passed to the constructor. +The package name for the method. This is required. =back -=head2 Method Generators - -These methods will generate appropriate code references for -the various types of accessors which are supported by -C. The names pretty much explain it all. - -=over 4 - -=item B - -=item B - -=item B +=item B<< $metamethod->accessor_type >> -=item B +Returns the accessor type which was passed to C. -=item B +=item B<< $metamethod->is_inline >> -=item B +Returns a boolean indicating whether or not the accessor is inlined. -=item B +=item B<< $metamethod->associated_attribute >> -=item B +This returns the L object which was passed to +C. -=item B +=item B<< $metamethod->body >> -=item B +The method itself is I when the accessor object is +constructed. =back @@ -293,7 +310,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