diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-03 00:28:12 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-03 00:28:12 +0000 |
commit | 0cd7f5fe87fb2d047a5423cd24c24f9fea530502 (patch) | |
tree | a016e1c7a87c63f63b0cd5bacba5935f6956282f /vm.c | |
parent | 1cc78637e3435eeb6cd26a6ebbb4e164d18cf0e1 (diff) | |
download | ruby-0cd7f5fe87fb2d047a5423cd24c24f9fea530502.tar.gz |
* vm_core.h: rename macros and make them inline functions.
* rename VM_FRAME_TYPE_FINISH_P() to VM_FRAME_FINISHED_P().
* rename VM_FRAME_TYPE_BMETHOD_P() to VM_FRAME_BMETHOD_P().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55803 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1595,7 +1595,7 @@ hook_before_rewind(rb_thread_t *th, rb_control_frame_t *cfp, int will_finish_vm_ break; case VM_FRAME_MAGIC_BLOCK: case VM_FRAME_MAGIC_LAMBDA: - if (VM_FRAME_TYPE_BMETHOD_P(th->cfp)) { + if (VM_FRAME_BMETHOD_P(th->cfp)) { EXEC_EVENT_HOOK(th, RUBY_EVENT_B_RETURN, th->cfp->self, 0, 0, Qnil); if (!will_finish_vm_exec) { @@ -1751,7 +1751,7 @@ vm_exec(rb_thread_t *th) if (cfp == escape_cfp) { if (state == TAG_RETURN) { - if (!VM_FRAME_TYPE_FINISH_P(cfp)) { + if (!VM_FRAME_FINISHED_P(cfp)) { THROW_DATA_CATCH_FRAME_SET(err, cfp + 1); THROW_DATA_STATE_SET(err, state = TAG_BREAK); } @@ -1916,7 +1916,7 @@ vm_exec(rb_thread_t *th) /* skip frame */ hook_before_rewind(th, th->cfp, FALSE); - if (VM_FRAME_TYPE_FINISH_P(th->cfp)) { + if (VM_FRAME_FINISHED_P(th->cfp)) { rb_vm_pop_frame(th); th->errinfo = (VALUE)err; TH_TMPPOP_TAG(); |