hijack next::method in the bootstrap

stevan · Jul 13, 2013 · 058bfb2 · 058bfb2
1 parent c14e891
commit 058bfb2
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 11 deletions.
diff --git a/lib/mop.pm b/lib/mop.pm
@@ -88,6 +88,21 @@ sub bootstrap {
         # is true.
         @{ $Class_stash->get_symbol('@ISA') } = ('mop::object');
     }
+
+    {
+        my $old_next_method = \&next::method;
+        no warnings 'redefine';
+        *next::method = sub {
+            my $invocant = shift;
+            if ( mop::util::has_meta( $invocant ) ) {
+                $invocant->mop::next::method( @_ )
+            } else {
+                $invocant->$old_next_method( @_ )
+            }
+        }
+
+    }
+
     $BOOTSTRAPPED = 1;
 }
 

diff --git a/t/001-examples/001-point.t b/t/001-examples/001-point.t
@@ -38,7 +38,7 @@ class Point3D extends Point {
     }
 
     method pack {
-        my $data = $self->mop::next::method;
+        my $data = $self->next::method;
         $data->{z} = $z;
         $data;
     }

diff --git a/t/001-examples/002-bank-account.t b/t/001-examples/002-bank-account.t
@@ -31,7 +31,7 @@ class CheckingAccount extends BankAccount {
             $self->deposit( $overdraft_amount );
         }
 
-        $self->mop::next::method( $amount );
+        $self->next::method( $amount );
     }
 }
 

diff --git a/t/001-examples/006-logger.t b/t/001-examples/006-logger.t
@@ -42,7 +42,7 @@ class MyLogger extends Logger {
         given ( $level ) {
             when ( 'info'  ) { my_warn( '<info> ', $msg ) }
             default {
-                $self->mop::next::method( $level, $msg );
+                $self->next::method( $level, $msg );
             }
         }
     }

diff --git a/t/010-basics/006-next-method.t b/t/010-basics/006-next-method.t
@@ -13,15 +13,15 @@ class Foo {
 }
 
 class FooBar extends Foo {
-    method foo { $self->mop::next::method . "-FOOBAR" }
+    method foo { $self->next::method . "-FOOBAR" }
 }
 
 class FooBarBaz extends FooBar {
-    method foo { $self->mop::next::method . "-FOOBARBAZ" }
+    method foo { $self->next::method . "-FOOBARBAZ" }
 }
 
 class FooBarBazGorch extends FooBarBaz {
-    method foo { $self->mop::next::method . "-FOOBARBAZGORCH" }
+    method foo { $self->next::method . "-FOOBARBAZGORCH" }
 }
 
 my $foo = FooBarBazGorch->new;

diff --git a/t/200-meta/010-extension.t b/t/200-meta/010-extension.t
@@ -28,7 +28,7 @@ class ClassAccessorMeta extends mop::class {
             );
         }
 
-        $self->mop::next::method;
+        $self->next::method;
     }
 }
 

diff --git a/t/200-meta/011-more-extensions.t b/t/200-meta/011-more-extensions.t
@@ -40,7 +40,7 @@ class ValidatedAccessorMeta extends mop::class {
             );
         }
 
-        $self->mop::next::method;
+        $self->next::method;
     }
 }
 

diff --git a/t/ext/Test-BuilderX/Test/BuilderX/Test.pm b/t/ext/Test-BuilderX/Test/BuilderX/Test.pm
@@ -68,7 +68,7 @@ class WithReason extends Test::BuilderX::Test::Base {
     has $reason is ro;
 
     method status {
-        my $status = $self->mop::next::method;
+        my $status = $self->next::method;
         $status->{'reason'} = $reason;
         $status;
     }
@@ -81,7 +81,7 @@ class Skip extends Test::BuilderX::Test::WithReason {
     }
 
     method status {
-        my $status = $self->mop::next::method;
+        my $status = $self->next::method;
         $status->{'skip'} = 1;
         $status;
     }
@@ -96,7 +96,7 @@ class TODO extends Test::BuilderX::Test::WithReason {
     }
 
     method status {
-        my $status = $self->mop::next::method;
+        my $status = $self->next::method;
         $status->{'TODO'}          = 1;
         $status->{'passed'}        = 1;
         $status->{'really_passed'} = $self->passed;