summaryrefslogtreecommitdiffhomepage
path: root/src/symbol.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/symbol.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/symbol.c')
-rw-r--r--src/symbol.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/symbol.c b/src/symbol.c
index aad250f09..6ff1e54da 100644
--- a/src/symbol.c
+++ b/src/symbol.c
@@ -266,7 +266,7 @@ sym2name_len(mrb_state *mrb, mrb_sym sym, char *buf, mrb_int *lenp)
}
MRB_API const char*
-mrb_sym2name_len(mrb_state *mrb, mrb_sym sym, mrb_int *lenp)
+mrb_sym_name_len(mrb_state *mrb, mrb_sym sym, mrb_int *lenp)
{
return sym2name_len(mrb, sym, mrb->symbuf, lenp);
}
@@ -336,7 +336,7 @@ mrb_init_symtbl(mrb_state *mrb)
static mrb_value
sym_to_s(mrb_state *mrb, mrb_value sym)
{
- return mrb_sym2str(mrb, mrb_symbol(sym));
+ return mrb_sym_str(mrb, mrb_symbol(sym));
}
/* 15.2.11.3.4 */
@@ -491,7 +491,7 @@ sym_inspect(mrb_state *mrb, mrb_value sym)
mrb_sym id = mrb_symbol(sym);
char *sp;
- name = mrb_sym2name_len(mrb, id, &len);
+ name = mrb_sym_name_len(mrb, id, &len);
str = mrb_str_new(mrb, 0, len+1);
sp = RSTRING_PTR(str);
sp[0] = ':';
@@ -510,10 +510,10 @@ sym_inspect(mrb_state *mrb, mrb_value sym)
}
MRB_API mrb_value
-mrb_sym2str(mrb_state *mrb, mrb_sym sym)
+mrb_sym_str(mrb_state *mrb, mrb_sym sym)
{
mrb_int len;
- const char *name = mrb_sym2name_len(mrb, sym, &len);
+ const char *name = mrb_sym_name_len(mrb, sym, &len);
if (!name) return mrb_undef_value(); /* can't happen */
if (SYMBOL_INLINE_P(sym)) {
@@ -525,13 +525,13 @@ mrb_sym2str(mrb_state *mrb, mrb_sym sym)
}
MRB_API const char*
-mrb_sym2name(mrb_state *mrb, mrb_sym sym)
+mrb_sym_name(mrb_state *mrb, mrb_sym sym)
{
mrb_int len;
- const char *name = mrb_sym2name_len(mrb, sym, &len);
+ const char *name = mrb_sym_name_len(mrb, sym, &len);
if (!name) return NULL;
- if (symname_p(name) && strlen(name) == (size_t)len) {
+ if (strlen(name) == (size_t)len) {
return name;
}
else {