1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* object.c (rb_mod_const_set): call to_str for string only once.

Browse Source 
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
This commit is contained in:
naruse 2013-04-07 12:28:21 +00:00
parent d9ff5c2230
commit 6cb682a480
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sun Apr 7 21:27:40 2013 NARUSE, Yui <naruse@ruby-lang.org>
* 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.
Sun Apr 7 21:16:19 2013 NARUSE, Yui <naruse@ruby-lang.org> Sun Apr 7 21:16:19 2013 NARUSE, Yui <naruse@ruby-lang.org>
* object.c (rb_mod_cvar_set): call to_str for string only once. * object.c (rb_mod_cvar_set): call to_str for string only once.

15
object.c
View File

@ -2051,12 +2051,17 @@ rb_mod_const_set(VALUE mod, VALUE name, VALUE value)
QUOTE_ID(id)); QUOTE_ID(id));
} }
} }
else if (!rb_is_const_name(name)) {
rb_name_error_str(name, "wrong constant name %"PRIsVALUE,
QUOTE(name));
}
else { 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); rb_const_set(mod, id, value);
return value; return value;