diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-15 17:22:57 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-15 17:22:57 +0000 |
| commit | a91e91c537bf77afc49c2aef4b65d91237cbd786 (patch) | |
| tree | 47dd3ca2f41807c32ddc59aaf4ccc0bea2444a4a /vm_insnhelper.c | |
| parent | b188d42b2d05f1746f1a9c7de46feb0529f3dc42 (diff) | |
| download | ruby-a91e91c537bf77afc49c2aef4b65d91237cbd786.tar.gz | |
* vm_core.h (VM_CALL_*): rename VM_CALL_*_BIT
to VM_CALL_* (remove `_BIT' suffix).
Add comments on each macros.
Remove unused macro VM_CALL_TAILRECURSION_BIT.
* compile.c, iseq.c, insns.def, vm_insnhelper.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37196 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 3a7eae8624..c3bb69b274 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1013,7 +1013,7 @@ vm_base_ptr(rb_control_frame_t *cfp) static void vm_caller_setup_args(const rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci) { - if (UNLIKELY(ci->flag & VM_CALL_ARGS_BLOCKARG_BIT)) { + if (UNLIKELY(ci->flag & VM_CALL_ARGS_BLOCKARG)) { rb_proc_t *po; VALUE proc; @@ -1042,7 +1042,7 @@ vm_caller_setup_args(const rb_thread_t *th, rb_control_frame_t *cfp, rb_call_inf /* expand top of stack? */ - if (UNLIKELY(ci->flag & VM_CALL_ARGS_SPLAT_BIT)) { + if (UNLIKELY(ci->flag & VM_CALL_ARGS_SPLAT)) { VALUE ary = *(cfp->sp - 1); VALUE *ptr; int i; @@ -1206,7 +1206,7 @@ vm_call_iseq_setup_2(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *c /* stack overflow check */ CHECK_STACK_OVERFLOW(cfp, iseq->stack_max); - if (LIKELY(!(ci->flag & VM_CALL_TAILCALL_BIT))) { + if (LIKELY(!(ci->flag & VM_CALL_TAILCALL))) { VALUE *sp = argv + iseq->arg_size; /* clear local variables */ @@ -1443,7 +1443,7 @@ vm_call_opt_send(rb_thread_t *th, rb_control_frame_t *reg_cfp, rb_call_info_t *c ci->argc -= 1; DEC_SP(1); - ci->flag |= VM_CALL_FCALL_BIT | VM_CALL_OPT_SEND_BIT; + ci->flag |= VM_CALL_FCALL | VM_CALL_OPT_SEND; return vm_call_method(th, reg_cfp, ci); } @@ -1567,15 +1567,15 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci) } else { int noex_safe; - if (!(ci->flag & VM_CALL_FCALL_BIT) && (ci->me->flag & NOEX_MASK) & NOEX_PRIVATE) { + if (!(ci->flag & VM_CALL_FCALL) && (ci->me->flag & NOEX_MASK) & NOEX_PRIVATE) { int stat = NOEX_PRIVATE; - if (ci->flag & VM_CALL_VCALL_BIT) { + if (ci->flag & VM_CALL_VCALL) { stat |= NOEX_VCALL; } val = vm_method_missing(th, cfp, ci, stat); } - else if (!(ci->flag & VM_CALL_OPT_SEND_BIT) && (ci->me->flag & NOEX_MASK) & NOEX_PROTECTED) { + else if (!(ci->flag & VM_CALL_OPT_SEND) && (ci->me->flag & NOEX_MASK) & NOEX_PROTECTED) { if (!rb_obj_is_kind_of(cfp->self, ci->defined_class)) { val = vm_method_missing(th, cfp, ci, NOEX_PROTECTED); } @@ -1594,10 +1594,10 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci) else { /* method missing */ int stat = 0; - if (ci->flag & VM_CALL_VCALL_BIT) { + if (ci->flag & VM_CALL_VCALL) { stat |= NOEX_VCALL; } - if (ci->flag & VM_CALL_SUPER_BIT) { + if (ci->flag & VM_CALL_SUPER) { stat |= NOEX_SUPER; } if (ci->mid == idMethodMissing) { |