diff options
| author | Jared Breeden <[email protected]> | 2015-06-22 23:20:24 -0700 |
|---|---|---|
| committer | Jared Breeden <[email protected]> | 2015-06-22 23:20:24 -0700 |
| commit | 18337266f838003d631d2c02e6d847ae5375a839 (patch) | |
| tree | ccf038939213da30b99ba8931d87bc0d719dbc8a /src/proc.c | |
| parent | 9781580c7134fcee7bf5a6d4356bc47593549da8 (diff) | |
| parent | 1001be2e99720f6745159295aa73c649e08adec8 (diff) | |
| download | mruby-18337266f838003d631d2c02e6d847ae5375a839.tar.gz mruby-18337266f838003d631d2c02e6d847ae5375a839.zip | |
Merge branch 'master' of http://github.com/mruby/mruby into alloc_doc
Diffstat (limited to 'src/proc.c')
| -rw-r--r-- | src/proc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/proc.c b/src/proc.c index 4cb9ffe18..f98998f68 100644 --- a/src/proc.c +++ b/src/proc.c @@ -200,7 +200,7 @@ mrb_proc_arity(mrb_state *mrb, mrb_value self) struct RProc *p = mrb_proc_ptr(self); mrb_code *iseq = mrb_proc_iseq(mrb, p); mrb_aspec aspec; - int ma, ra, pa, arity; + int ma, op, ra, pa, arity; if (MRB_PROC_CFUNC_P(p)) { /* TODO cfunc aspec not implemented yet */ @@ -214,9 +214,10 @@ mrb_proc_arity(mrb_state *mrb, mrb_value self) aspec = GETARG_Ax(*iseq); ma = MRB_ASPEC_REQ(aspec); + op = MRB_ASPEC_OPT(aspec); ra = MRB_ASPEC_REST(aspec); pa = MRB_ASPEC_POST(aspec); - arity = ra ? -(ma + pa + 1) : ma + pa; + arity = ra || (MRB_PROC_STRICT_P(p) && op) ? -(ma + pa + 1) : ma + pa; return mrb_fixnum_value(arity); } |