X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod%2FAccessor.pm;h=ecc84ad526cc1506807694659f954e34b90be70a;hb=074ec38f9e2ed902a2e82a0fb80fd502f824b17d;hp=3b4e5d8aa9993914705709ac7326e6466bb129e9;hpb=28fa06b5d932b8a2f9bc1b6b394893c0d7c9efac;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Method/Accessor.pm b/lib/Class/MOP/Method/Accessor.pm index 3b4e5d8..ecc84ad 100644 --- a/lib/Class/MOP/Method/Accessor.pm +++ b/lib/Class/MOP/Method/Accessor.pm @@ -7,7 +7,7 @@ use warnings; use Carp 'confess'; use Scalar::Util 'blessed', 'weaken'; -our $VERSION = '0.78'; +our $VERSION = '0.89'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; @@ -36,7 +36,7 @@ sub new { # needed weaken($self->{'attribute'}); - $self->initialize_body; + $self->_initialize_body; return $self; } @@ -58,10 +58,16 @@ sub accessor_type { (shift)->{'accessor_type'} } ## factory sub initialize_body { + Carp::cluck('The initialize_body method has been made private.' + . " The public version is deprecated and will be removed in a future release.\n"); + shift->_initialize_body; +} + +sub _initialize_body { my $self = shift; my $method_name = join "_" => ( - 'generate', + '_generate', $self->accessor_type, 'method', ($self->is_inline ? 'inline' : ()) @@ -73,6 +79,12 @@ sub initialize_body { ## generators sub generate_accessor_method { + Carp::cluck('The generate_accessor_method method has been made private.' + . " The public version is deprecated and will be removed in a future release.\n"); + shift->_generate_accessor_method; +} + +sub _generate_accessor_method { my $attr = (shift)->associated_attribute; return sub { $attr->set_value($_[0], $_[1]) if scalar(@_) == 2; @@ -81,6 +93,12 @@ sub generate_accessor_method { } sub generate_reader_method { + Carp::cluck('The generate_reader_method method has been made private.' + . " The public version is deprecated and will be removed in a future release.\n"); + shift->_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; @@ -89,6 +107,12 @@ sub generate_reader_method { } sub generate_writer_method { + Carp::cluck('The generate_writer_method method has been made private.' + . " The public version is deprecated and will be removed in a future release.\n"); + shift->_generate_writer_method; +} + +sub _generate_writer_method { my $attr = (shift)->associated_attribute; return sub { $attr->set_value($_[0], $_[1]); @@ -96,6 +120,12 @@ sub generate_writer_method { } sub generate_predicate_method { + Carp::cluck('The generate_predicate_method method has been made private.' + . " The public version is deprecated and will be removed in a future release.\n"); + shift->_generate_predicate_method; +} + +sub _generate_predicate_method { my $attr = (shift)->associated_attribute; return sub { $attr->has_value($_[0]) @@ -103,6 +133,12 @@ sub generate_predicate_method { } sub generate_clearer_method { + Carp::cluck('The generate_clearer_method method has been made private.' + . " The public version is deprecated and will be removed in a future release.\n"); + shift->_generate_clearer_method; +} + +sub _generate_clearer_method { my $attr = (shift)->associated_attribute; return sub { $attr->clear_value($_[0]) @@ -111,14 +147,19 @@ sub generate_clearer_method { ## Inline methods - sub generate_accessor_method_inline { + Carp::cluck('The generate_accessor_method_inline method has been made private.' + . " The public version is deprecated and will be removed in a future release.\n"); + shift->_generate_accessor_method_inline; +} + +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; - return $self->_eval_closure( + my ( $code, $e ) = $self->_eval_closure( {}, 'sub {' . $meta_instance->inline_set_slot_value('$_[0]', $attr_name, '$_[1]') @@ -126,64 +167,102 @@ sub generate_accessor_method_inline { . $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 { + Carp::cluck('The generate_reader_method_inline method has been made private.' + . " The public version is deprecated and will be removed in a future release.\n"); + shift->_generate_reader_method_inline; +} + +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; - return $self->_eval_closure( + 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 reader because : $e" if $e; + + return $code; } sub generate_writer_method_inline { + Carp::cluck('The generate_writer_method_inline method has been made private.' + . " The public version is deprecated and will be removed in a future release.\n"); + shift->_generate_writer_method_inline; +} + +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; - return $self->_eval_closure( + 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 { + Carp::cluck('The generate_predicate_method_inline method has been made private.' + . " The public version is deprecated and will be removed in a future release.\n"); + shift->_generate_predicate_method_inline; +} + +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; - return $self->_eval_closure( + 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 { + Carp::cluck('The generate_clearer_method_inline method has been made private.' + . " The public version is deprecated and will be removed in a future release.\n"); + shift->_generate_clearer_method_inline; +} + +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; - return $self->_eval_closure( + 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; } 1; @@ -210,86 +289,66 @@ Class::MOP::Method::Accessor - Method Meta Object for accessors =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 +=item * attribute -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. +This is the C for which accessors are being +generated. This option is required. -=item I +=item * accessor_type -This is a boolean to indicate if the method should be generated -as a closure, or as a more optimized inline version. +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. -=back - -=item B - -This returns the accessor type which was passed into C. +=item * is_inline -=item B +This indicates whether or not the accessor should be inlined. This +defaults to false. -This returns the boolean which was passed into C. +=item * name -=item B +The method name (without a package name). This is required. -This returns the attribute instance which was passed into C. +=item * package_name -=item B - -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 @@ -299,7 +358,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