aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-23 07:05:06 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-23 07:05:06 +0000
commit31929bab1fd7d13b37f74ae27de1711c2ea1681c (patch)
tree48995aca3a3e56433d92a821a3b524e44152e233
parent4f3217e326c293d5162fb200cc7334e15c3872c5 (diff)
downloadruby-31929bab1fd7d13b37f74ae27de1711c2ea1681c.tar.gz
error.c: predefined IDs
* error.c (id_bt, id_bt_locations): use IDs predefined in id.h. * vm_args.c (raise_argument_error): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49697 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--error.c6
-rw-r--r--vm_args.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/error.c b/error.c
index da0355a75b..61ba07c5b4 100644
--- a/error.c
+++ b/error.c
@@ -645,8 +645,10 @@ VALUE rb_eSystemCallError;
VALUE rb_mErrno;
static VALUE rb_eNOERROR;
-static ID id_new, id_bt, id_bt_locations, id_cause, id_message, id_backtrace;
+static ID id_new, id_cause, id_message, id_backtrace;
static ID id_status, id_name, id_args, id_Errno, id_errno, id_i_path;
+#define id_bt idBt
+#define id_bt_locations idBt_locations
#define id_mesg idMesg
#undef rb_exc_new_cstr
@@ -1908,8 +1910,6 @@ Init_Exception(void)
rb_define_global_function("warn", rb_warn_m, -1);
id_new = rb_intern_const("new");
- id_bt = rb_intern_const("bt");
- id_bt_locations = rb_intern_const("bt_locations");
id_cause = rb_intern_const("cause");
id_message = rb_intern_const("message");
id_backtrace = rb_intern_const("backtrace");
diff --git a/vm_args.c b/vm_args.c
index 446ad482c4..9e6fb9b990 100644
--- a/vm_args.c
+++ b/vm_args.c
@@ -682,7 +682,7 @@ raise_argument_error(rb_thread_t *th, const rb_iseq_t *iseq, const VALUE exc)
at = rb_vm_backtrace_object();
}
- rb_iv_set(exc, "bt_locations", at);
+ rb_ivar_set(exc, idBt_locations, at);
rb_funcall(exc, rb_intern("set_backtrace"), 1, at);
rb_exc_raise(exc);
}