nobu	2007-10-17 03:37:09 +0900 (Wed, 17 Oct 2007)

  New Revision: 13728

  Modified files:
    trunk/ChangeLog
    trunk/re.c

  Log:
    * re.c (rb_reg_desc): set encoding.
    
    * re.c (rb_reg_s_union): check encodings.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13728&r2=13727
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/re.c?r1=13728&r2=13727

Index: re.c
===================================================================
--- re.c	(revision 13727)
+++ re.c	(revision 13728)
@@ -266,6 +266,7 @@
 {
     VALUE str = rb_str_buf_new2("/");
 
+    rb_enc_copy(str, re);
     rb_reg_expr_str(str, s, len);
     rb_str_buf_cat2(str, "/");
     if (re) {
@@ -1798,7 +1799,7 @@
 		rb_enc_check(tmp, e);
 		v = rb_reg_s_quote(Qnil, e);
 	    }
-	    rb_str_buf_append(source, v);
+	    rb_str_append(source, v);
 	}
         return rb_class_new_instance(1, &source, rb_cRegexp);
     }
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13727)
+++ ChangeLog	(revision 13728)
@@ -1,5 +1,9 @@
-Wed Oct 17 03:06:30 2007  Nobuyoshi Nakada  <nobu@r...>
+Wed Oct 17 03:37:07 2007  Nobuyoshi Nakada  <nobu@r...>
 
+	* re.c (rb_reg_desc): set encoding.
+
+	* re.c (rb_reg_s_union): check encodings.
+
 	* enc/utf8.c (utf8_code_to_mbclen): 0xfe and 0xff are valid Unicode to
 	  be encoded to 2bytes in UTF-8.  [ruby-core:12700]
 

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