X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fmethod.t;h=a2b6ef56212f0c19c69df409fdb35b8e3ac0ae02;hb=c677b4195a09035d3ec2aa356c8025a356b556db;hp=7bc3adbe5ac8dbbfe9624f30ea464607bc07b8e0;hpb=022eb0ccc2f4226b13e399572f9df7326fb52e1e;p=p5sagit%2FDevel-Declare.git

diff --git a/t/method.t b/t/method.t
index 7bc3adb..a2b6ef5 100644
--- a/t/method.t
+++ b/t/method.t
@@ -1,5 +1,6 @@
+use strict;
+use warnings;
 use Devel::Declare ();
-use Scope::Guard;
 
 {
   package MethodHandlers;
@@ -50,63 +51,48 @@ use Scope::Guard;
     Devel::Declare::shadow_sub("${pack}::${Declarator}", $_[0]);
   }
 
-  sub inject_str {
-    my $linestr = Devel::Declare::get_linestr;
-    substr($linestr, $Offset, 0) = $_[0];
-    Devel::Declare::set_linestr($linestr);
+  # undef  -> my ($self) = shift;
+  # ''     -> my ($self) = @_;
+  # '$foo' -> my ($self, $foo) = @_;
+
+  sub make_proto_unwrap {
+    my ($proto) = @_;
+    my $inject = 'my ($self';
+    if (defined $proto) {
+      $inject .= ", $proto" if length($proto);
+      $inject .= ') = @_; ';
+    } else {
+      $inject .= ') = shift;';
+    }
+    return $inject;
   }
 
-  sub strip_str {
+  sub inject_if_block {
+    my $inject = shift;
+    skipspace;
     my $linestr = Devel::Declare::get_linestr;
-    if (substr($linestr, $Offset, length($_[0])) eq $_[0]) {
-      substr($linestr, $Offset, length($_[0])) = '';
+    if (substr($linestr, $Offset, 1) eq '{') {
+      substr($linestr, $Offset+1, 0) = $inject;
       Devel::Declare::set_linestr($linestr);
-      return 1;
     }
-    return 0;
   }
 
   sub parser {
-    my $pack = shift;
     local ($Declarator, $Offset) = @_;
     skip_declarator;
-    skipspace;
     my $name = strip_name;
-    skipspace if defined($name);
     my $proto = strip_proto;
-    skipspace if defined($proto);
-    my $linestr = Devel::Declare::get_linestr;
-    if (substr($linestr, $Offset, 1) eq '{') {
-      my $inject = 'my ($self';
-      if (defined $proto) {
-        $inject .= ", $proto" if length($proto);
-        $inject .= ') = @_; ';
-      } else {
-        $inject .= ') = shift;';
-      }
-      if (defined $name) {
-        $inject = ' BEGIN { MethodHandlers::inject_scope }; '.$inject;
-      }
-      substr($linestr, $Offset+1, 0) = $inject;
-      Devel::Declare::set_linestr($linestr);
-    }
+    inject_if_block(
+      make_proto_unwrap($proto)
+    );
     if (defined $name) {
-      $name = join('::', $pack, $name) unless ($name =~ /::/);
+      $name = join('::', Devel::Declare::get_curstash_name(), $name)
+        unless ($name =~ /::/);
       shadow(sub (&) { no strict 'refs'; *{$name} = shift; });
     } else {
       shadow(sub (&) { shift });
     }
   }
-
-  sub inject_scope {
-    $^H |= 0x120000;
-    $^H{DD_METHODHANDLERS} = Scope::Guard->new(sub {
-      my $linestr = Devel::Declare::get_linestr;
-      my $offset = Devel::Declare::get_linestr_offset;
-      substr($linestr, $offset, 0) = ';';
-      Devel::Declare::set_linestr($linestr);
-    });
-  }
 }
 
 my ($test_method1, $test_method2, @test_list);
@@ -119,26 +105,26 @@ my ($test_method1, $test_method2, @test_list);
   BEGIN {
     Devel::Declare->setup_for(
       __PACKAGE__,
-      { method => { const => sub { MethodHandlers::parser(__PACKAGE__, @_) } } }
+      { method => { const => \&MethodHandlers::parser } }
     );
   }
 
   method new {
     my $class = ref $self || $self;
     return bless({ @_ }, $class);
-  }
+  };
 
   method foo ($foo) {
     return (ref $self).': Foo: '.$foo;
-  }
+  };
 
   method upgrade(){ # no spaces to make case pathological
     bless($self, 'DeclareTest2');
-  }
+  };
 
   method DeclareTest2::bar () {
     return 'DeclareTest2: bar';
-  }
+  };
 
   $test_method1 = method {
     return join(', ', $self->{attr}, $_[1]);
@@ -148,13 +134,13 @@ my ($test_method1, $test_method2, @test_list);
     return join(', ', ref $self, $what);
   };
 
-  method main () { return "main"; }
+  method main () { return "main"; };
 
   @test_list = (method { 1 }, sub { 2 }, method () { 3 }, sub { 4 });
 
 }
 
-use Test::More 'no_plan';
+use Test::More;
 
 my $o = DeclareTest->new(attr => "value");
 
@@ -177,3 +163,5 @@ is($o->$test_method1('no', 'yes'), 'value, yes', 'anon method with @_ ok');
 is($o->$test_method2('this'), 'DeclareTest2, this', 'anon method with proto ok');
 
 is_deeply([ map { $_->() } @test_list ], [ 1, 2, 3, 4], 'binding ok');
+
+done_testing;