use Carp 'confess';
use Scalar::Util 'blessed', 'weaken', 'looks_like_number';
-our $VERSION = '0.89';
+our $VERSION = '0.91';
$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
sub _new {
my $class = shift;
- my $options = @_ == 1 ? $_[0] : {@_};
-
- bless {
- # from our superclass
- 'body' => undef,
- 'package_name' => $options->{package_name},
- 'name' => $options->{name},
- # specific to this subclass
- 'options' => $options->{options} || {},
- 'associated_metaclass' => $options->{metaclass},
- 'is_inline' => ($options->{is_inline} || 0),
+
+ 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}, # overriden
+ package_name => $params->{package_name},
+ name => $params->{name},
+ original_method => $params->{original_method},
+
+ # inherited from Class::MOP::Generated
+ is_inline => $params->{is_inline} || 0,
+ definition_context => $params->{definition_context},
+
+ # inherited from Class::MOP::Inlined
+ _expected_method_class => $params->{_expected_method_class},
+
+ # defined in this subclass
+ options => $params->{options} || {},
+ associated_metaclass => $params->{metaclass},
}, $class;
}
return sub { Class::MOP::Class->initialize(shift)->new_object(@_) }
}
+sub _inline_set_slot_value{
+ my($self,$attr, $instance, $attr_var, $value) = @_;
+
+ if($attr->has_trigger){
+ return sprintf q{ my $value = %s; %s->call_trigger(%s, $value); },
+ $self->_meta_instance->inline_set_slot_value($instance, $attr->name, $value),
+ $attr_var, $instance, $value;
+ }
+ else{
+ return $self->_meta_instance->inline_set_slot_value($instance, $attr->name, $value);
+ }
+}
+
sub generate_constructor_method_inline {
Carp::cluck('The generate_constructor_method_inline method has been made private.'
. " The public version is deprecated and will be removed in a future release.\n");
my $attr = shift;
my $close = shift;
+
+ my $attr_var = do{
+ my $attrs = ($close->{'@attrs'} ||= []);
+ push @{$attrs}, $attr;
+ sprintf q{$attrs[%d]}, scalar(@{$attrs}) - 1;
+ };
+
my $default;
if ($attr->has_default) {
# NOTE:
if ( defined(my $init_arg = $attr->init_arg) ) {
return (
'if(exists $params->{\'' . $init_arg . '\'}){' . "\n" .
- $self->_meta_instance->inline_set_slot_value(
+ $self->_inline_set_slot_value(
+ $attr,
'$instance',
- $attr->name,
+ $attr_var,
'$params->{\'' . $init_arg . '\'}' ) . "\n" .
'} ' . (!defined $default ? '' : 'else {' . "\n" .
- $self->_meta_instance->inline_set_slot_value(
+ $self->_inline_set_slot_value(
+ $attr,
'$instance',
- $attr->name,
+ $attr_var,
$default ) . "\n" .
'}')
);
} elsif ( defined $default ) {
return (
- $self->_meta_instance->inline_set_slot_value(
+ $self->_inline_set_slot_value(
+ $attr,
'$instance',
- $attr->name,
+ $attr_var,
$default ) . "\n"
);
} else { return '' }