Allow extracting strings going over multiple lines using scan_str.

[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 7b0f740..1a47a7f 100644 (file)
--- a/lib/Devel/Declare/Context/Simple.pm
+++ b/lib/Devel/Declare/Context/Simple.pm
@@ -5,7 +5,6 @@ use B::Hooks::EndOfScope;
 use strict;
 use warnings;
 
-sub DEBUG { warn "@_" }
 sub new {
   my $class = shift;
   bless {@_}, $class;
@@ -14,30 +13,54 @@ 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 {
+  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;
   }
 
@@ -45,21 +68,37 @@ 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;
 
-  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();
+    $linestr = $self->get_linestr();
+
     substr($linestr, $self->offset, $length) = '';
-    Devel::Declare::set_linestr($linestr);
+    $self->set_linestr($linestr);
+
     return $proto;
   }
-
   return;
 }
 
@@ -68,7 +107,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] );
 }
@@ -80,12 +119,14 @@ sub inject_if_block {
 
   $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);
+    return 1;
   }
+  return 0;
 }
 
 sub scope_injector_call {