diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-26 11:02:13 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-26 11:02:13 +0000 |
commit | 4552f747159ad3ead5827bd17c006784163a38f2 (patch) | |
tree | 5ef3be1e07b3f194f6d226fd2f8c56d37b5d3256 /vm_eval.c | |
parent | 24044b2f6311f4cef41e7509018823c2dfd26577 (diff) |
introduce EC_*_TAG() instead of TH_*_TAG()
* eval_intern.h:
introduce EC_*_TAG() macros instead of TH_*_TAG() macros.
* TH_PUSH_TAG() -> EC_PUSH_TAG()
* TH_POP_TAG() -> EC_POP_TAG()
* TH_TMPPOP_TAG() -> EC_TMPPOP_TAG()
* TH_REPUSH_TAG() -> EC_REPUSH_TAG()
* TH_EXEC_TAG() -> EC_EXEC_TAG()
* TH_JUMP_TAG() -> EC_JUMP_TAG()
rb_threadptr_tag_state() , rb_ec_tag_jump() also accept `ec` instead of `th`.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60450 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_eval.c')
-rw-r--r-- | vm_eval.c | 36 |
1 files changed, 18 insertions, 18 deletions
@@ -1114,8 +1114,8 @@ rb_iterate0(VALUE (* it_proc) (VALUE), VALUE data1, volatile VALUE retval = Qnil; rb_control_frame_t *const cfp = th->ec->cfp; - TH_PUSH_TAG(th); - state = TH_EXEC_TAG(); + EC_PUSH_TAG(th->ec); + state = EC_EXEC_TAG(); if (state == 0) { iter_retry: { @@ -1151,10 +1151,10 @@ rb_iterate0(VALUE (* it_proc) (VALUE), VALUE data1, SDR(); fprintf(stderr, "%p, %p\n", cfp, escape_cfp); } } - TH_POP_TAG(); + EC_POP_TAG(); if (state) { - TH_JUMP_TAG(th, state); + EC_JUMP_TAG(th->ec, state); } return retval; } @@ -1349,17 +1349,17 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, rb_cref_t *const cref_ return vm_exec(th); } - TH_PUSH_TAG(th); - if ((state = TH_EXEC_TAG()) == TAG_NONE) { + EC_PUSH_TAG(th->ec); + if ((state = EC_EXEC_TAG()) == TAG_NONE) { result = vm_exec(th); } - TH_POP_TAG(); + EC_POP_TAG(); if (state) { if (state == TAG_RAISE) { adjust_backtrace_in_eval(th, th->ec->errinfo); } - TH_JUMP_TAG(th, state); + EC_JUMP_TAG(th->ec, state); } return result; } @@ -1505,7 +1505,7 @@ rb_eval_string_wrap(const char *str, int *pstate) *pstate = state; } else if (state != TAG_NONE) { - TH_JUMP_TAG(th, state); + EC_JUMP_TAG(th->ec, state); } return val; } @@ -1522,9 +1522,9 @@ rb_eval_cmd(VALUE cmd, VALUE arg, int level) level = RUBY_SAFE_LEVEL_MAX; } - TH_PUSH_TAG(th); + EC_PUSH_TAG(th->ec); rb_set_safe_level_force(level); - if ((state = TH_EXEC_TAG()) == TAG_NONE) { + if ((state = EC_EXEC_TAG()) == TAG_NONE) { if (!RB_TYPE_P(cmd, T_STRING)) { val = rb_funcallv(cmd, idCall, RARRAY_LENINT(arg), RARRAY_CONST_PTR(arg)); @@ -1533,10 +1533,10 @@ rb_eval_cmd(VALUE cmd, VALUE arg, int level) val = eval_string(rb_vm_top_self(), cmd, Qnil, 0, 0); } } - TH_POP_TAG(); + EC_POP_TAG(); rb_set_safe_level_force(safe); - if (state) TH_JUMP_TAG(th, state); + if (state) EC_JUMP_TAG(th->ec, state); return val; } @@ -1893,7 +1893,7 @@ rb_throw_obj(VALUE tag, VALUE value) } th->ec->errinfo = (VALUE)THROW_DATA_NEW(tag, NULL, TAG_THROW); - TH_JUMP_TAG(th, TAG_THROW); + EC_JUMP_TAG(th->ec, TAG_THROW); } void @@ -1988,11 +1988,11 @@ vm_catch_protect(VALUE tag, rb_block_call_func *func, VALUE data, VALUE val = Qnil; /* OK */ rb_control_frame_t *volatile saved_cfp = th->ec->cfp; - TH_PUSH_TAG(th); + EC_PUSH_TAG(th->ec); _tag.tag = tag; - if ((state = TH_EXEC_TAG()) == TAG_NONE) { + if ((state = EC_EXEC_TAG()) == TAG_NONE) { /* call with argc=1, argv = [tag], block = Qnil to insure compatibility */ val = (*func)(tag, data, 1, (const VALUE *)&tag, Qnil); } @@ -2002,7 +2002,7 @@ vm_catch_protect(VALUE tag, rb_block_call_func *func, VALUE data, th->ec->errinfo = Qnil; state = 0; } - TH_POP_TAG(); + EC_POP_TAG(); if (stateptr) *stateptr = state; @@ -2021,7 +2021,7 @@ rb_catch_obj(VALUE t, VALUE (*func)(), VALUE data) enum ruby_tag_type state; rb_thread_t *th = GET_THREAD(); VALUE val = vm_catch_protect(t, (rb_block_call_func *)func, data, &state, th); - if (state) TH_JUMP_TAG(th, state); + if (state) EC_JUMP_TAG(th->ec, state); return val; } |