summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-16 13:16:12 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-16 13:16:12 +0000
commitbade487125a7a34656a1b3770ead462cd1784b57 (patch)
tree598969bbfdfae31ad0ef2cabe377c51923fee898
parentec04457a856844eb5772186fcdd86677eceff8c0 (diff)
downloadruby-bade487125a7a34656a1b3770ead462cd1784b57.tar.gz
ruby-bade487125a7a34656a1b3770ead462cd1784b57.tar.xz
ruby-bade487125a7a34656a1b3770ead462cd1784b57.zip
* re.c (rb_reg_desc): Regexp#inspect should be US-ASCII.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--re.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dd3ed2701..14a0ff520 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 16 21:48:55 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * re.c (rb_reg_desc): Regexp#inspect should be US-ASCII.
+
Tue Sep 16 21:33:22 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_crypt): orthodox crypt() sees only first two bytes
diff --git a/re.c b/re.c
index b47ec108e..b9d384031 100644
--- a/re.c
+++ b/re.c
@@ -381,7 +381,7 @@ rb_reg_desc(const char *s, long len, VALUE re)
{
VALUE str = rb_str_buf_new2("/");
- rb_enc_copy(str, re);
+ rb_enc_associate(str, rb_usascii_encoding());
rb_reg_expr_str(str, s, len);
rb_str_buf_cat2(str, "/");
if (re) {