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: new string for fake string

Browse source 
* string.c (fstr_update_callback): create new string for fake
  string, and pool shared target unless substring.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51355 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-07-23 05:14:53 +00:00
parent 8ea11e8e1e
commit f965866f4f
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
string.c
View file

@ -155,6 +155,9 @@ VALUE rb_cSymbol;
#define SHARABLE_SUBSTRING_P(beg, len, end) 1
#endif
static VALUE str_new_static(VALUE klass, const char *ptr, long len, int encindex);
static void str_make_independent_expand(VALUE str, long expand);
static rb_encoding *
get_actual_encoding(const int encidx, VALUE str)
{
@ -244,12 +247,18 @@ fstr_update_callback(st_data_t *key, st_data_t *value, st_data_t arg, int existi
return ST_STOP;
}
else {
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);
if (FL_TEST_RAW(str, STR_FAKESTR)) {
str = str_new_static(rb_cString, RSTRING(str)->as.heap.ptr,
RSTRING(str)->as.heap.len,
ENCODING_GET(str));
OBJ_FREEZE_RAW(str);
}
else {
str = rb_str_new_frozen(str);
if (STR_SHARED_P(str)) { /* str should not be shared */
/* shared substring */
str_make_independent_expand(str, 0L);
}
}
RBASIC(str)->flags |= RSTRING_FSTR;
@ -280,6 +289,8 @@ register_fstring(VALUE str)
fstr_update_callback, (st_data_t)&ret);
} while (ret == Qundef);
assert(OBJ_FROZEN(ret));
assert(!FL_TEST_RAW(ret, STR_FAKESTR));
return ret;
}