using :lvalue subs breaks the debugger, so I added a inc_offset method to Context...

[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 0df21d1..9a11911 100644 (file)
--- a/lib/Devel/Declare/MethodInstaller/Simple.pm
+++ b/lib/Devel/Declare/MethodInstaller/Simple.pm
@@ -8,54 +8,99 @@ use strict;
 use warnings;
 
 sub install_methodhandler {
-    my $class = shift;
-    my %args  = @_;
-    {
-        no strict 'refs';
-        *{$args{into}.'::'.$args{name}}   = sub (&) {};
+  my $class = shift;
+  my %args  = @_;
+  {
+    no strict 'refs';
+    *{$args{into}.'::'.$args{name}}   = sub (&) {};
+  }
+
+  my $ctx = $class->new(%args);
+  Devel::Declare->setup_for(
+    $args{into},
+    { $args{name} => { const => sub { $ctx->parser(@_) } } }
+  );
+}
+
+sub strip_attrs {
+  my $self = shift;
+  $self->skipspace;
+
+  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})";
+        }
+      }
     }
 
-    my $ctx = $class->new( %args );
-    Devel::Declare->setup_for(
-        $args{into},
-        { $args{name} => { const => sub { $ctx->parser(@_) } } }
-    );
+    $linestr = Devel::Declare::get_linestr();
+  }
 
+  return $attrs;
 }
 
 sub parser {
-    my $ctx = shift;
-    $ctx->init(@_);
-
-    $ctx->skip_declarator;
-    my $name   = $ctx->strip_name;
-    my $proto  = $ctx->strip_proto;
-    my @decl   = $ctx->parse_proto($proto);
-    my $inject = $ctx->inject_parsed_proto(@decl);
-    if( defined $name ) {
-        $inject = $ctx->scope_injector_call() . $inject;
-    }
-    $ctx->inject_if_block($inject);
-    if( defined $name ) {
-        my $pkg = $ctx->get_curstash_name;
-        $name = join( '::', $pkg, $name )
-            unless( $name =~ /::/ );
-        $ctx->shadow( sub (&) {
-            my $code = shift;
-            # So caller() gets the subroutine name
-            no strict 'refs';
-            *{$name} = subname $name => $code;
-        });
-    } else {
-        $ctx->shadow(sub (&) { shift });
-    }
+  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} " : '');
+  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 });
+  }
 }
+
 sub parse_proto { }
+
 sub inject_parsed_proto {
-    my $ctx = shift;
-    shift;
+  return $_[1];
 }
 
-
 1;