Merge pull request #117 from k-tsj/toplevel-return

Raise LocalJumpError when returning from top-level

Merge pull request #117 from k-tsj/toplevel-return
Raise LocalJumpError when returning from top-level
96819cf8 · Yukihiro "Matz" Matsumoto · 04f8ec75 · 66df0ad0 · 96819cf8
Commit 96819cf8 authored May 12, 2012 by Yukihiro "Matz" Matsumoto
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

src/vm.c src/vm.c +4 -0

No files found.
--- a/src/vm.c
+++ b/src/vm.c
@@ -1002,6 +1002,10 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)

        switch (GETARG_B(i)) {
        case OP_R_NORMAL:
+          if (ci == mrb->cibase) {
+            localjump_error(mrb, "return");
+            goto L_RAISE;
+          }
          ci = mrb->ci;
          break;
        case OP_R_BREAK: