From d9ff5c2230fbdb0aa76462df1e23c4d9cc646150 Mon Sep 17 00:00:00 2001 From: naruse Date: Sun, 7 Apr 2013 12:18:26 +0000 Subject: * object.c (rb_mod_cvar_set): call to_str for string only once. to_str was called from rb_is_class_name and rb_to_id before. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40174 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- object.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'object.c') diff --git a/object.c b/object.c index 355a7569e5..81f7893a21 100644 --- a/object.c +++ b/object.c @@ -2305,12 +2305,17 @@ rb_mod_cvar_set(VALUE obj, VALUE iv, VALUE val) QUOTE_ID(id)); } } - else if (!rb_is_class_name(iv)) { - rb_name_error_str(iv, "`%"PRIsVALUE"' is not allowed as a class variable name", - QUOTE(iv)); - } else { - id = rb_to_id(iv); + VALUE cname = rb_check_string_type(iv); + if (NIL_P(cname)) { + rb_raise(rb_eTypeError, "%+"PRIsVALUE" is not a symbol or string", + iv); + } + if (!rb_is_class_name(cname)) { + rb_name_error_str(iv, "`%"PRIsVALUE"' is not allowed as a class variable name", + QUOTE(cname)); + } + id = rb_to_id(cname); } rb_cvar_set(obj, id, val); return val; -- cgit v1.2.3