diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-30 08:13:28 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-30 08:13:28 +0000 |
commit | eb64f5de06ff378c3efe17504a1b57df9f4985f9 (patch) | |
tree | 958b18ff64e9862a3f85394c033c870aef2f559a /string.c | |
parent | 1a004904d1a9e61a404063538bb89c82530b814d (diff) | |
download | ruby-eb64f5de06ff378c3efe17504a1b57df9f4985f9.tar.gz |
* string.c (rb_str_append): always set encoding, and coderange
cache bits.
* include/ruby/encoding.h (ENC_CODERANGE_SET): fixed a bug not to
set chache bits.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -995,9 +995,12 @@ VALUE rb_str_append(VALUE str, VALUE str2) { rb_encoding *enc; + int cr, cr2; StringValue(str2); enc = rb_enc_check(str, str2); + cr = ENC_CODERANGE(str); + if ((cr2 = ENC_CODERANGE(str2)) > cr) cr = cr2; rb_str_modify(str); if (RSTRING_LEN(str2) > 0) { if (STR_ASSOC_P(str)) { @@ -1008,11 +1011,12 @@ rb_str_append(VALUE str, VALUE str2) RSTRING(str)->as.heap.len = len; } else { - return rb_str_buf_append(str, str2); + rb_str_buf_append(str, str2); } } OBJ_INFECT(str, str2); rb_enc_associate(str, enc); + ENC_CODERANGE_SET(str, cr); return str; } |