From 953eec60dbdffbce44f7254a2345347bf9736fee Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Thu, 25 Apr 2013 08:00:48 +0900 Subject: rename MRB_ARGS_XXX to MRB_ASPEC_XXX; ref #1206 --- include/mruby/proc.h | 14 +++++++------- src/proc.c | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/mruby/proc.h b/include/mruby/proc.h index 4f1b6509f..2d663afef 100644 --- a/include/mruby/proc.h +++ b/include/mruby/proc.h @@ -31,13 +31,13 @@ struct RProc { }; /* aspec access */ -#define MRB_ARGS_REQ(a) (((a) >> 19) & 0x1f) -#define MRB_ARGS_OPT(a) (((a) >> 14) & 0x1f) -#define MRB_ARGS_REST(a) ((a) & (1<<13)) -#define MRB_ARGS_POST(a) (((a) >> 8) & 0x1f) -#define MRB_ARGS_KEY(a) (((a) >> 3) & 0x1f)) -#define MRB_ARGS_KDICT(a) ((a) & (1<<2)) -#define MRB_ARGS_BLOCK(a) ((a) & (1<<1)) +#define MRB_ASPEC_REQ(a) (((a) >> 19) & 0x1f) +#define MRB_ASPEC_OPT(a) (((a) >> 14) & 0x1f) +#define MRB_ASPEC_REST(a) ((a) & (1<<13)) +#define MRB_ASPEC_POST(a) (((a) >> 8) & 0x1f) +#define MRB_ASPEC_KEY(a) (((a) >> 3) & 0x1f)) +#define MRB_ASPEC_KDICT(a) ((a) & (1<<2)) +#define MRB_ASPEC_BLOCK(a) ((a) & (1<<1)) #define MRB_PROC_CFUNC 128 #define MRB_PROC_CFUNC_P(p) ((p)->flags & MRB_PROC_CFUNC) diff --git a/src/proc.c b/src/proc.c index 69a2d4449..f0f3bccc7 100644 --- a/src/proc.c +++ b/src/proc.c @@ -140,9 +140,9 @@ mrb_proc_arity(mrb_state *mrb, mrb_value self) mrb_aspec aspec = *iseq >> 6; int ma, ra, pa, arity; - ma = MRB_ARGS_REQ(aspec); - ra = MRB_ARGS_REST(aspec); - pa = MRB_ARGS_POST(aspec); + ma = MRB_ASPEC_REQ(aspec); + ra = MRB_ASPEC_REST(aspec); + pa = MRB_ASPEC_POST(aspec); arity = ra ? -(ma + pa + 1) : ma + pa; return mrb_fixnum_value(arity); -- cgit v1.2.3