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

diff --git a/lib/Class/MOP/Method/Generated.pm b/lib/Class/MOP/Method/Generated.pm
index 17b8cde..abdeb65 100644
--- a/lib/Class/MOP/Method/Generated.pm
+++ b/lib/Class/MOP/Method/Generated.pm
@@ -5,99 +5,54 @@ use strict;
 use warnings;
 
 use Carp 'confess';
+use Eval::Closure;
 
-our $VERSION   = '0.75';
+our $VERSION   = '1.11';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Class::MOP::Method';
 
-sub new {
-    my $class   = shift;
-    my %options = @_;  
-        
-    ($options{package_name} && $options{name})
-        || confess "You must supply the package_name and name parameters $Class::MOP::Method::UPGRADE_ERROR_TEXT";     
-        
-    my $self = $class->_new(\%options);
-    
-    $self->initialize_body;
-    
-    return $self;
-}
-
-sub _new {
-    my $class = shift;
-    my $options = @_ == 1 ? $_[0] : {@_};
-
-    $options->{is_inline} ||= 0;
-    $options->{body} ||= undef;
-
-    bless $options, $class;
-}
-
 ## accessors
 
-sub is_inline { $_[0]{is_inline} }
-
-sub definition_context { $_[0]{definition_context} }
-
-sub initialize_body {
-    confess "No body to initialize, " . __PACKAGE__ . " is an abstract base class";
+sub new {
+    confess __PACKAGE__ . " is an abstract base class, you must provide a constructor.";
 }
 
-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 _initialize_body {
+    confess "No body to initialize, " . __PACKAGE__ . " is an abstract base class";
 }
 
-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;
@@ -112,36 +67,11 @@ Class::MOP::Method::Generated - Abstract base class for generated methods
 
 =head1 DESCRIPTION
 
-This is a C<Class::MOP::Method> subclass which is used interally 
-by C<Class::MOP::Method::Accessor> and C<Class::MOP::Method::Constructor>.
-
-=head1 METHODS
-
-=over 4
-
-=item B<new (%options)>
-
-This creates the method based on the criteria in C<%options>, 
-these options are:
-
-=over 4
-
-=item I<is_inline>
-
-This is a boolean to indicate if the method should be generated
-as a closure, or as a more optimized inline version.
-
-=back
-
-=item B<is_inline>
-
-This returns the boolean which was passed into C<new>.
-
-=item B<initialize_body>
-
-This is an abstract method and will throw an exception if called.
+This is a C<Class::MOP::Method> subclass which is subclassed by
+C<Class::MOP::Method::Accessor> and
+C<Class::MOP::Method::Constructor>.
 
-=back
+It is not intended to be used directly.
 
 =head1 AUTHORS
 
@@ -149,7 +79,7 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2008 by Infinity Interactive, Inc.
+Copyright 2006-2010 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>