From d94469ac2320d98cfcc4f6b0e64247c4b9df2edd Mon Sep 17 00:00:00 2001 From: kkkkkt Date: Thu, 21 Aug 2014 13:55:31 +0900 Subject: changed to call check_cv_name_str in check_cv_name_sym and adjust indent --- src/class.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'src/class.c') diff --git a/src/class.c b/src/class.c index 37ac751a7..d3a2403f1 100644 --- a/src/class.c +++ b/src/class.c @@ -1549,18 +1549,6 @@ mod_define_method(mrb_state *mrb, mrb_value self) return mrb_symbol_value(mid); } -static void -check_cv_name_sym(mrb_state *mrb, mrb_sym id) -{ - const char *s; - mrb_int len; - - s = mrb_sym2name_len(mrb, id, &len); - if (len < 3 || !(s[0] == '@' && s[1] == '@')) { - mrb_name_error(mrb, id, "`%S' is not allowed as a class variable name", mrb_sym2str(mrb, id)); - } -} - static void check_cv_name_str(mrb_state *mrb, mrb_value str) { @@ -1572,6 +1560,12 @@ check_cv_name_str(mrb_state *mrb, mrb_value str) } } +static void +check_cv_name_sym(mrb_state *mrb, mrb_sym id) +{ + check_cv_name_str(mrb, mrb_sym2str(mrb, id)); +} + static mrb_value get_sym_or_str_arg(mrb_state *mrb) { -- cgit v1.2.3