X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod%2FGenerated.pm;h=19c01ae631a1e4081f4227121d3d2e423f567b16;hb=e00524a03329f89358767302ffc62cd15ec33571;hp=1cbdadc3d47c98b04f18c822b4475bea51310b9d;hpb=5a08df3f62377eb42817c50f0d0ff02f3efb3cc5;p=gitmo%2FClass-MOP.git

diff --git a/lib/Class/MOP/Method/Generated.pm b/lib/Class/MOP/Method/Generated.pm
index 1cbdadc..19c01ae 100644
--- a/lib/Class/MOP/Method/Generated.pm
+++ b/lib/Class/MOP/Method/Generated.pm
@@ -6,41 +6,23 @@ use warnings;
 
 use Carp 'confess';
 
-our $VERSION   = '0.72';
+our $VERSION   = '0.83';
 $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;
+## accessors
 
-    bless $options, $class;
+sub new {
+    confess __PACKAGE__ . " is an abstract base class, you must provide a constructor.";
 }
 
-## accessors
+sub is_inline { $_[0]{is_inline} }
 
-sub is_inline { (shift)->{'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";
 }
 
@@ -49,57 +31,72 @@ sub _eval_closure {
     my $__captures = $_[1];
     eval join(
         "\n",
-        (map {
-            /^([\@\%\$])/
-                or die "capture key should start with \@, \% or \$: $_";
-            q!my !.$_.q! = !.$1.q!{$__captures->{'!.$_.q!'}};!;
-        } keys %$__captures),
+        (
+            map {
+                /^([\@\%\$])/
+                    or die "capture key should start with \@, \% or \$: $_";
+                q[my ]
+                . $_ . q[ = ]
+                . $1
+                . q[{$__captures->{']
+                . $_
+                . q['}};];
+            } keys %$__captures
+        ),
         $_[2]
     );
 }
 
-1;
-
-__END__
-
-=pod
-
-=head1 NAME 
+sub _add_line_directive {
+    my ( $self, %args ) = @_;
 
-Class::MOP::Method::Generated - Abstract base class for generated methods
+    my ( $line, $file );
 
-=head1 DESCRIPTION
+    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)" );
+    }
 
-This is a C<Class::MOP::Method> subclass which is used interally 
-by C<Class::MOP::Method::Accessor> and C<Class::MOP::Method::Constructor>.
+    my $code = $args{code};
 
-=head1 METHODS
+    # 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;
 
-=over 4
+    return qq{#line $line "$file"\n} . $code;
+}
 
-=item B<new (%options)>
+sub _compile_code {
+    my ( $self, %args ) = @_;
 
-This creates the method based on the criteria in C<%options>, 
-these options are:
+    my $code = $self->_add_line_directive(%args);
 
-=over 4
+    $self->_eval_closure($args{environment}, $code);
+}
 
-=item I<is_inline>
+1;
 
-This is a boolean to indicate if the method should be generated
-as a closure, or as a more optimized inline version.
+__END__
 
-=back
+=pod
 
-=item B<is_inline>
+=head1 NAME 
 
-This returns the boolean which was passed into C<new>.
+Class::MOP::Method::Generated - Abstract base class for generated methods
 
-=item B<initialize_body>
+=head1 DESCRIPTION
 
-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
 
@@ -107,7 +104,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>