Refactor MethodInstaller::Simple.

[p5sagit/Devel-Declare.git] / lib / Devel / Declare / MethodInstaller / Simple.pm

diff --git a/lib/Devel/Declare/MethodInstaller/Simple.pm b/lib/Devel/Declare/MethodInstaller/Simple.pm
index 96fa88c..e8b5668 100644 (file)
--- a/lib/Devel/Declare/MethodInstaller/Simple.pm
+++ b/lib/Devel/Declare/MethodInstaller/Simple.pm
@@ -26,36 +26,34 @@ sub strip_attrs {
   my $self = shift;
   $self->skipspace;
 
-  my $Offset  = $self->offset;
   my $linestr = Devel::Declare::get_linestr;
   my $attrs   = '';
 
-  if (substr($linestr, $Offset, 1) eq ':') {
-    while (substr($linestr, $Offset, 1) ne '{') {
-      if (substr($linestr, $Offset, 1) eq ':') {
-        substr($linestr, $Offset, 1) = '';
+  if (substr($linestr, $self->offset, 1) eq ':') {
+    while (substr($linestr, $self->offset, 1) ne '{') {
+      if (substr($linestr, $self->offset, 1) eq ':') {
+        substr($linestr, $self->offset, 1) = '';
         Devel::Declare::set_linestr($linestr);
 
         $attrs .= ':';
       }
 
       $self->skipspace;
-      $Offset  = $self->offset;
       $linestr = Devel::Declare::get_linestr();
 
-      if (my $len = Devel::Declare::toke_scan_word($Offset, 0)) {
-        my $name = substr($linestr, $Offset, $len);
-        substr($linestr, $Offset, $len) = '';
+      if (my $len = Devel::Declare::toke_scan_word($self->offset, 0)) {
+        my $name = substr($linestr, $self->offset, $len);
+        substr($linestr, $self->offset, $len) = '';
         Devel::Declare::set_linestr($linestr);
 
         $attrs .= " ${name}";
 
-        if (substr($linestr, $Offset, 1) eq '(') {
-          my $length = Devel::Declare::toke_scan_str($Offset);
+        if (substr($linestr, $self->offset, 1) eq '(') {
+          my $length = Devel::Declare::toke_scan_str($self->offset);
           my $arg    = Devel::Declare::get_lex_stuff();
           Devel::Declare::clear_lex_stuff();
           $linestr = Devel::Declare::get_linestr();
-          substr($linestr, $Offset, $length) = '';
+          substr($linestr, $self->offset, $length) = '';
           Devel::Declare::set_linestr($linestr);
 
           $attrs .= "(${arg})";
@@ -69,6 +67,31 @@ sub strip_attrs {
   return $attrs;
 }
 
+sub code_for {
+  my ($self, $name) = @_;
+
+  if (defined $name) {
+    my $pkg = $self->get_curstash_name;
+    $name = join( '::', $pkg, $name )
+      unless( $name =~ /::/ );
+    return sub (&) {
+      my $code = shift;
+      # So caller() gets the subroutine name
+      no strict 'refs';
+      *{$name} = subname $name => $code;
+      return;
+    };
+  } else {
+    return sub (&) { shift };
+  }
+}
+
+sub install {
+  my ($self, $name ) = @_;
+
+  $self->shadow( $self->code_for($name) );
+}
+
 sub parser {
   my $self = shift;
   $self->init(@_);
@@ -83,19 +106,10 @@ sub parser {
     $inject = $self->scope_injector_call() . $inject;
   }
   $self->inject_if_block($inject, $attrs ? "sub ${attrs} " : '');
-  if (defined $name) {
-    my $pkg = $self->get_curstash_name;
-    $name = join( '::', $pkg, $name )
-      unless( $name =~ /::/ );
-    $self->shadow( sub (&) {
-      my $code = shift;
-      # So caller() gets the subroutine name
-      no strict 'refs';
-      *{$name} = subname $name => $code;
-    });
-  } else {
-    $self->shadow(sub (&) { shift });
-  }
+
+  $self->install( $name );
+
+  return;
 }
 
 sub parse_proto { }