use strict;
use warnings;
-sub DEBUG { warn "@_" }
sub new {
my $class = shift;
bless {@_}, $class;
sub init {
my $self = shift;
@{$self}{ qw(Declarator Offset) } = @_;
- $self;
+ return $self;
}
-sub offset : lvalue { shift->{Offset}; }
-sub declarator { shift->{Declarator} }
+sub offset {
+ my $self = shift;
+ return $self->{Offset}
+}
+
+sub inc_offset {
+ my $self = shift;
+ $self->{Offset} += shift;
+}
+
+sub declarator {
+ my $self = shift;
+ return $self->{Declarator}
+}
sub skip_declarator {
my $self = shift;
- $self->offset += Devel::Declare::toke_move_past_token( $self->offset );
+ $self->inc_offset(Devel::Declare::toke_move_past_token($self->offset));
}
sub skipspace {
my $self = shift;
- $self->offset += Devel::Declare::toke_skipspace( $self->offset );
+ $self->inc_offset(Devel::Declare::toke_skipspace($self->offset));
+}
+
+sub get_linestr {
+ my $self = shift;
+ my $line = Devel::Declare::get_linestr();
+ return $line;
+}
+
+sub set_linestr {
+ my $self = shift;
+ my ($line) = @_;
+ Devel::Declare::set_linestr($line);
}
sub strip_name {
my $self = shift;
$self->skipspace;
if (my $len = Devel::Declare::toke_scan_word( $self->offset, 1 )) {
- my $linestr = Devel::Declare::get_linestr();
+ my $linestr = $self->get_linestr();
my $name = substr( $linestr, $self->offset, $len );
substr( $linestr, $self->offset, $len ) = '';
- Devel::Declare::set_linestr($linestr);
+ $self->set_linestr($linestr);
return $name;
}
my $self = shift;
$self->skipspace;
- my $linestr = Devel::Declare::get_linestr();
+ my $linestr = $self->get_linestr();
if (substr($linestr, $self->offset, 1) eq '(') {
my $length = Devel::Declare::toke_scan_str($self->offset);
- my $proto = Devel::Declare::get_lex_stuff();
+ my $proto = Devel::Declare::get_lex_stuff();
Devel::Declare::clear_lex_stuff();
- $linestr = Devel::Declare::get_linestr();
+ if( $length < 0 ) {
+ # Need to scan ahead more
+ $linestr .= $self->get_linestr();
+ $length = rindex($linestr, ")") - $self->offset + 1;
+ }
+ else {
+ $linestr = $self->get_linestr();
+ }
+
substr($linestr, $self->offset, $length) = '';
- Devel::Declare::set_linestr($linestr);
+ $self->set_linestr($linestr);
+
return $proto;
}
-
return;
}
}
sub shadow {
- my $self = shift;
+ my $self = shift;
my $pack = $self->get_curstash_name;
Devel::Declare::shadow_sub( $pack . '::' . $self->declarator, $_[0] );
}
$self->skipspace;
- my $linestr = Devel::Declare::get_linestr;
+ my $linestr = $self->get_linestr;
if (substr($linestr, $self->offset, 1) eq '{') {
substr($linestr, $self->offset + 1, 0) = $inject;
substr($linestr, $self->offset, 0) = $before;
- Devel::Declare::set_linestr($linestr);
+ $self->set_linestr($linestr);
}
}