From 5a2862f94425f339805e0551f7672a5d280de275 Mon Sep 17 00:00:00 2001 From: naruse Date: Sun, 17 Feb 2008 06:49:11 +0000 Subject: * encoding.c (ENC_CODERANGE_AND): added. * string.c (rb_str_plus, srb_str_times): keep coderange. * parse.y (STR_NEW0) use rb_usascii_str_new. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15519 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'string.c') diff --git a/string.c b/string.c index c9e3562af..c240f0ec7 100644 --- a/string.c +++ b/string.c @@ -738,7 +738,8 @@ rb_str_plus(VALUE str1, VALUE str2) if (OBJ_TAINTED(str1) || OBJ_TAINTED(str2)) OBJ_TAINT(str3); - rb_enc_associate(str3, enc); + ENCODING_CODERANGE_SET(str3, rb_enc_to_index(enc), + ENC_CODERANGE_AND(ENC_CODERANGE(str1), ENC_CODERANGE(str2))); return str3; } @@ -778,7 +779,7 @@ rb_str_times(VALUE str, VALUE times) } RSTRING_PTR(str2)[RSTRING_LEN(str2)] = '\0'; OBJ_INFECT(str2, str); - rb_enc_copy(str2, str); + ENCODING_CODERANGE_SET(str2, rb_enc_get_index(str), ENC_CODERANGE(str)); return str2; } -- cgit