kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* string.c (fstr_update_callback): Improve implementation in r43968

Browse source 
based on feedback from @nagachika. In the existing case, we can
  return ST_STOP to prevent any hash modification. In the !existing
  case, set both key and value to the fstr.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43986 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tmm1 2013-12-04 04:05:13 +00:00
parent 2dc478cbc2
commit 753fe47175
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Wed Dec 4 12:57:24 2013 Aman Gupta <ruby@tmm1.net>
* string.c (fstr_update_callback): Improve implementation in r43968
based on feedback from @nagachika. In the existing case, we can
return ST_STOP to prevent any hash modification. In the !existing
case, set both key and value to the fstr.
Wed Dec 4 12:47:54 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/delegate.rb (Delegator#method_missing): ignore the target if not

27
string.c
View file

@ -137,23 +137,24 @@ fstr_update_callback(st_data_t *key, st_data_t *value, st_data_t arg, int existi
{
VALUE *fstr = (VALUE *)arg;
if (existing) {
/* because of lazy sweep, str may be unmaked already and swept
/* because of lazy sweep, str may be unmarked already and swept
* at next time */
rb_gc_resurrect(*fstr = *key);
} else {
VALUE str = *key;
if (STR_SHARED_P(str)) {
/* str should not be shared */
str = rb_enc_str_new(RSTRING_PTR(str), RSTRING_LEN(str), STR_ENC_GET(str));
OBJ_FREEZE(str);
}
else {
str = rb_str_new_frozen(str);
}
RBASIC(str)->flags |= RSTRING_FSTR;
*fstr = *key = str;
return ST_STOP;
}
VALUE str = *key;
if (STR_SHARED_P(str)) {
/* str should not be shared */
str = rb_enc_str_new(RSTRING_PTR(str), RSTRING_LEN(str), STR_ENC_GET(str));
OBJ_FREEZE(str);
}
else {
str = rb_str_new_frozen(str);
}
RBASIC(str)->flags |= RSTRING_FSTR;
*key = *value = *fstr = str;
return ST_CONTINUE;
}