diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2018-08-28 22:13:52 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2018-08-28 22:13:52 +0900 |
| commit | 93bab387a71841fabe31ae3e0301417da543cbf8 (patch) | |
| tree | 591f23d1411380b090b6cedeeeda99a4151dae8d /src/proc.c | |
| parent | fe77272c25f3b6d91506a51d0621275074542890 (diff) | |
| parent | 471288f37d18e640f98029fabcdcb7ee16b95d93 (diff) | |
| download | mruby-93bab387a71841fabe31ae3e0301417da543cbf8.tar.gz mruby-93bab387a71841fabe31ae3e0301417da543cbf8.zip | |
Merge branch 'mruby2-draft'
Diffstat (limited to 'src/proc.c')
| -rw-r--r-- | src/proc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/proc.c b/src/proc.c index c6e9be433..05b897480 100644 --- a/src/proc.c +++ b/src/proc.c @@ -10,7 +10,7 @@ #include <mruby/opcode.h> static mrb_code call_iseq[] = { - MKOP_A(OP_CALL, 0), + OP_CALL, }; struct RProc* @@ -223,7 +223,7 @@ mrb_proc_arity(mrb_state *mrb, mrb_value self) { struct RProc *p = mrb_proc_ptr(self); struct mrb_irep *irep; - mrb_code *iseq; + mrb_code *pc; mrb_aspec aspec; int ma, op, ra, pa, arity; @@ -237,13 +237,13 @@ mrb_proc_arity(mrb_state *mrb, mrb_value self) return mrb_fixnum_value(0); } - iseq = irep->iseq; + pc = irep->iseq; /* arity is depend on OP_ENTER */ - if (GET_OPCODE(*iseq) != OP_ENTER) { + if (*pc != OP_ENTER) { return mrb_fixnum_value(0); } - aspec = GETARG_Ax(*iseq); + aspec = PEEK_W(pc+1); ma = MRB_ASPEC_REQ(aspec); op = MRB_ASPEC_OPT(aspec); ra = MRB_ASPEC_REST(aspec); |