X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDevel%2FDeclare%2FContext%2FSimple.pm;h=1a47a7ff831c7016666f92260568218383a1063e;hb=86964fb3f9ba6afc359b1ecb231fe44dae3665ef;hp=548aa4561142743f0058dd8d89f7888845ebc9b0;hpb=5b27c9b27fb76cf9174e86a3ad98db42504023b2;p=p5sagit%2FDevel-Declare.git

diff --git a/lib/Devel/Declare/Context/Simple.pm b/lib/Devel/Declare/Context/Simple.pm
index 548aa45..1a47a7f 100644
--- a/lib/Devel/Declare/Context/Simple.pm
+++ b/lib/Devel/Declare/Context/Simple.pm
@@ -1,7 +1,7 @@
 package Devel::Declare::Context::Simple;
 
 use Devel::Declare ();
-use Scope::Guard;
+use B::Hooks::EndOfScope;
 use strict;
 use warnings;
 
@@ -13,32 +13,73 @@ 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;
   }
+
+  $self->skipspace;
+  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;
 }
 
@@ -46,14 +87,16 @@ sub strip_proto {
   my $self = shift;
   $self->skipspace;
 
-  my $linestr = Devel::Declare::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 $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();
     Devel::Declare::clear_lex_stuff();
-    $linestr = Devel::Declare::get_linestr();
-    substr( $linestr, $self->offset, $length ) = '';
-    Devel::Declare::set_linestr($linestr);
+    $linestr = $self->get_linestr();
+
+    substr($linestr, $self->offset, $length) = '';
+    $self->set_linestr($linestr);
+
     return $proto;
   }
   return;
@@ -64,36 +107,45 @@ 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] );
 }
 
 sub inject_if_block {
-  my $self    = shift;
+  my $self   = shift;
   my $inject = shift;
+  my $before = shift || '';
+
   $self->skipspace;
-  my $linestr = Devel::Declare::get_linestr;
-  if (substr( $linestr, $self->offset, 1 ) eq '{') {
-    substr( $linestr, $self->offset + 1, 0 ) = $inject;
-    Devel::Declare::set_linestr($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;
+    $self->set_linestr($linestr);
+    return 1;
   }
+  return 0;
 }
 
 sub scope_injector_call {
-  return ' BEGIN { ' . __PACKAGE__ . '::inject_scope }; ';
+  my $self = shift;
+  my $inject = shift || '';
+  return ' BEGIN { ' . ref($self) . "->inject_scope('${inject}') }; ";
 }
 
 sub inject_scope {
-  my $self = shift;
-  $^H |= 0x120000;
-  $^H{DD_METHODHANDLERS} = Scope::Guard->new(sub {
+  my $class = shift;
+  my $inject = shift;
+  on_scope_end {
       my $linestr = Devel::Declare::get_linestr;
+      return unless defined $linestr;
       my $offset  = Devel::Declare::get_linestr_offset;
-      substr( $linestr, $offset, 0 ) = ';';
+      substr( $linestr, $offset, 0 ) = ';' . $inject;
       Devel::Declare::set_linestr($linestr);
-  });
+  };
 }
 
 1;
-
+# vi:sw=2 ts=2