matz	2007-10-17 14:21:10 +0900 (Wed, 17 Oct 2007)

  New Revision: 13733

  Modified files:
    trunk/ChangeLog
    trunk/re.c

  Log:
    * re.c (rb_reg_s_union): the last check was not complete.

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

Index: re.c
===================================================================
--- re.c	(revision 13732)
+++ re.c	(revision 13733)
@@ -1783,7 +1783,8 @@
     else {
 	int i;
 	VALUE source = rb_str_buf_new(0);
-	VALUE enc0 = rb_obj_encoding(rb_ary_entry(args0, 0));
+	int mbs = Qfalse;
+	rb_encoding *enc = 0;
 
 	for (i = 0; i < argc; i++) {
 	    volatile VALUE v;
@@ -1792,13 +1793,18 @@
 		rb_str_buf_cat2(source, "|");
 	    v = rb_check_regexp_type(e);
 	    if (!NIL_P(v)) {
-		rb_enc_check(enc0, v);
 		v = rb_reg_to_s(v);
 	    }
 	    else {
 		v = rb_reg_s_quote(Qnil, e);
-		rb_enc_check(enc0, rb_obj_encoding(v));
 	    }
+	    if (mbs || rb_enc_str_coderange(v) != ENC_CODERANGE_SINGLE) {
+		if (!enc) enc = rb_enc_get(v);
+		else if (mbs && enc != rb_enc_get(v)) {
+		    rb_raise(rb_eArgError, "regexp encodings differ");
+		}
+		mbs = Qtrue;
+	    }
 	    rb_str_append(source, v);
 	}
         return rb_class_new_instance(1, &source, rb_cRegexp);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13732)
+++ ChangeLog	(revision 13733)
@@ -1,3 +1,7 @@
+Wed Oct 17 13:54:28 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* re.c (rb_reg_s_union): the last check was not complete.
+
 Wed Oct 17 11:30:55 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* encoding.c (rb_enc_from_encoding, rb_enc_register): associate index

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