diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-02 19:19:44 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-02 19:19:44 +0000 |
commit | 3010758245f755dbb9e936c173a700612387b208 (patch) | |
tree | bb27459b2526e55cb2d525914df9532b149e24c4 | |
parent | 4e788aa17e4d4c52e49f3386313bcb948431ea9a (diff) |
Revert "* re.c (rb_reg_initialize): don't set US-ASCII to regexp"
This reverts commit r30058.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30059 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | re.c | 3 |
2 files changed, 3 insertions, 6 deletions
@@ -1,9 +1,3 @@ -Fri Dec 3 01:55:19 2010 NARUSE, Yui <naruse@ruby-lang.org> - - * re.c (rb_reg_initialize): don't set US-ASCII to regexp - when parser make initially compile a regexp. - Usually regexp are used for the same of its script encoding. - Fri Dec 3 01:52:43 2010 NARUSE, Yui <naruse@ruby-lang.org> * encoding.c (enc_alias_internal): use xfree instead of free. @@ -2403,6 +2403,9 @@ rb_reg_initialize(VALUE obj, const char *s, long len, rb_encoding *enc, enc = fixed_enc; } } + else if (!(options & ARG_ENCODING_FIXED)) { + enc = rb_usascii_encoding(); + } rb_enc_associate((VALUE)re, enc); if ((options & ARG_ENCODING_FIXED) || fixed_enc) { |