X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDevel%2FDeclare%2FMethodInstaller%2FSimple.pm;h=0bf0e9f1b2d290a406bc30aad2f37d6bdc820c84;hb=5c82d5478de9d26a18ff812912b91b9170126b31;hp=319775bdc4ebf3fc6d29d6a8c98634767a82475c;hpb=2c746743b2eec21048ea3a04f88b3d8eaf79d1db;p=p5sagit%2FDevel-Declare.git

diff --git a/lib/Devel/Declare/MethodInstaller/Simple.pm b/lib/Devel/Declare/MethodInstaller/Simple.pm
index 319775b..0bf0e9f 100644
--- a/lib/Devel/Declare/MethodInstaller/Simple.pm
+++ b/lib/Devel/Declare/MethodInstaller/Simple.pm
@@ -7,7 +7,7 @@ use Sub::Name;
 use strict;
 use warnings;
 
-our $VERSION = '0.003004';
+our $VERSION = '0.006005';
 
 sub install_methodhandler {
   my $class = shift;
@@ -17,58 +17,14 @@ 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}";
-
-        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();
-  }
-
-  return $attrs;
-}
-
 sub code_for {
   my ($self, $name) = @_;
 
@@ -80,7 +36,11 @@ sub code_for {
       my $code = shift;
       # So caller() gets the subroutine name
       no strict 'refs';
-      *{$name} = subname $name => $code;
+      my $installer = $self->warning_on_redefine
+          ? sub { *{$name} = subname $name => $code; }
+          : sub { no warnings 'redefine';
+                  *{$name} = subname $name => $code; };
+      $installer->();
       return;
     };
   } else {