From 00cdba732f4ec132947ac33479e423ae5da016cc Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 19 Sep 2008 23:07:22 +0000
Subject: * re.c (rb_reg_desc): Regexps of ASCII Compatible encoding may  
 contain non-ASCII characters. So in that case its encoding   must keep
 original encoding.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19433 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 re.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 're.c')

diff --git a/re.c b/re.c
index b9d3840313..9b9cb87d02 100644
--- a/re.c
+++ b/re.c
@@ -380,8 +380,12 @@ static VALUE
 rb_reg_desc(const char *s, long len, VALUE re)
 {
     VALUE str = rb_str_buf_new2("/");
-
-    rb_enc_associate(str, rb_usascii_encoding());
+    if (rb_enc_asciicompat(rb_enc_get(re))) {
+	rb_enc_copy(str, re);
+    }
+    else {
+	rb_enc_associate(str, rb_usascii_encoding());
+    }
     rb_reg_expr_str(str, s, len);
     rb_str_buf_cat2(str, "/");
     if (re) {
-- 
cgit v1.2.3