mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
error.c: use static IDs
* error.c: use rb_ivar_set with static IDs instead of rb_iv_set with strings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49694 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
9759173cfc
commit
8c13c9cb0e
1 changed files with 9 additions and 9 deletions
18
error.c
18
error.c
|
@ -647,6 +647,7 @@ static VALUE rb_eNOERROR;
|
||||||
|
|
||||||
static ID id_new, id_bt, id_bt_locations, id_cause, id_message, id_backtrace;
|
static ID id_new, id_bt, id_bt_locations, id_cause, id_message, id_backtrace;
|
||||||
static ID id_status, id_name, id_args, id_Errno, id_errno, id_i_path;
|
static ID id_status, id_name, id_args, id_Errno, id_errno, id_i_path;
|
||||||
|
#define id_mesg idMesg
|
||||||
|
|
||||||
#undef rb_exc_new_cstr
|
#undef rb_exc_new_cstr
|
||||||
|
|
||||||
|
@ -683,8 +684,8 @@ exc_initialize(int argc, VALUE *argv, VALUE exc)
|
||||||
VALUE arg;
|
VALUE arg;
|
||||||
|
|
||||||
rb_scan_args(argc, argv, "01", &arg);
|
rb_scan_args(argc, argv, "01", &arg);
|
||||||
rb_iv_set(exc, "mesg", arg);
|
rb_ivar_set(exc, id_mesg, arg);
|
||||||
rb_iv_set(exc, "bt", Qnil);
|
rb_ivar_set(exc, id_bt, Qnil);
|
||||||
|
|
||||||
return exc;
|
return exc;
|
||||||
}
|
}
|
||||||
|
@ -814,7 +815,7 @@ exc_backtrace(VALUE exc)
|
||||||
|
|
||||||
if (rb_backtrace_p(obj)) {
|
if (rb_backtrace_p(obj)) {
|
||||||
obj = rb_backtrace_to_str_ary(obj);
|
obj = rb_backtrace_to_str_ary(obj);
|
||||||
/* rb_iv_set(exc, "bt", obj); */
|
/* rb_ivar_set(exc, id_bt, obj); */
|
||||||
}
|
}
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
|
@ -877,7 +878,7 @@ rb_check_backtrace(VALUE bt)
|
||||||
static VALUE
|
static VALUE
|
||||||
exc_set_backtrace(VALUE exc, VALUE bt)
|
exc_set_backtrace(VALUE exc, VALUE bt)
|
||||||
{
|
{
|
||||||
return rb_iv_set(exc, "bt", rb_check_backtrace(bt));
|
return rb_ivar_set(exc, id_bt, rb_check_backtrace(bt));
|
||||||
}
|
}
|
||||||
|
|
||||||
VALUE
|
VALUE
|
||||||
|
@ -920,7 +921,6 @@ static VALUE
|
||||||
exc_equal(VALUE exc, VALUE obj)
|
exc_equal(VALUE exc, VALUE obj)
|
||||||
{
|
{
|
||||||
VALUE mesg, backtrace;
|
VALUE mesg, backtrace;
|
||||||
const ID id_mesg = idMesg;
|
|
||||||
|
|
||||||
if (exc == obj) return Qtrue;
|
if (exc == obj) return Qtrue;
|
||||||
|
|
||||||
|
@ -1000,7 +1000,7 @@ exit_initialize(int argc, VALUE *argv, VALUE exc)
|
||||||
status = INT2FIX(EXIT_SUCCESS);
|
status = INT2FIX(EXIT_SUCCESS);
|
||||||
}
|
}
|
||||||
rb_call_super(argc, argv);
|
rb_call_super(argc, argv);
|
||||||
rb_iv_set(exc, "status", status);
|
rb_ivar_set(exc, id_status, status);
|
||||||
return exc;
|
return exc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1087,7 +1087,7 @@ name_err_initialize(int argc, VALUE *argv, VALUE self)
|
||||||
|
|
||||||
name = (argc > 1) ? argv[--argc] : Qnil;
|
name = (argc > 1) ? argv[--argc] : Qnil;
|
||||||
rb_call_super(argc, argv);
|
rb_call_super(argc, argv);
|
||||||
rb_iv_set(self, "name", name);
|
rb_ivar_set(self, id_name, name);
|
||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1119,7 +1119,7 @@ nometh_err_initialize(int argc, VALUE *argv, VALUE self)
|
||||||
{
|
{
|
||||||
VALUE args = (argc > 2) ? argv[--argc] : Qnil;
|
VALUE args = (argc > 2) ? argv[--argc] : Qnil;
|
||||||
name_err_initialize(argc, argv, self);
|
name_err_initialize(argc, argv, self);
|
||||||
rb_iv_set(self, "args", args);
|
rb_ivar_set(self, id_args, args);
|
||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1407,7 +1407,7 @@ syserr_initialize(int argc, VALUE *argv, VALUE self)
|
||||||
mesg = errmsg;
|
mesg = errmsg;
|
||||||
|
|
||||||
rb_call_super(1, &mesg);
|
rb_call_super(1, &mesg);
|
||||||
rb_iv_set(self, "errno", error);
|
rb_ivar_set(self, id_errno, error);
|
||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue