naruse	2011-02-15 16:08:12 +0900 (Tue, 15 Feb 2011)

  New Revision: 30876

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30876

  Log:
    * string.c (rb_enc_cr_str_buf_cat): remove special treatment of
      ASCII-8BIT receivers.
    
    * string.c (str_gsub): set initial encoding of the buffer as the
      same of the receiver. [ruby-core:35141]

  Modified files:
    trunk/ChangeLog
    trunk/string.c
    trunk/test/ruby/test_m17n.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30875)
+++ ChangeLog	(revision 30876)
@@ -1,3 +1,11 @@
+Tue Feb 15 15:39:37 2011  NARUSE, Yui  <naruse@r...>
+
+	* string.c (rb_enc_cr_str_buf_cat): remove special treatment of
+	  ASCII-8BIT receivers.
+
+	* string.c (str_gsub): set initial encoding of the buffer as the
+	  same of the receiver. [ruby-core:35141]
+
 Tue Feb 15 09:49:33 2011  NAKAMURA Usaku  <usa@r...>
 
 	* test/ruby/test_system.rb (TestSystem#test_system_at): use findstr
Index: string.c
===================================================================
--- string.c	(revision 30875)
+++ string.c	(revision 30876)
@@ -1899,7 +1899,6 @@
     int str_encindex = ENCODING_GET(str);
     int res_encindex;
     int str_cr, res_cr;
-    int str_a8 = ENCODING_IS_ASCII8BIT(str);
     int ptr_a8 = ptr_encindex == 0;
 
     str_cr = ENC_CODERANGE(str);
@@ -1930,7 +1929,7 @@
 	    ptr_cr = coderange_scan(ptr, len, ptr_enc);
 	}
         if (str_cr == ENC_CODERANGE_UNKNOWN) {
-            if (str_a8 || ptr_cr != ENC_CODERANGE_7BIT) {
+            if (ENCODING_IS_ASCII8BIT(str) || ptr_cr != ENC_CODERANGE_7BIT) {
                 str_cr = rb_enc_str_coderange(str);
             }
         }
@@ -1953,7 +1952,7 @@
     }
     else if (str_cr == ENC_CODERANGE_7BIT) {
         if (ptr_cr == ENC_CODERANGE_7BIT) {
-            res_encindex = !str_a8 ? str_encindex : ptr_encindex;
+            res_encindex = str_encindex;
             res_cr = ENC_CODERANGE_7BIT;
         }
         else {
@@ -3746,6 +3745,7 @@
     cp = sp;
     str_enc = STR_ENC_GET(str);
     rb_enc_associate(dest, str_enc);
+    ENC_CODERANGE_SET(dest, rb_enc_asciicompat(str_enc) ? ENC_CODERANGE_7BIT : ENC_CODERANGE_VALID);
 
     do {
 	n++;
Index: test/ruby/test_m17n.rb
===================================================================
--- test/ruby/test_m17n.rb	(revision 30875)
+++ test/ruby/test_m17n.rb	(revision 30876)
@@ -1098,8 +1098,8 @@
     s = e("\xa3\xb0\xa3\xb1\xa3\xb2\xa3\xb3\xa3\xb4")
     assert_equal(e("\xa3\xb0z\xa3\xb2\xa3\xb3\xa3\xb4"), s.gsub(/\xa3\xb1/e, "z"))
 
-    assert_equal(Encoding::EUC_JP, (a("").gsub(//) { e("") }.encoding))
-    assert_equal(Encoding::EUC_JP, (a("a").gsub(/a/) { e("") }.encoding))
+    assert_equal(Encoding::ASCII_8BIT, (a("").gsub(//) { e("") }.encoding))
+    assert_equal(Encoding::ASCII_8BIT, (a("a").gsub(/a/) { e("") }.encoding))
   end
 
   def test_end_with

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