diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-02 03:58:28 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-02 03:58:28 +0000 |
commit | c353ec0c9e8e941f49910a51f7dc10cf3d3cdd17 (patch) | |
tree | fbf1dba5291d663fa2ef3613719bad5b02cf90b5 /string.c | |
parent | 321c6df89b5969d168cc5f210b1d42a091ad8ae2 (diff) | |
download | ruby-c353ec0c9e8e941f49910a51f7dc10cf3d3cdd17.tar.gz |
string.c: shortcut
* string.c (rb_str_concat): shortcut concatenation to ASCII-8BIT
as well as US-ASCII.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54882 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -2742,6 +2742,7 @@ rb_str_concat(VALUE str1, VALUE str2) { unsigned int code; rb_encoding *enc = STR_ENC_GET(str1); + int encidx; if (FIXNUM_P(str2) || RB_TYPE_P(str2, T_BIGNUM)) { if (rb_num_to_uint(str2, &code) == 0) { @@ -2757,7 +2758,8 @@ rb_str_concat(VALUE str1, VALUE str2) return rb_str_append(str1, str2); } - if (enc == rb_usascii_encoding()) { + encidx = rb_enc_to_index(enc); + if (encidx == ENCINDEX_ASCII || encidx == ENCINDEX_US_ASCII) { /* US-ASCII automatically extended to ASCII-8BIT */ char buf[1]; buf[0] = (char)code; @@ -2765,8 +2767,8 @@ rb_str_concat(VALUE str1, VALUE str2) rb_raise(rb_eRangeError, "%u out of char range", code); } rb_str_cat(str1, buf, 1); - if (code > 127) { - rb_enc_associate_index(str1, rb_ascii8bit_encindex()); + if (encidx == ENCINDEX_US_ASCII && code > 127) { + rb_enc_associate_index(str1, ENCINDEX_ASCII); ENC_CODERANGE_SET(str1, ENC_CODERANGE_VALID); } } |