Make 'samewith' also work on subs, masak++

This fixes #125539
rakudo · Jul 5, 2015 · f098e0f · f098e0f
1 parent 37b5793
commit f098e0f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/core/control.pm b/src/core/control.pm
@@ -140,12 +140,12 @@ my &lastcall := -> {
 };
 
 sub samewith(|c) {
-    my $my   = callframe(1).my;
-    my $self = $my<self>;
-    die "Could not find 'self'" if !$self.DEFINITE;
-    my $dispatcher = $my<&?ROUTINE>.dispatcher
-      || die "Could not find dispatcher";
-    $dispatcher( $self, |c );
+    my $my         := callframe(1).my;
+    my $caller     := $my<&?ROUTINE>;
+    my $dispatcher := $caller.dispatcher || die "Could not find dispatcher";
+    nqp::istype($caller,Method)
+      ?? $dispatcher($my<self> // $caller.package, |c)
+      !! $dispatcher(|c);
 }
 
 proto sub die(|) {*};