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

Simplify conditions [Feature #15251]

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65372 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-10-26 06:18:28 +00:00
parent 1e83e15ab5
commit 81c849172d
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hash.c
View File

@ -1565,36 +1565,24 @@ hash_aset(st_data_t *key, st_data_t *val, struct update_arg *arg, int existing)
}
static VALUE
fstring_existing_str(VALUE str)
fstring_key_str(VALUE str)
{
st_data_t fstr;
st_table *tbl = rb_vm_fstring_table();
if (st_lookup(tbl, str, &fstr)) {
if (rb_objspace_garbage_object_p(fstr)) {
return rb_fstring(str);
}
else {
return (VALUE)fstr;
}
if (st_lookup(tbl, str, &fstr) && !rb_objspace_garbage_object_p(fstr)) {
return (VALUE)fstr;
}
else {
return Qnil;
return rb_fstring(str);
}
}
VALUE
rb_hash_key_str(VALUE key)
{
VALUE k;
int not_tainted = !RB_OBJ_TAINTED(key);
if (not_tainted &&
(k = fstring_existing_str(key)) != Qnil) {
return k;
}
else if(not_tainted) {
return rb_fstring(key);
if (!FL_ANY_RAW(key, FL_TAINT|FL_SINGLETON)) {
return fstring_key_str(key);
}
else {
return rb_str_new_frozen(key);