matz	2007-10-16 14:06:30 +0900 (Tue, 16 Oct 2007)

  New Revision: 13716

  Modified files:
    trunk/ChangeLog
    trunk/re.c

  Log:
    * re.c (rb_reg_s_union): encoding of all regexp objects should
      match.  [ruby-dev:32076]

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

Index: re.c
===================================================================
--- re.c	(revision 13715)
+++ re.c	(revision 13716)
@@ -1997,6 +1997,7 @@
 rb_reg_s_union(VALUE self, VALUE args0)
 {
     long argc = RARRAY_LEN(args0);
+
     if (argc == 0) {
         VALUE args[1];
         args[0] = rb_str_new2("(?!)");
@@ -2018,11 +2019,14 @@
         VALUE kcode_re = Qnil;
         VALUE source = rb_str_buf_new(0);
         VALUE args[3];
+	VALUE tmp = rb_ary_entry(args0, 0);
+
         for (i = 0; i < argc; i++) {
             volatile VALUE v;
             if (0 < i)
                 rb_str_buf_cat2(source, "|");
             v = rb_check_regexp_type(rb_ary_entry(args0, i));
+	    rb_enc_check(tmp, v);
             if (!NIL_P(v)) {
                 if (FL_TEST(v, KCODE_FIXED)) {
                     if (kcode == -1) {
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13715)
+++ ChangeLog	(revision 13716)
@@ -1,3 +1,8 @@
+Tue Oct 16 14:03:09 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* re.c (rb_reg_s_union): encoding of all regexp objects should
+	  match.  [ruby-dev:32076]
+
 Tue Oct 16 13:49:41 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* encoding.c (enc_to_s): rename function.

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