diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2019-03-12 23:48:48 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-03-12 23:48:48 +0900 |
| commit | 1d38c1f307e6ff915a7284421cdd11a1b840a2fe (patch) | |
| tree | e7930eb3229ef308366908bf4b4261d222cf1400 /mrbgems | |
| parent | d2c325d08a8592f1bcfa99818bbecf47ffd63f73 (diff) | |
| parent | 425e6e0ffb0e2935b800866443fb18ccb26a97e4 (diff) | |
| download | mruby-1d38c1f307e6ff915a7284421cdd11a1b840a2fe.tar.gz mruby-1d38c1f307e6ff915a7284421cdd11a1b840a2fe.zip | |
Merge pull request #4322 from shuujii/reduce-String-creation-in-checking-name
Reduce `String` creation in `check_(cv|const)_name_sym`
Diffstat (limited to 'mrbgems')
| -rw-r--r-- | mrbgems/mruby-metaprog/src/metaprog.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/mrbgems/mruby-metaprog/src/metaprog.c b/mrbgems/mruby-metaprog/src/metaprog.c index 25c153cee..75913dab5 100644 --- a/mrbgems/mruby-metaprog/src/metaprog.c +++ b/mrbgems/mruby-metaprog/src/metaprog.c @@ -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 */ |