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

* parse.y (rb_intern3): split to registration check and new

Browse Source 
registration.
* parse.y (rb_intern_str): make interned string shared with the
  given string.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34354 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-01-22 06:41:29 +00:00
parent 2d87a5c150
commit bb19bcf93e
2 changed files with 46 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,4 +1,10 @@
Sun Jan 22 15:23:35 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Jan 22 15:41:26 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (rb_intern3): split to registration check and new
registration.
* parse.y (rb_intern_str): make interned string shared with the
given string.
* parse.y (rb_intern3, rb_intern_str): check the coderange first. * parse.y (rb_intern3, rb_intern_str): check the coderange first.

53
parse.y
View File

@ -40,6 +40,7 @@
#ifndef RIPPER #ifndef RIPPER
static ID register_symid(ID, const char *, long, rb_encoding *); static ID register_symid(ID, const char *, long, rb_encoding *);
static ID register_symid_str(ID, VALUE);
#define REGISTER_SYMID(id, name) register_symid((id), (name), strlen(name), enc) #define REGISTER_SYMID(id, name) register_symid((id), (name), strlen(name), enc)
#include "id.c" #include "id.c"
#endif #endif
@ -10391,6 +10392,12 @@ static ID
register_symid(ID id, const char *name, long len, rb_encoding *enc) register_symid(ID id, const char *name, long len, rb_encoding *enc)
{ {
VALUE str = rb_enc_str_new(name, len, enc); VALUE str = rb_enc_str_new(name, len, enc);
return register_symid_str(id, str);
}
static ID
register_symid_str(ID id, VALUE str)
{
OBJ_FREEZE(str); OBJ_FREEZE(str);
st_add_direct(global_symbols.sym_id, (st_data_t)str, id); st_add_direct(global_symbols.sym_id, (st_data_t)str, id);
st_add_direct(global_symbols.id_str, id, (st_data_t)str); st_add_direct(global_symbols.id_str, id, (st_data_t)str);
@ -10407,16 +10414,12 @@ sym_check_asciionly(VALUE str)
return cr == ENC_CODERANGE_7BIT; return cr == ENC_CODERANGE_7BIT;
} }
static ID intern_str(VALUE str);
ID ID
rb_intern3(const char *name, long len, rb_encoding *enc) rb_intern3(const char *name, long len, rb_encoding *enc)
{ {
const char *m = name;
const char *e = m + len;
unsigned char c;
VALUE str; VALUE str;
ID id;
long last;
int mb;
st_data_t data; st_data_t data;
struct RString fake_str; struct RString fake_str;
fake_str.basic.flags = T_STRING|RSTRING_NOEMBED; fake_str.basic.flags = T_STRING|RSTRING_NOEMBED;
@ -10433,6 +10436,25 @@ rb_intern3(const char *name, long len, rb_encoding *enc)
if (st_lookup(global_symbols.sym_id, str, &data)) if (st_lookup(global_symbols.sym_id, str, &data))
return (ID)data; return (ID)data;
str = rb_enc_str_new(name, len, enc); /* make true string */
return intern_str(str);
}
static ID
intern_str(VALUE str)
{
const char *name, *m, *e;
long len, last;
rb_encoding *enc;
unsigned char c;
ID id;
int mb;
RSTRING_GETMEM(str, name, len);
m = name;
e = m + len;
enc = rb_enc_get(str);
if (rb_cString && !rb_enc_asciicompat(enc)) { if (rb_cString && !rb_enc_asciicompat(enc)) {
id = ID_JUNK; id = ID_JUNK;
goto new_id; goto new_id;
@ -10518,7 +10540,7 @@ rb_intern3(const char *name, long len, rb_encoding *enc)
} }
id |= ++global_symbols.last_id << ID_SCOPE_SHIFT; id |= ++global_symbols.last_id << ID_SCOPE_SHIFT;
id_register: id_register:
return register_symid(id, name, len, enc); return register_symid_str(id, str);
} }
ID ID
@ -10538,17 +10560,20 @@ ID
rb_intern_str(VALUE str) rb_intern_str(VALUE str)
{ {
rb_encoding *enc; rb_encoding *enc;
ID id; st_data_t id;
int ascii = sym_check_asciionly(str);
if (sym_check_asciionly(str)) { if (st_lookup(global_symbols.sym_id, str, &id))
enc = rb_usascii_encoding(); return (ID)id;
if (ascii && (enc = rb_usascii_encoding()) != rb_enc_get(str)) {
str = rb_str_dup(str);
rb_enc_associate(str, enc);
OBJ_FREEZE(str);
} }
else { else {
enc = rb_enc_get(str); str = rb_str_dup_frozen(str);
} }
id = rb_intern3(RSTRING_PTR(str), RSTRING_LEN(str), enc); return intern_str(str);
RB_GC_GUARD(str);
return id;
} }
VALUE VALUE