summaryrefslogtreecommitdiff
path: root/load.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-06 03:16:08 (GMT)
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-06 03:16:08 (GMT)
commit0e34638f792ef908e59590266ed9edac5ce411f1 (patch)
tree20d1f0817d2c4a93d600d08aa37bb8235136bec8 /load.c
parentc1bd83cef742b7ff68d02cc490d018c6ac4d8c13 (diff)
remove `PUSH_TAG`/`EXEC_AG`/`POP_TAG`/`JUMO_TAG`.
* eval_intern.h: remove non-`EC_` prefix *_TAG() macros. Use `EC_` prefix macros explicitly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61040 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'load.c')
-rw-r--r--load.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/load.c b/load.c
index 9272bdb..cfc8b1f 100644
--- a/load.c
+++ b/load.c
@@ -592,7 +592,7 @@ rb_load_internal0(rb_execution_context_t *ec, VALUE fname, int wrap)
}
EC_PUSH_TAG(th->ec);
- state = EXEC_TAG();
+ state = EC_EXEC_TAG();
if (state == TAG_NONE) {
rb_ast_t *ast;
const rb_iseq_t *iseq;
@@ -666,11 +666,11 @@ rb_load_protect(VALUE fname, int wrap, int *pstate)
enum ruby_tag_type state;
volatile VALUE path = 0;
- PUSH_TAG();
- if ((state = EXEC_TAG()) == TAG_NONE) {
+ EC_PUSH_TAG(GET_EC());
+ if ((state = EC_EXEC_TAG()) == TAG_NONE) {
path = file_to_load(fname);
}
- POP_TAG();
+ EC_POP_TAG();
if (state == TAG_NONE) state = rb_load_internal0(GET_EC(), path, wrap);
if (state != TAG_NONE) *pstate = state;
@@ -970,7 +970,7 @@ rb_require_internal(VALUE fname, int safe)
EC_PUSH_TAG(ec);
saved.safe = rb_safe_level();
- if ((state = EXEC_TAG()) == TAG_NONE) {
+ if ((state = EC_EXEC_TAG()) == TAG_NONE) {
long handle;
int found;
@@ -1041,7 +1041,7 @@ rb_require_safe(VALUE fname, int safe)
if (result > TAG_RETURN) {
if (result == TAG_RAISE) rb_exc_raise(rb_errinfo());
- JUMP_TAG(result);
+ EC_JUMP_TAG(GET_EC(), result);
}
if (result < 0) {
load_failed(fname);