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

string.c: register_fstring

Browse Source 
* string.c (register_fstring): separate registration from
  rb_fstring().

* string.c (rb_fstring_new): skip argument checks in rb_fstring().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51157 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-07-06 02:24:29 +00:00
parent 87954dd8a0
commit 0918c27a40
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
string.c
View File

@ -212,6 +212,7 @@ static int fstring_cmp(VALUE a, VALUE b);
/* in case we restart MVM development, this needs to be per-VM */ /* in case we restart MVM development, this needs to be per-VM */
static st_table* frozen_strings; static st_table* frozen_strings;
static VALUE register_fstring(VALUE str);
static inline st_table* static inline st_table*
rb_vm_fstring_table(void) rb_vm_fstring_table(void)
@ -260,13 +261,19 @@ fstr_update_callback(st_data_t *key, st_data_t *value, st_data_t arg, int existi
VALUE VALUE
rb_fstring(VALUE str) rb_fstring(VALUE str)
{ {
VALUE ret;
Check_Type(str, T_STRING); Check_Type(str, T_STRING);
if (FL_TEST(str, RSTRING_FSTR)) if (FL_TEST(str, RSTRING_FSTR))
return str; return str;
return register_fstring(str);
}
static VALUE
register_fstring(VALUE str)
{
VALUE ret;
do { do {
ret = str; ret = str;
st_update(rb_vm_fstring_table(), (st_data_t)str, st_update(rb_vm_fstring_table(), (st_data_t)str,
@ -301,7 +308,7 @@ VALUE
rb_fstring_new(const char *ptr, long len) rb_fstring_new(const char *ptr, long len)
{ {
struct RString fake_str; struct RString fake_str;
return rb_fstring(setup_fake_str(&fake_str, ptr, len, ENCINDEX_US_ASCII)); return register_fstring(setup_fake_str(&fake_str, ptr, len, ENCINDEX_US_ASCII));
} }
VALUE VALUE