X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod%2FGenerated.pm;h=1e35f76d19459331f73950f2f5d2c5a619ce5249;hb=cfde7a47afcc5ceef67837c8a463aac89b5b955f;hp=4b889b0a885b17b525546e37dc76fc521265db37;hpb=db4c4962070763dbc8e37d0d2aaa3e05d7e953b7;p=gitmo%2FClass-MOP.git

diff --git a/lib/Class/MOP/Method/Generated.pm b/lib/Class/MOP/Method/Generated.pm
index 4b889b0..1e35f76 100644
--- a/lib/Class/MOP/Method/Generated.pm
+++ b/lib/Class/MOP/Method/Generated.pm
@@ -6,45 +6,79 @@ use warnings;
 
 use Carp 'confess';
 
-our $VERSION   = '0.75';
+our $VERSION   = '0.78';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Class::MOP::Method';
 
+## accessors
+
 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;
+    confess __PACKAGE__ . " is an abstract base class, you must provide a constructor.";
 }
 
-sub _new {
-    my $class = shift;
-    my $options = @_ == 1 ? $_[0] : {@_};
+sub is_inline { $_[0]{is_inline} }
 
-    $options->{is_inline} ||= 0;
-    $options->{body} ||= undef;
+sub definition_context { $_[0]{definition_context} }
 
-    bless $options, $class;
+sub initialize_body {
+    confess "No body to initialize, " . __PACKAGE__ . " is an abstract base class";
 }
 
-## accessors
+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 is_inline { (shift)->{'is_inline'} }
+sub _add_line_directive {
+    my ( $self, %args ) = @_;
 
-sub initialize_body {
-    confess "No body to initialize, " . __PACKAGE__ . " is an abstract base class";
+    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};
+        }
+    } else {
+        ( $line, $file ) = ( 0, "generated method (unknown origin)" );
+    }
+
+    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);
+}
 
 1;
 
@@ -95,7 +129,7 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2008 by Infinity Interactive, Inc.
+Copyright 2006-2009 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>