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 4167116..e8b5668 100644 (file)
--- a/lib/Devel/Declare/MethodInstaller/Simple.pm
+++ b/lib/Devel/Declare/MethodInstaller/Simple.pm
@@ -22,32 +22,94 @@ sub install_methodhandler {
   );
 }
 
-sub parser {
+sub strip_attrs {
   my $self = shift;
-  $self->init(@_);
+  $self->skipspace;
 
-  $self->skip_declarator;
-  my $name   = $self->strip_name;
-  my $proto  = $self->strip_proto;
-  my @decl   = $self->parse_proto($proto);
-  my $inject = $self->inject_parsed_proto(@decl);
-  if (defined $name) {
-    $inject = $self->scope_injector_call() . $inject;
+  my $linestr = Devel::Declare::get_linestr;
+  my $attrs   = '';
+
+  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;
+      $linestr = Devel::Declare::get_linestr();
+
+      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, $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, $self->offset, $length) = '';
+          Devel::Declare::set_linestr($linestr);
+
+          $attrs .= "(${arg})";
+        }
+      }
+    }
+
+    $linestr = Devel::Declare::get_linestr();
   }
-  $self->inject_if_block($inject);
+
+  return $attrs;
+}
+
+sub code_for {
+  my ($self, $name) = @_;
+
   if (defined $name) {
     my $pkg = $self->get_curstash_name;
     $name = join( '::', $pkg, $name )
       unless( $name =~ /::/ );
-    $self->shadow( sub (&) {
+    return sub (&) {
       my $code = shift;
       # So caller() gets the subroutine name
       no strict 'refs';
       *{$name} = subname $name => $code;
-    });
+      return;
+    };
   } else {
-    $self->shadow(sub (&) { shift });
+    return sub (&) { shift };
+  }
+}
+
+sub install {
+  my ($self, $name ) = @_;
+
+  $self->shadow( $self->code_for($name) );
+}
+
+sub parser {
+  my $self = shift;
+  $self->init(@_);
+
+  $self->skip_declarator;
+  my $name   = $self->strip_name;
+  my $proto  = $self->strip_proto;
+  my $attrs  = $self->strip_attrs;
+  my @decl   = $self->parse_proto($proto);
+  my $inject = $self->inject_parsed_proto(@decl);
+  if (defined $name) {
+    $inject = $self->scope_injector_call() . $inject;
   }
+  $self->inject_if_block($inject, $attrs ? "sub ${attrs} " : '');
+
+  $self->install( $name );
+
+  return;
 }
 
 sub parse_proto { }