nobu	2007-12-22 08:29:56 +0900 (Sat, 22 Dec 2007)

  New Revision: 14447

  Modified files:
    trunk/ChangeLog
    trunk/string.c

  Log:
    * string.c (rb_str_buf_append): improvement for non-broken coded
      strings.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/string.c?r1=14447&r2=14446
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14447&r2=14446

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14446)
+++ ChangeLog	(revision 14447)
@@ -1,3 +1,8 @@
+Sat Dec 22 08:29:56 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* string.c (rb_str_buf_append): improvement for non-broken coded
+	  strings.
+
 Sat Dec 22 06:30:04 2007  Koichi Sasada  <ko1@a...>
 
 	* bootstraptest/test_fork.rb: skip if fork is not unsupported.
Index: string.c
===================================================================
--- string.c	(revision 14446)
+++ string.c	(revision 14447)
@@ -1009,8 +1009,17 @@
 {
     rb_encoding *enc;
     long capa, len;
+    int cr1, cr2;
 
     enc = rb_enc_check(str, str2);
+    cr1 = ENC_CODERANGE(str);
+    cr2 = ENC_CODERANGE(str2);
+    if (cr1 == ENC_CODERANGE_BROKEN || cr2 == ENC_CODERANGE_BROKEN) {
+	cr1 = ENC_CODERANGE_UNKNOWN;
+    }
+    else if (cr2 > cr1) {
+	cr1 = cr2;
+    }
     rb_str_modify(str);
     if (STR_ASSOC_P(str)) {
 	FL_UNSET(str, STR_ASSOC);
@@ -1034,6 +1043,9 @@
     STR_SET_LEN(str, len);
     OBJ_INFECT(str, str2);
     rb_enc_associate(str, enc);
+    if (cr1 != ENC_CODERANGE_UNKNOWN) {
+	ENC_CODERANGE_SET(str, cr1);
+    }
 
     return str;
 }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml