Add strip_indent to Ctx::Simple.

[p5sagit/Devel-Declare.git] / lib / Devel / Declare / Context / Simple.pm

diff --git a/lib/Devel/Declare/Context/Simple.pm b/lib/Devel/Declare/Context/Simple.pm
index 474025a..afbcaf4 100644 (file)
--- a/lib/Devel/Declare/Context/Simple.pm
+++ b/lib/Devel/Declare/Context/Simple.pm
@@ -13,20 +13,32 @@ sub new {
 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 {
@@ -56,6 +68,21 @@ sub strip_name {
   return;
 }
 
+sub strip_ident {
+  my $self = shift;
+  $self->skipspace;
+  if (my $len = Devel::Declare::toke_scan_ident( $self->offset )) {
+    my $linestr = $self->get_linestr();
+    my $ident = substr( $linestr, $self->offset, $len );
+    substr( $linestr, $self->offset, $len ) = '';
+    $self->set_linestr($linestr);
+    return $ident;
+  }
+
+  $self->skipspace;
+  return;
+}
+
 sub strip_proto {
   my $self = shift;
   $self->skipspace;
@@ -87,7 +114,7 @@ sub get_curstash_name {
 }
 
 sub shadow {
-  my $self  = shift;
+  my $self = shift;
   my $pack = $self->get_curstash_name;
   Devel::Declare::shadow_sub( $pack . '::' . $self->declarator, $_[0] );
 }