[Moose-commits] r7322 - Class-MOP/branches/method_generation_cleanup/lib/Class/MOP/Method

[nothingmuch at code2.0beta.co.uk]

Author: nothingmuch
Date: 2009-01-17 14:36:34 -0800 (Sat, 17 Jan 2009)
New Revision: 7322

Modified:
   Class-MOP/branches/method_generation_cleanup/lib/Class/MOP/Method/Generated.pm
Log:
add _compile_code, a wrapper for _eval_closure and _add_line_directive

Modified: Class-MOP/branches/method_generation_cleanup/lib/Class/MOP/Method/Generated.pm
===================================================================
--- Class-MOP/branches/method_generation_cleanup/lib/Class/MOP/Method/Generated.pm	2009-01-17 22:03:26 UTC (rev 7321)
+++ Class-MOP/branches/method_generation_cleanup/lib/Class/MOP/Method/Generated.pm	2009-01-17 22:36:34 UTC (rev 7322)
@@ -26,32 +26,6 @@
     return $self;
 }
 
-
-sub _prepare_code {
-    my ( $self, %args ) = @_;
-
-    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 _new {
     my $class = shift;
     my $options = @_ == 1 ? $_[0] : {@_};
@@ -86,6 +60,39 @@
     );
 }
 
+sub _add_line_directive {
+    my ( $self, %args ) = @_;
+
+    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;
 
 __END__