From 4552f747159ad3ead5827bd17c006784163a38f2 Mon Sep 17 00:00:00 2001 From: ko1 Date: Thu, 26 Oct 2017 11:02:13 +0000 Subject: 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 --- load.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'load.c') diff --git a/load.c b/load.c index 04882b9d1f..db09c3384e 100644 --- a/load.c +++ b/load.c @@ -599,7 +599,7 @@ rb_load_internal0(rb_thread_t *th, VALUE fname, int wrap) rb_extend_object(th->top_self, th->top_wrapper); } - TH_PUSH_TAG(th); + EC_PUSH_TAG(th->ec); state = EXEC_TAG(); if (state == TAG_NONE) { NODE *node; @@ -617,7 +617,7 @@ rb_load_internal0(rb_thread_t *th, VALUE fname, int wrap) } rb_iseq_eval(iseq); } - TH_POP_TAG(); + EC_POP_TAG(); #if !defined __GNUC__ th = th0; @@ -649,7 +649,7 @@ rb_load_internal(VALUE fname, int wrap) int state = rb_load_internal0(curr_th, fname, wrap); if (state) { if (state == TAG_RAISE) rb_exc_raise(curr_th->ec->errinfo); - TH_JUMP_TAG(curr_th, state); + EC_JUMP_TAG(curr_th->ec, state); } } @@ -975,7 +975,7 @@ rb_require_internal(VALUE fname, int safe) path = rb_str_encode_ospath(fname); RUBY_DTRACE_HOOK(REQUIRE_ENTRY, RSTRING_PTR(fname)); - TH_PUSH_TAG(th); + EC_PUSH_TAG(th->ec); saved.safe = rb_safe_level(); if ((state = EXEC_TAG()) == TAG_NONE) { long handle; @@ -1014,7 +1014,7 @@ rb_require_internal(VALUE fname, int safe) } } } - TH_POP_TAG(); + EC_POP_TAG(); load_unlock(ftptr, !state); rb_set_safe_level_force(saved.safe); -- cgit v1.2.3