factor codegen stuff out to Eval::Closure

[gitmo/Class-MOP.git] / lib / Class / MOP / Method / Generated.pm

diff --git a/lib/Class/MOP/Method/Generated.pm b/lib/Class/MOP/Method/Generated.pm
index 257af8e..abdeb65 100644 (file)
--- a/lib/Class/MOP/Method/Generated.pm
+++ b/lib/Class/MOP/Method/Generated.pm
@@ -5,8 +5,9 @@ use strict;
 use warnings;
 
 use Carp 'confess';
+use Eval::Closure;
 
-our $VERSION   = '0.78';
+our $VERSION   = '1.11';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -18,66 +19,40 @@ sub new {
     confess __PACKAGE__ . " is an abstract base class, you must provide a constructor.";
 }
 
-sub is_inline { $_[0]{is_inline} }
-
-sub definition_context { $_[0]{definition_context} }
-
-sub initialize_body {
+sub _initialize_body {
     confess "No body to initialize, " . __PACKAGE__ . " is an abstract base class";
 }
 
-sub _eval_closure {
-    # my ($self, $captures, $sub_body) = @_;
-    my $__captures = $_[1];
-    eval join(
-        "\n",
-        (
-            map {
-                /^([\@\%\$])/
-                    or die "capture key should start with \@, \% or \$: $_";
-                q[my ]
-                . $_ . q[ = ]
-                . $1
-                . q[{$__captures->{']
-                . $_
-                . q['}};];
-            } keys %$__captures
-        ),
-        $_[2]
-    );
-}
-
-sub _add_line_directive {
-    my ( $self, %args ) = @_;
+sub _generate_description {
+    my ( $self, $context ) = @_;
+    $context ||= $self->definition_context;
 
-    my ( $line, $file );
+    return "generated method (unknown origin)"
+        unless defined $context;
 
-    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);
-
-    $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;
@@ -104,7 +79,7 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2009 by Infinity Interactive, Inc.
+Copyright 2006-2010 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>