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

Reduce String creation in check_(cv|const)_name_sym

Browse Source
This commit is contained in:
KOBAYASHI Shuji
2019-03-11 17:26:19 +09:00
parent fba8ecf55c
commit 425e6e0ffb
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-metaprog/src/metaprog.c
+8 -9
View File
@@ -400,21 +400,20 @@ mod_define_singleton_method(mrb_state *mrb, mrb_value self)
return mrb_symbol_value(mid);
}
static void
check_cv_name_str(mrb_state *mrb, mrb_value str)
static mrb_bool
cv_name_p(mrb_state *mrb, const char *name, mrb_int len)
{
const char *s = RSTRING_PTR(str);
mrb_int len = RSTRING_LEN(str);
if (len < 3 || !(s[0] == '@' && s[1] == '@')) {
mrb_name_error(mrb, mrb_intern_str(mrb, str), "'%S' is not allowed as a class variable name", str);
}
return len > 2 && name[0] == '@' && name[1] == '@';
}
static void
check_cv_name_sym(mrb_state *mrb, mrb_sym id)
{
check_cv_name_str(mrb, mrb_sym2str(mrb, id));
mrb_int len;
const char *name = mrb_sym2name_len(mrb, id, &len);
if (!cv_name_p(mrb, name, len)) {
mrb_name_error(mrb, id, "'%S' is not allowed as a class variable name", mrb_sym2str(mrb, id));
}
}
/* 15.2.2.4.39 */
src/class.c
+8 -6
View File
@@ -1895,18 +1895,20 @@ mrb_mod_undef(mrb_state *mrb, mrb_value mod)
return mrb_nil_value();
}
static void
check_const_name_str(mrb_state *mrb, mrb_value str)
static mrb_bool
const_name_p(mrb_state *mrb, const char *name, mrb_int len)
{
if (RSTRING_LEN(str) < 1 || !ISUPPER(*RSTRING_PTR(str))) {
mrb_name_error(mrb, mrb_intern_str(mrb, str), "wrong constant name %S", str);
}
return len > 0 && ISUPPER(name[0]);
}
static void
check_const_name_sym(mrb_state *mrb, mrb_sym id)
{
check_const_name_str(mrb, mrb_sym2str(mrb, id));
mrb_int len;
const char *name = mrb_sym2name_len(mrb, id, &len);
if (!const_name_p(mrb, name, len)) {
mrb_name_error(mrb, id, "wrong constant name %S", mrb_sym2str(mrb, id));
}
}
static mrb_value