summaryrefslogtreecommitdiffhomepage
path: root/src/class.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2019-09-25 21:46:26 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2019-09-25 23:52:00 +0900
commita365f9a67d4bf082ee9a414fe247bd18148d7081 (patch)
tree83a9b4aaf39757b26093eb09951785d447893eda /src/class.c
parent3c1a2612e739a73c4c1be090aecfcbd2e9c0a7f8 (diff)
downloadmruby-a365f9a67d4bf082ee9a414fe247bd18148d7081.tar.gz
mruby-a365f9a67d4bf082ee9a414fe247bd18148d7081.zip
Rename symbol-to-string functions; close #4684
* mrb_sym2name -> mrb_sym_name * mrb_sym2name_len -> mrb_sym_name_len * mrb_sym2str -> mrb_sym_str
Diffstat (limited to 'src/class.c')
-rw-r--r--src/class.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/class.c b/src/class.c
index 1b0a37d05..adb8954cc 100644
--- a/src/class.c
+++ b/src/class.c
@@ -73,7 +73,7 @@ mrb_class_name_class(mrb_state *mrb, struct RClass *outer, struct RClass *c, mrb
return;
}
mrb_str_cat_cstr(mrb, name, "::");
- mrb_str_cat_cstr(mrb, name, mrb_sym2name(mrb, id));
+ mrb_str_cat_cstr(mrb, name, mrb_sym_name(mrb, id));
}
mrb_obj_iv_set_force(mrb, (struct RObject*)c, nsym, name);
}
@@ -1333,7 +1333,7 @@ prepare_name_common(mrb_state *mrb, mrb_sym sym, const char *prefix, const char
{
char onstack[ONSTACK_ALLOC_MAX];
mrb_int sym_len;
- const char *sym_str = mrb_sym2name_len(mrb, sym, &sym_len);
+ const char *sym_str = mrb_sym_name_len(mrb, sym, &sym_len);
size_t prefix_len = prefix ? strlen(prefix) : 0;
size_t suffix_len = suffix ? strlen(suffix) : 0;
size_t name_len = sym_len + prefix_len + suffix_len;
@@ -1633,7 +1633,7 @@ mrb_class_path(mrb_state *mrb, struct RClass *c)
}
else if (mrb_symbol_p(path)) {
/* toplevel class/module */
- return mrb_sym2str(mrb, mrb_symbol(path));
+ return mrb_sym_str(mrb, mrb_symbol(path));
}
return mrb_str_dup(mrb, path);
}
@@ -1866,7 +1866,7 @@ static void
check_const_name_sym(mrb_state *mrb, mrb_sym id)
{
mrb_int len;
- const char *name = mrb_sym2name_len(mrb, id, &len);
+ const char *name = mrb_sym_name_len(mrb, id, &len);
if (!mrb_const_name_p(mrb, name, len)) {
mrb_name_error(mrb, id, "wrong constant name %n", id);
}