use Carp 'confess';
use Scalar::Util 'blessed', 'weaken';
-our $VERSION = '0.65';
+our $VERSION = '0.77';
+$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
use base 'Class::MOP::Method::Generated';
($options{package_name} && $options{name})
|| confess "You must supply the package_name and name parameters $Class::MOP::Method::UPGRADE_ERROR_TEXT";
- my $self = $class->_new(%options);
+ my $self = $class->_new(\%options);
# we don't want this creating
# a cycle in the code, if not
}
sub _new {
- my ( $class, %options ) = @_;
+ my $class = shift;
+ my $options = @_ == 1 ? $_[0] : {@_};
- $options{is_inline} ||= 0;
+ $options->{is_inline} ||= 0;
- return bless \%options, $class;
+ return bless $options, $class;
}
## accessors
($self->is_inline ? 'inline' : ())
);
- eval { $self->{'body'} = $self->$method_name() };
- die $@ if $@;
+ $self->{'body'} = $self->$method_name();
}
## generators
sub generate_accessor_method_inline {
- my $attr = (shift)->associated_attribute;
+ 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 $@;
-
- return $code;
+ return $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)
+ . '}'
+ );
}
sub generate_reader_method_inline {
- my $attr = (shift)->associated_attribute;
+ 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 {'
+ return $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 $@;
-
- return $code;
+ . '}'
+ );
}
sub generate_writer_method_inline {
- my $attr = (shift)->associated_attribute;
+ 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 {'
+ return $self->_eval_closure(
+ {},
+ 'sub {'
. $meta_instance->inline_set_slot_value('$_[0]', "'$attr_name'", '$_[1]')
- . '}';
- confess "Could not generate inline accessor because : $@" if $@;
-
- return $code;
+ . '}'
+ );
}
sub generate_predicate_method_inline {
- my $attr = (shift)->associated_attribute;
+ 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 $@;
-
- return $code;
+ return $self->_eval_closure(
+ {},
+ 'sub {'
+ . $meta_instance->inline_is_slot_initialized('$_[0]', "'$attr_name'")
+ . '}'
+ );
}
sub generate_clearer_method_inline {
- my $attr = (shift)->associated_attribute;
+ 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 {'
+ return $self->_eval_closure(
+ {},
+ 'sub {'
. $meta_instance->inline_deinitialize_slot('$_[0]', "'$attr_name'")
- . '}';
- confess "Could not generate inline clearer because : $@" if $@;
-
- return $code;
+ . '}'
+ );
}
1;
accessor_type => 'reader',
);
- $reader->body->($instance); # call the reader method
+ $reader->body->execute($instance); # call the reader method
=head1 DESCRIPTION