X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod%2FGenerated.pm;h=a06f115852511fc9a14716d5c436e7e18e84a7c0;hb=bd2550f8320262fe1ab10f6c0eedc960889d869f;hp=f3032daca1e7a2c06c79dded075cc69c8c6526e9;hpb=070bb6c98b09351644c335dc9614d9bbba5d2684;p=gitmo%2FClass-MOP.git

diff --git a/lib/Class/MOP/Method/Generated.pm b/lib/Class/MOP/Method/Generated.pm
index f3032da..a06f115 100644
--- a/lib/Class/MOP/Method/Generated.pm
+++ b/lib/Class/MOP/Method/Generated.pm
@@ -6,65 +6,84 @@ use warnings;
 
 use Carp 'confess';
 
-our $VERSION   = '0.78';
+our $VERSION   = '1.12';
 $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 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",
-        (
+    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
-        ),
-        $_[2]
-    );
+                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;
+    }
+
+    print STDERR "\n", $self->name, ":\n", $output, "\n";
 }
 
 sub _add_line_directive {
@@ -97,7 +116,7 @@ sub _compile_code {
 
     my $code = $self->_add_line_directive(%args);
 
-    $self->_eval_closure($args{environment}, $code);
+    return $self->_eval_closure($args{environment}, $code);
 }
 
 1;
@@ -112,36 +131,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 +143,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>