nobu	2007-12-19 21:42:19 +0900 (Wed, 19 Dec 2007)

  New Revision: 14333

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

  Log:
    * re.c (rb_reg_regsub): should set checked encoding.
    
    * string.c (rb_str_sub_bang): applied r14212 too.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/string.c?r1=14333&r2=14332
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14333&r2=14332
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/re.c?r1=14333&r2=14332
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_m17n.rb?r1=14333&r2=14332

Index: re.c
===================================================================
--- re.c	(revision 14332)
+++ re.c	(revision 14333)
@@ -2832,7 +2832,7 @@
         rb_str_buf_cat(val, p, e-p);
     }
     if (!val) return str;
-    rb_enc_copy(val, str);
+    rb_enc_associate(val, enc);
 
     return val;
 }
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14332)
+++ ChangeLog	(revision 14333)
@@ -1,3 +1,9 @@
+Wed Dec 19 21:42:18 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* re.c (rb_reg_regsub): should set checked encoding.
+
+	* string.c (rb_str_sub_bang): applied r14212 too.
+
 Wed Dec 19 20:40:01 2007  NAKAMURA Usaku  <usa@r...>
 
 	* bignum.c (bigmul1): C99ism.
Index: string.c
===================================================================
--- string.c	(revision 14332)
+++ string.c	(revision 14333)
@@ -2401,12 +2401,13 @@
 
     pat = get_pat(argv[0], 1);
     if (rb_reg_search(pat, str, 0, 0) >= 0) {
+	rb_encoding *enc;
+
 	match = rb_backref_get();
 	regs = RMATCH(match)->regs;
 
 	if (iter) {
 	    char *p = RSTRING_PTR(str); long len = RSTRING_LEN(str);
-	    rb_encoding *enc;
 
 	    rb_match_busy(match);
 	    repl = rb_obj_as_string(rb_yield(rb_reg_nth_match(0, match)));
@@ -2414,13 +2415,13 @@
 	    str_mod_check(str, p, len);
 	    str_frozen_check(str);
 	    rb_backref_set(match);
-	    rb_enc_associate(str, enc);
 	}
 	else {
 	    repl = rb_reg_regsub(repl, str, regs, pat);
-	    rb_enc_copy(str, repl);
+	    enc = rb_enc_check(str, repl);
 	}
 	rb_str_modify(str);
+	rb_enc_associate(str, enc);
 	if (OBJ_TAINTED(repl)) tainted = 1;
 	plen = END(0) - BEG(0);
 	if (RSTRING_LEN(repl) > plen) {
Index: test/ruby/test_m17n.rb
===================================================================
--- test/ruby/test_m17n.rb	(revision 14332)
+++ test/ruby/test_m17n.rb	(revision 14333)
@@ -1377,6 +1377,8 @@
   def test_sub
     s = "abc".sub(/b/, "\xa1\xa1".force_encoding("euc-jp"))
     assert_encoding("EUC-JP", s.encoding)
+    assert_equal(Encoding::EUC_JP, "\xa4\xa2".force_encoding("euc-jp").sub(/./, '\&').encoding)
+    assert_equal(Encoding::EUC_JP, "\xa4\xa2".force_encoding("euc-jp").gsub(/./, '\&').encoding)
   end
 
   def test_regexp_match

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