admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename mrb_interned API functions

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2013-04-26 10:57:08 +09:00
parent c99b72b20d
commit e63b086f1e
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mruby.h
+3 -3
View File
@@ -208,9 +208,9 @@ mrb_value mrb_funcall_with_block(mrb_state*, mrb_value, mrb_sym, int, mrb_value*
mrb_sym mrb_intern_cstr(mrb_state*,const char*);
mrb_sym mrb_intern2(mrb_state*,const char*,size_t);
mrb_sym mrb_intern_str(mrb_state*,mrb_value);
mrb_value mrb_cstr_interned(mrb_state*,const char*);
mrb_value mrb_interned(mrb_state*,const char*,size_t);
mrb_value mrb_str_interned(mrb_state*,mrb_value);
mrb_value mrb_check_intern_cstr(mrb_state*,const char*);
mrb_value mrb_check_intern(mrb_state*,const char*,size_t);
mrb_value mrb_check_intern_str(mrb_state*,mrb_value);
const char *mrb_sym2name(mrb_state*,mrb_sym);
const char *mrb_sym2name_len(mrb_state*,mrb_sym,size_t*);
mrb_value mrb_sym2str(mrb_state*,mrb_sym);
src/class.c
+4 -4
View File
@@ -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 {
src/kernel.c
+1 -1
View File
@@ -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 {
src/symbol.c
+9 -9
View File
@@ -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_interned(mrb, RSTRING_PTR(str), RSTRING_LEN(str));
return mrb_check_intern(mrb, name, strlen(name));
}
mrb_value
mrb_check_intern_str(mrb_state *mrb, mrb_value str)
{
return mrb_check_intern(mrb, RSTRING_PTR(str), RSTRING_LEN(str));
}
/* lenp must be a pointer to a size_t variable */