diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-28 02:26:23 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-28 02:26:23 +0000 |
commit | 212e057d3e46ce3f6dffa84fcfd706c37ab777fb (patch) | |
tree | 586c2c57e304e793604f53229ea845696d18343c /parse.y | |
parent | d56a257e28d86fb2b228ecc46a1d7c366a6f888d (diff) | |
download | ruby-212e057d3e46ce3f6dffa84fcfd706c37ab777fb.tar.gz ruby-212e057d3e46ce3f6dffa84fcfd706c37ab777fb.tar.xz ruby-212e057d3e46ce3f6dffa84fcfd706c37ab777fb.zip |
* parse.y (parser_str_new): encoding of UTF-8 literal string in
US-ASCII script is UTF-8. [ruby-dev:33406]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4848,7 +4848,7 @@ parser_str_new(const char *p, long n, rb_encoding *enc, int func, rb_encoding *e if (rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT) { rb_enc_associate(str, rb_usascii_encoding()); } - else if (enc0 == rb_usascii_encoding()) { + else if (enc0 == rb_usascii_encoding() && enc != rb_utf8_encoding()) { rb_enc_associate(str, rb_ascii8bit_encoding()); } } |