diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/class.c | 8 | ||||
| -rw-r--r-- | src/kernel.c | 2 | ||||
| -rw-r--r-- | src/symbol.c | 18 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/class.c b/src/class.c index 5d22dbbc4..983b22a24 100644 --- a/src/class.c +++ b/src/class.c @@ -206,7 +206,7 @@ mrb_vm_define_class(mrb_state *mrb, mrb_value outer, mrb_value super, mrb_sym id int mrb_class_defined(mrb_state *mrb, const char *name) { - mrb_value sym = mrb_cstr_interned(mrb, name); + mrb_value sym = mrb_check_intern_cstr(mrb, name); if (mrb_nil_p(sym)) { return FALSE; } @@ -1532,7 +1532,7 @@ mrb_mod_cvar_defined(mrb_state *mrb, mrb_value mod) } else { mrb_value sym; check_cv_name_str(mrb, id); - sym = mrb_str_interned(mrb, id); + sym = mrb_check_intern_str(mrb, id); if (mrb_nil_p(sym)) { defined_p = FALSE; } else { @@ -1681,7 +1681,7 @@ mrb_mod_method_defined(mrb_state *mrb, mrb_value mod) if (mrb_symbol_p(id)) { method_defined_p = mrb_obj_respond_to(mrb_class_ptr(mod), mrb_symbol(id)); } else { - mrb_value sym = mrb_str_interned(mrb, id); + mrb_value sym = mrb_check_intern_str(mrb, id); if (mrb_nil_p(sym)) { method_defined_p = FALSE; } else { @@ -1766,7 +1766,7 @@ mrb_mod_const_defined(mrb_state *mrb, mrb_value mod) } else { mrb_value sym; check_const_name_str(mrb, id); - sym = mrb_str_interned(mrb, id); + sym = mrb_check_intern_str(mrb, id); if (mrb_nil_p(sym)) { const_defined_p = FALSE; } else { diff --git a/src/kernel.c b/src/kernel.c index 637a7b952..8d266862a 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -984,7 +984,7 @@ obj_respond_to(mrb_state *mrb, mrb_value self) mrb_raisef(mrb, E_TYPE_ERROR, "%S is not a symbol", tmp); } } - tmp = mrb_str_interned(mrb, mid); + tmp = mrb_check_intern_str(mrb, mid); if (mrb_nil_p(tmp)) { respond_to_p = FALSE; } else { diff --git a/src/symbol.c b/src/symbol.c index 1633a3c65..24db3a4b6 100644 --- a/src/symbol.c +++ b/src/symbol.c @@ -73,13 +73,7 @@ mrb_intern_str(mrb_state *mrb, mrb_value str) } mrb_value -mrb_cstr_interned(mrb_state *mrb, const char *name) -{ - return mrb_interned(mrb, name, strlen(name)); -} - -mrb_value -mrb_interned(mrb_state *mrb, const char *name, size_t len) +mrb_check_intern(mrb_state *mrb, const char *name, size_t len) { khash_t(n2s) *h = mrb->name2sym; symbol_name sname; @@ -96,9 +90,15 @@ mrb_interned(mrb_state *mrb, const char *name, size_t len) } mrb_value -mrb_str_interned(mrb_state *mrb, mrb_value str) +mrb_check_intern_cstr(mrb_state *mrb, const char *name) +{ + return mrb_check_intern(mrb, name, strlen(name)); +} + +mrb_value +mrb_check_intern_str(mrb_state *mrb, mrb_value str) { - return mrb_interned(mrb, RSTRING_PTR(str), RSTRING_LEN(str)); + return mrb_check_intern(mrb, RSTRING_PTR(str), RSTRING_LEN(str)); } /* lenp must be a pointer to a size_t variable */ |