From 6cb682a48005f43f3f1599d6c510523de237040d Mon Sep 17 00:00:00 2001 From: naruse Date: Sun, 7 Apr 2013 12:28:21 +0000 Subject: * object.c (rb_mod_const_set): call to_str for string only once. to_str was called from rb_is_const_name and rb_to_id before. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40175 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 81f7893a21..e2da8d5092 100644 --- a/object.c +++ b/object.c @@ -2051,12 +2051,17 @@ rb_mod_const_set(VALUE mod, VALUE name, VALUE value) QUOTE_ID(id)); } } - else if (!rb_is_const_name(name)) { - rb_name_error_str(name, "wrong constant name %"PRIsVALUE, - QUOTE(name)); - } else { - id = rb_to_id(name); + VALUE cname = rb_check_string_type(name); + if (NIL_P(cname)) { + rb_raise(rb_eTypeError, "%+"PRIsVALUE" is not a symbol or string", + name); + } + if (!rb_is_const_name(cname)) { + rb_name_error_str(cname, "wrong constant name %"PRIsVALUE, + QUOTE(cname)); + } + id = rb_to_id(cname); } rb_const_set(mod, id, value); return value; -- cgit v1.2.3