Merge branch 'master' of github.com:mruby/mruby

9dab0222 · Yukihiro "Matz" Matsumoto · 000fae41 · 8548aebc · 9dab0222
Commit 9dab0222 authored Jun 25, 2014 by Yukihiro "Matz" Matsumoto
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

src/proc.c src/proc.c +6 -0

No files found.
--- a/src/proc.c
+++ b/src/proc.c
@@ -156,6 +156,12 @@ mrb_proc_arity(mrb_state *mrb, mrb_value self)
    // TODO cfunc aspec not implemented yet
    return mrb_fixnum_value(-1);
  }
+  // arity is depend on OP_ENTER
+  if (GET_OPCODE(*iseq) != OP_ENTER) {
+    return mrb_fixnum_value(0);
+  }
  aspec = GETARG_Ax(*iseq);
  ma = MRB_ASPEC_REQ(aspec);
  ra = MRB_ASPEC_REST(aspec);