X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod%2FGenerated.pm;h=a06f115852511fc9a14716d5c436e7e18e84a7c0;hb=bd2550f8320262fe1ab10f6c0eedc960889d869f;hp=53d9959dd5b0dbbee7ce8ddc079dc2ecfb447c24;hpb=db130c70dd57d254d55a30d0a6c58df44505ce8a;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Method/Generated.pm b/lib/Class/MOP/Method/Generated.pm index 53d9959..a06f115 100644 --- a/lib/Class/MOP/Method/Generated.pm +++ b/lib/Class/MOP/Method/Generated.pm @@ -6,14 +6,12 @@ use warnings; use Carp 'confess'; -our $VERSION = '1.05'; +our $VERSION = '1.12'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use base 'Class::MOP::Method'; -use constant _PRINT_SOURCE => $ENV{MOP_PRINT_SOURCE} ? 1 : 0; - ## accessors sub new { @@ -29,8 +27,7 @@ sub _initialize_body { } sub _eval_closure { - # my ($self, $captures, $sub_body) = @_; - my $__captures = $_[1]; + my ($self, $__captures, $sub_body) = @_; my $code; @@ -49,8 +46,10 @@ sub _eval_closure { . $_ . q['}};]; } keys %$__captures ), - $_[2]; - print STDERR "\n", $_[0]->name, ":\n", $source, "\n" if _PRINT_SOURCE; + $sub_body; + + $self->_dump_source($source) if $ENV{MOP_PRINT_SOURCE}; + $code = eval $source; $@; }; @@ -58,6 +57,35 @@ sub _eval_closure { return ( $code, $e ); } +sub _dump_source { + my ( $self, $source ) = @_; + + my $output; + if ( eval { require Perl::Tidy } ) { + require File::Spec; + + my $rc_file = File::Spec->catfile( + $INC{'Class/MOP/Method/Generated.pm'}, + ('..') x 5, + 'perltidyrc' + ); + + my %p = ( + source => \$source, + destination => \$output, + ); + $p{perltidyrc} = $rc_file + if -f $rc_file; + + Perl::Tidy::perltidy(%p); + } + else { + $output = $source; + } + + print STDERR "\n", $self->name, ":\n", $output, "\n"; +} + sub _add_line_directive { my ( $self, %args ) = @_;