aboutsummaryrefslogtreecommitdiffstats
path: root/error.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-23 05:32:30 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-23 05:32:30 +0000
commitaf07ace39c846e86e3fe0d251e59ba0f684d9953 (patch)
treeb96ccc46db261acb1ce3bed7fde7bfa099c1792b /error.c
parent5bbca2bdde5dad0e4e565db37aa89c877c75edc8 (diff)
downloadruby-af07ace39c846e86e3fe0d251e59ba0f684d9953.tar.gz
error.c: index numbers
* error.c (rb_name_err_mesg_new, name_err_mesg_to_str): name magic numbers of indexes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51001 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'error.c')
-rw-r--r--error.c21
1 files changed, 13 insertions, 8 deletions
diff --git a/error.c b/error.c
index 602ee401c7..b668375a55 100644
--- a/error.c
+++ b/error.c
@@ -1124,7 +1124,12 @@ nometh_err_initialize(int argc, VALUE *argv, VALUE self)
}
/* :nodoc: */
-#define NAME_ERR_MESG_COUNT 3
+enum {
+ NAME_ERR_MESG__MESG,
+ NAME_ERR_MESG__RECV,
+ NAME_ERR_MESG__NAME,
+ NAME_ERR_MESG_COUNT
+};
static void
name_err_mesg_mark(void *p)
@@ -1158,9 +1163,9 @@ rb_name_err_mesg_new(VALUE obj, VALUE mesg, VALUE recv, VALUE method)
VALUE result = TypedData_Wrap_Struct(rb_cNameErrorMesg, &name_err_mesg_data_type, 0);
VALUE *ptr = ALLOC_N(VALUE, NAME_ERR_MESG_COUNT);
- ptr[0] = mesg;
- ptr[1] = recv;
- ptr[2] = method;
+ ptr[NAME_ERR_MESG__MESG] = mesg;
+ ptr[NAME_ERR_MESG__RECV] = recv;
+ ptr[NAME_ERR_MESG__NAME] = method;
RTYPEDDATA_DATA(result) = ptr;
return result;
}
@@ -1192,14 +1197,14 @@ name_err_mesg_to_str(VALUE obj)
VALUE *ptr, mesg;
TypedData_Get_Struct(obj, VALUE, &name_err_mesg_data_type, ptr);
- mesg = ptr[0];
+ mesg = ptr[NAME_ERR_MESG__MESG];
if (NIL_P(mesg)) return Qnil;
else {
const char *desc = 0;
VALUE d = 0, args[NAME_ERR_MESG_COUNT];
int state = 0;
- obj = ptr[1];
+ obj = ptr[NAME_ERR_MESG__RECV];
switch (obj) {
case Qnil:
desc = "nil";
@@ -1226,7 +1231,7 @@ name_err_mesg_to_str(VALUE obj)
rb_str_append(d, rb_class_name(CLASS_OF(obj)));
}
args[0] = mesg;
- args[1] = ptr[2];
+ args[1] = ptr[NAME_ERR_MESG__NAME];
args[2] = d;
mesg = rb_f_sprintf(NAME_ERR_MESG_COUNT, args);
}
@@ -1260,7 +1265,7 @@ name_err_receiver(VALUE self)
VALUE *ptr, mesg = rb_attr_get(self, id_mesg);
TypedData_Get_Struct(mesg, VALUE, &name_err_mesg_data_type, ptr);
- return ptr[1];
+ return ptr[NAME_ERR_MESG__RECV];
}
/*