X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDevel%2FDeclare%2FContext%2FSimple.pm;h=db304e432b10d47aa3bf1ba5ac7a0fee498a3683;hb=b968549dde4c8a36fccca7aca22bcd092242b099;hp=8cbc8c111f5d57ff91d69952d354ca94e35422e7;hpb=79f9fba8cbbd3ffd2cd3704dc9e8be5a02f41ac7;p=p5sagit%2FDevel-Declare.git diff --git a/lib/Devel/Declare/Context/Simple.pm b/lib/Devel/Declare/Context/Simple.pm index 8cbc8c1..db304e4 100644 --- a/lib/Devel/Declare/Context/Simple.pm +++ b/lib/Devel/Declare/Context/Simple.pm @@ -6,6 +6,8 @@ use Devel::Declare (); use B::Hooks::EndOfScope; use Carp qw/confess/; +our $VERSION = '0.006015'; + sub new { my $class = shift; bless {@_}, $class; @@ -13,7 +15,7 @@ sub new { sub init { my $self = shift; - @{$self}{ qw(Declarator Offset) } = @_; + @{$self}{ qw(Declarator Offset WarningOnRedefined) } = @_; return $self; } @@ -32,6 +34,11 @@ sub declarator { return $self->{Declarator} } +sub warning_on_redefine { + my $self = shift; + return $self->{WarningOnRedefined} +} + sub skip_declarator { my $self = shift; my $decl = $self->declarator; @@ -105,7 +112,8 @@ sub strip_proto { Devel::Declare::clear_lex_stuff(); $linestr = $self->get_linestr(); - substr($linestr, $self->offset, $length) = ''; + substr($linestr, $self->offset, + defined($length) ? $length : length($linestr)) = ''; $self->set_linestr($linestr); return $proto; @@ -189,6 +197,52 @@ sub strip_names_and_args { return \@args; } +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 get_curstash_name { return Devel::Declare::get_curstash_name; }