X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FMethod%2FConstructor.pm;h=d8d8ab5d8d2fe2ed72176457700474194ac7dc7a;hb=2efc0af104c1926c066f50e1785236254bda12a2;hp=cff5fc3c97da6ed653ab56811e28d55dfeda6e2a;hpb=a497c7d3c518bbecf930e3f17d7a75b9bf84fa2f;p=gitmo%2FMouse.git diff --git a/lib/Mouse/Meta/Method/Constructor.pm b/lib/Mouse/Meta/Method/Constructor.pm index cff5fc3..d8d8ab5 100644 --- a/lib/Mouse/Meta/Method/Constructor.pm +++ b/lib/Mouse/Meta/Method/Constructor.pm @@ -3,13 +3,13 @@ use strict; use warnings; sub generate_constructor_method_inline { - my ($class, $meta) = @_; + my ($class, $metaclass) = @_; - my $associated_metaclass_name = $meta->name; - my @attrs = $meta->get_all_attributes; - my $buildall = $class->_generate_BUILDALL($meta); - my $buildargs = $class->_generate_BUILDARGS($meta); - my $processattrs = $class->_generate_processattrs($meta, \@attrs); + my $associated_metaclass_name = $metaclass->name; + my @attrs = $metaclass->get_all_attributes; + my $buildall = $class->_generate_BUILDALL($metaclass); + my $buildargs = $class->_generate_BUILDARGS($metaclass); + my $processattrs = $class->_generate_processattrs($metaclass, \@attrs); my @compiled_constraints = map { $_ ? $_->{_compiled_type_constraint} : undef } map { $_->{type_constraint} } @attrs; my $code = <<"..."; @@ -33,9 +33,11 @@ sub generate_constructor_method_inline { } sub _generate_processattrs { - my ($class, $meta, $attrs) = @_; + my ($class, $metaclass, $attrs) = @_; my @res; + my $has_triggers; + for my $index (0 .. @$attrs - 1) { my $attr = $attrs->[$index]; my $key = $attr->name; @@ -74,6 +76,7 @@ sub _generate_processattrs { } if ($attr->has_trigger) { + $has_triggers++; $code .= "push \@triggers, [\$attrs[$index]->{trigger}, \$value];\n"; } @@ -138,14 +141,22 @@ sub _generate_processattrs { push @res, $code; } - return join "\n", q{my @triggers;}, @res, q{$_->[0]->($instance, $_->[1]) for @triggers;}; + if($metaclass->is_anon_class){ + push @res, q{$instnace->{__METACLASS__} = $metaclass;}; + } + + if($has_triggers){ + unshift @res, q{my @triggers;}; + push @res, q{$_->[0]->($instance, $_->[1]) for @triggers;}; + } + + return join "\n", @res; } sub _generate_BUILDARGS { - my $self = shift; - my $meta = shift; + my($self, $metaclass) = @_; - if ($meta->name->can('BUILDARGS') && $meta->name->can('BUILDARGS') != Mouse::Object->can('BUILDARGS')) { + if ($metaclass->name->can('BUILDARGS') && $metaclass->name->can('BUILDARGS') != Mouse::Object->can('BUILDARGS')) { return 'my $args = $class->BUILDARGS(@_)'; } @@ -163,15 +174,15 @@ sub _generate_BUILDARGS { } sub _generate_BUILDALL { - my ($class, $meta) = @_; - return '' unless $meta->name->can('BUILD'); + my ($class, $metaclass) = @_; + return '' unless $metaclass->name->can('BUILD'); my @code = (); push @code, q{no strict 'refs';}; push @code, q{no warnings 'once';}; no strict 'refs'; no warnings 'once'; - for my $klass ($meta->linearized_isa) { + for my $klass ($metaclass->linearized_isa) { if (*{ $klass . '::BUILD' }{CODE}) { unshift @code, qq{${klass}::BUILD(\$instance, \$args);}; }