* include/ruby/intern.h (rb_str_buf_cat_ascii): declared.

* string.c (rb_str_buf_cat_ascii): defined.

* re.c (rb_reg_s_union): use rb_str_buf_cat_ascii to support ASCII
  incompatible encoding.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15232 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 1 deletions

diff --git a/re.c b/re.c
index dced068d9..a03bea575 100644
--- a/re.c
+++ b/re.c
@@ -2668,7 +2668,7 @@ rb_reg_s_union(VALUE self, VALUE args0)
 	    VALUE e = rb_ary_entry(args0, i);
 
 	    if (0 < i)
-		rb_str_buf_cat2(source, "|"); /* xxx: UTF-16 */
+		rb_str_buf_cat_ascii(source, "|");
 
 	    v = rb_check_regexp_type(e);
 	    if (!NIL_P(v)) {
@@ -2726,6 +2726,9 @@ rb_reg_s_union(VALUE self, VALUE args0)
                 }
             }
 
+            if (i == 0) {
+                rb_enc_copy(source, v);
+            }
 	    rb_str_append(source, v);
 	}