X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FClass-MOP.git;a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod%2FGenerated.pm;fp=lib%2FClass%2FMOP%2FMethod%2FGenerated.pm;h=abdeb65aa11f5d7a419d6ea8e79c6045ca12df5a;hp=cb4b1b0385f0d14fd5b2297d7ee32c8b8489aa82;hb=15961c86cfd845e6f46b6c362cc1a4b94ffb45db;hpb=5f90deee7aaaa91b691b9bee49ed681daa311b69

diff --git a/lib/Class/MOP/Method/Generated.pm b/lib/Class/MOP/Method/Generated.pm
index cb4b1b0..abdeb65 100644
--- a/lib/Class/MOP/Method/Generated.pm
+++ b/lib/Class/MOP/Method/Generated.pm
@@ -5,6 +5,7 @@ use strict;
 use warnings;
 
 use Carp 'confess';
+use Eval::Closure;
 
 our $VERSION   = '1.11';
 $VERSION = eval $VERSION;
@@ -22,97 +23,36 @@ sub _initialize_body {
     confess "No body to initialize, " . __PACKAGE__ . " is an abstract base class";
 }
 
-sub _eval_closure {
-    my ($self, $__captures, $sub_body) = @_;
-
-    my $code;
-
-    my $e = do {
-        local $@;
-        local $SIG{__DIE__};
-        my $source = join
-            "\n", (
-            map {
-                /^([\@\%\$])/
-                    or die "capture key should start with \@, \% or \$: $_";
-                q[my ] 
-                    . $_ . q[ = ] 
-                    . $1
-                    . q[{$__captures->{']
-                    . $_ . q['}};];
-                } keys %$__captures
-            ),
-            $sub_body;
-
-        $self->_dump_source($source) if $ENV{MOP_PRINT_SOURCE};
-
-        $code = eval $source;
-        $@;
-    };
-
-    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;
-    }
+sub _generate_description {
+    my ( $self, $context ) = @_;
+    $context ||= $self->definition_context;
 
-    print STDERR "\n", $self->name, ":\n", $output, "\n";
-}
-
-sub _add_line_directive {
-    my ( $self, %args ) = @_;
+    return "generated method (unknown origin)"
+        unless defined $context;
 
-    my ( $line, $file );
-
-    if ( my $ctx = ( $args{context} || $self->definition_context ) ) {
-        $line = $ctx->{line};
-        if ( my $desc = $ctx->{description} ) {
-            $file = "$desc defined at $ctx->{file}";
-        } else {
-            $file = $ctx->{file};
-        }
+    if (defined $context->{description}) {
+        return "$context->{description} "
+             . "(defined at $context->{file} line $context->{line})";
     } else {
-        ( $line, $file ) = ( 0, "generated method (unknown origin)" );
+        return "$context->{file} (line $context->{line})";
     }
-
-    my $code = $args{code};
-
-    # if it's an array of lines, join it up
-    # don't use newlines so that the definition context is more meaningful
-    $code = join(@$code, ' ') if ref $code;
-
-    return qq{#line $line "$file"\n} . $code;
 }
 
 sub _compile_code {
-    my ( $self, %args ) = @_;
-
-    my $code = $self->_add_line_directive(%args);
-
-    return $self->_eval_closure($args{environment}, $code);
+    my ( $self, @args ) = @_;
+    unshift @args, 'source' if @args % 2;
+    my %args = @args;
+
+    my $context = delete $args{context};
+    my $environment = $self->can('_eval_environment')
+        ? $self->_eval_environment
+        : {};
+
+    return eval_closure(
+        environment => $environment,
+        description => $self->_generate_description($context),
+        %args,
+    );
 }
 
 1;