Version 0.006005

[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 9a11911..0bf0e9f 100644 (file)
--- a/lib/Devel/Declare/MethodInstaller/Simple.pm
+++ b/lib/Devel/Declare/MethodInstaller/Simple.pm
@@ -7,6 +7,8 @@ use Sub::Name;
 use strict;
 use warnings;
 
+our $VERSION = '0.006005';
+
 sub install_methodhandler {
   my $class = shift;
   my %args  = @_;
@@ -15,56 +17,41 @@ sub install_methodhandler {
     *{$args{into}.'::'.$args{name}}   = sub (&) {};
   }
 
+  my $warnings = warnings::enabled("redefine");
   my $ctx = $class->new(%args);
   Devel::Declare->setup_for(
     $args{into},
-    { $args{name} => { const => sub { $ctx->parser(@_) } } }
+    { $args{name} => { const => sub { $ctx->parser(@_, $warnings) } } }
   );
 }
 
-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}";
+sub code_for {
+  my ($self, $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();
+  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';
+      my $installer = $self->warning_on_redefine
+          ? sub { *{$name} = subname $name => $code; }
+          : sub { no warnings 'redefine';
+                  *{$name} = subname $name => $code; };
+      $installer->();
+      return;
+    };
+  } else {
+    return sub (&) { shift };
   }
+}
+
+sub install {
+  my ($self, $name ) = @_;
 
-  return $attrs;
+  $self->shadow( $self->code_for($name) );
 }
 
 sub parser {
@@ -81,22 +68,13 @@ 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 { }
+sub parse_proto { '' }
 
 sub inject_parsed_proto {
   return $_[1];