Implement callerlex throwing mode.

Skips the current routine (and then any thunks) before looking for a lexical handler. Which is precisely what Perl 6 returns need.
MoarVM · Jun 2, 2016 · 018a4ee · 018a4ee
1 parent 882c50d
commit 018a4ee
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/core/exceptions.c b/src/core/exceptions.c
@@ -145,6 +145,12 @@ static LocatedHandler search_for_handler_from(MVMThreadContext *tc, MVMFrame *f,
         }
     }
     else {
+        if (mode == MVM_EX_THROW_LEX_CALLER) {
+            f = f->caller;
+            while (f && f->static_info->body.is_thunk)
+                f = f->caller;
+            mode = MVM_EX_THROW_LEX;
+        }
         while (f != NULL) {
             if (search_frame_handlers(tc, f, cat, payload, &lh)) {
                 lh.frame = f;