use strict;
use warnings;
-our $VERSION = '0.79';
+our $VERSION = '1.00';
$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
}
sub _eval_code {
- my ( $self, $code ) = @_;
+ my ( $self, $source ) = @_;
# NOTE:
# set up the environment
my $type_constraint_obj = $attr->type_constraint;
my $environment = {
'$attr' => \$attr,
- '$attr_name' => \$attr->name,
'$meta' => \$self,
'$type_constraint_obj' => \$type_constraint_obj,
- '$type_constraint_name' => \($type_constraint_obj && $type_constraint_obj->name),
'$type_constraint' => \($type_constraint_obj
? $type_constraint_obj->_compiled_type_constraint
: undef),
};
- #warn "code for $attr_name =>\n" . $code . "\n";
- $self->_compile_code( environment => $environment, code => $code )
- or $self->throw_error("Could not create writer for '${\$self->associated_attribute->name}' because $@ \n code: $code", error => $@, data => $code );
+ #warn "code for " . $attr->name . " =>\n" . $source . "\n";
+ my ( $code, $e ) = $self->_compile_code( environment => $environment, code => $source );
+
+ $self->throw_error(
+ "Could not create writer for '${\$self->associated_attribute->name}' because $e \n code: $source",
+ error => $e, data => $source )
+ if $e;
+
+ return $code;
}
sub _generate_accessor_method_inline {
my $self = $_[0];
my $attr = $self->associated_attribute;
- my $attr_name = $attr->name;
my $inv = '$_[0]';
- my $slot_access = $self->_inline_access($inv, $attr_name);
my $value_name = $self->_value_needs_copy ? '$val' : '$_[1]';
$self->_eval_code('sub { ' . "\n"
. $self->_inline_check_required . "\n"
. $self->_inline_check_coercion($value_name) . "\n"
. $self->_inline_check_constraint($value_name) . "\n"
+ . $self->_inline_get_old_value_for_trigger($inv, $value_name) . "\n"
. $self->_inline_store($inv, $value_name) . "\n"
- . $self->_inline_trigger($inv, $value_name) . "\n"
+ . $self->_inline_trigger($inv, $value_name, '@old') . "\n"
. ' }' . "\n"
. $self->_inline_check_lazy($inv) . "\n"
. $self->_inline_post_body(@_) . "\n"
sub _generate_writer_method_inline {
my $self = $_[0];
my $attr = $self->associated_attribute;
- my $attr_name = $attr->name;
my $inv = '$_[0]';
- my $slot_access = $self->_inline_get($inv, $attr_name);
+ my $slot_access = $self->_inline_get($inv);
my $value_name = $self->_value_needs_copy ? '$val' : '$_[1]';
$self->_eval_code('sub { '
. $self->_inline_check_required
. $self->_inline_check_coercion($value_name)
. $self->_inline_check_constraint($value_name)
+ . $self->_inline_get_old_value_for_trigger($inv, $value_name) . "\n"
. $self->_inline_store($inv, $value_name)
. $self->_inline_post_body(@_)
- . $self->_inline_trigger($inv, $value_name)
+ . $self->_inline_trigger($inv, $value_name, '@old')
. ' }');
}
sub _generate_reader_method_inline {
my $self = $_[0];
my $attr = $self->associated_attribute;
- my $attr_name = $attr->name;
my $inv = '$_[0]';
- my $slot_access = $self->_inline_get($inv, $attr_name);
+ my $slot_access = $self->_inline_get($inv);
$self->_eval_code('sub {'
. $self->_inline_pre_body(@_)
my ($self, $value) = @_;
my $attr = $self->associated_attribute;
- my $attr_name = $attr->name;
return '' unless $attr->has_type_constraint;
- my $type_constraint_name = $attr->type_constraint->name;
+ my $attr_name = quotemeta( $attr->name );
qq{\$type_constraint->($value) || } . $self->_inline_throw_error(qq{"Attribute ($attr_name) does not pass the type constraint because: " . \$type_constraint_obj->get_message($value)}, "data => $value") . ";";
}
my $self = shift;
my $attr = $self->associated_attribute;
- my $attr_name = $attr->name;
-
return '' unless $attr->is_required;
+
+ my $attr_name = quotemeta( $attr->name );
+
return qq{(\@_ >= 2) || } . $self->_inline_throw_error(qq{"Attribute ($attr_name) is required, so cannot be set to undef"}) . ';' # defined $_[1] is not good enough
}
return '' unless $attr->is_lazy;
- my $slot_access = $self->_inline_access($instance, $attr->name);
-
- my $slot_exists = $self->_inline_has($instance, $attr->name);
+ my $slot_exists = $self->_inline_has($instance);
my $code = 'unless (' . $slot_exists . ') {' . "\n";
if ($attr->has_type_constraint) {
}
$code .= $self->_inline_check_coercion('$default') . "\n";
$code .= $self->_inline_check_constraint('$default') . "\n";
- $code .= ' ' . $self->_inline_init_slot($attr, $instance, $slot_access, '$default') . "\n";
+ $code .= ' ' . $self->_inline_init_slot($attr, $instance, '$default') . "\n";
}
else {
- $code .= ' ' . $self->_inline_init_slot($attr, $instance, $slot_access, 'undef') . "\n";
+ $code .= ' ' . $self->_inline_init_slot($attr, $instance, 'undef') . "\n";
}
} else {
if ($attr->has_default) {
- $code .= ' ' . $self->_inline_init_slot($attr, $instance, $slot_access, ('$attr->default(' . $instance . ')')) . "\n";
+ $code .= ' ' . $self->_inline_init_slot($attr, $instance, ('$attr->default(' . $instance . ')')) . "\n";
}
elsif ($attr->has_builder) {
$code .= ' if (my $builder = '.$instance.'->can($attr->builder)) { ' . "\n"
- . ' ' . $self->_inline_init_slot($attr, $instance, $slot_access, ($instance . '->$builder'))
+ . ' ' . $self->_inline_init_slot($attr, $instance, ($instance . '->$builder'))
. "\n } else {\n"
. ' ' . $self->_inline_throw_error(q{sprintf "%s does not support builder method '%s' for attribute '%s'", ref(} . $instance . ') || '.$instance.', $attr->builder, $attr->name')
. ';'. "\n }";
}
else {
- $code .= ' ' . $self->_inline_init_slot($attr, $instance, $slot_access, 'undef') . "\n";
+ $code .= ' ' . $self->_inline_init_slot($attr, $instance, 'undef') . "\n";
}
}
$code .= "}\n";
}
sub _inline_init_slot {
- my ($self, $attr, $inv, $slot_access, $value) = @_;
+ my ($self, $attr, $inv, $value) = @_;
if ($attr->has_initializer) {
return ('$attr->set_initial_value(' . $inv . ', ' . $value . ');');
}
else {
- return ($slot_access . ' = ' . $value . ';');
+ return $self->_inline_store($inv, $value);
}
}
return $code;
}
+sub _inline_get_old_value_for_trigger {
+ my ( $self, $instance ) = @_;
+
+ my $attr = $self->associated_attribute;
+ return '' unless $attr->has_trigger;
+
+ my $mi = $attr->associated_class->get_meta_instance;
+ my $pred = $mi->inline_is_slot_initialized($instance, $attr->name);
+
+ return
+ 'my @old = '
+ . $pred . q{ ? }
+ . $self->_inline_get($instance) . q{ : ()} . ";\n";
+}
+
sub _inline_trigger {
- my ($self, $instance, $value) = @_;
+ my ($self, $instance, $value, $old_value) = @_;
my $attr = $self->associated_attribute;
return '' unless $attr->has_trigger;
- return sprintf('$attr->trigger->(%s, %s);', $instance, $value);
+ return sprintf('$attr->trigger->(%s, %s, %s);', $instance, $value, $old_value);
}
sub _inline_get {
$sigil = '%';
}
else {
- $self->throw_error("Can not auto de-reference the type constraint '" . $type_constraint->name . "'", type_constraint => $type_constraint );
+ $self->throw_error( "Can not auto de-reference the type constraint '"
+ . quotemeta( $type_constraint->name )
+ . "'", type_constraint => $type_constraint );
}
"(wantarray() ? $sigil\{ ( $ref_value ) || return } : ( $ref_value ) )";
=head1 DESCRIPTION
-This class is a subclass of L<Class::MOP::Class::Accessor> that
+This class is a subclass of L<Class::MOP::Method::Accessor> that
provides additional Moose-specific functionality, all of which is
private.
To understand this class, you should read the the
-L<Class::MOP::Class::Accessor> documentation.
+L<Class::MOP::Method::Accessor> documentation.
=head1 BUGS
-All complex software has bugs lurking in it, and this module is no
-exception. If you find a bug please either email me, or add the bug
-to cpan-RT.
+See L<Moose/BUGS> for details on reporting bugs.
=head1 AUTHOR
=head1 COPYRIGHT AND LICENSE
-Copyright 2006-2009 by Infinity Interactive, Inc.
+Copyright 2006-2010 by Infinity Interactive, Inc.
L<http://www.iinteractive.com>