diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-26 11:16:35 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-26 11:16:35 +0000 |
commit | a8b2bda76008b5ff5f58cd60276c6f5d1f2b2538 (patch) | |
tree | cbe78c9e0ff343bb028c1ae1894ba20816535bf4 | |
parent | cad814b5485493a5db2543bcf876bc117055cbf7 (diff) |
merges r20952 from trunk into ruby_1_9_1.
* string.c (rb_external_str_new_with_enc): set ASCII-8BIT if
encoding is US-ASCII and string contains 8bit characters.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21072 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 9 | ||||
-rw-r--r-- | string.c | 5 |
3 files changed, 12 insertions, 7 deletions
@@ -340,6 +340,11 @@ Mon Dec 22 18:00:36 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tk/tcltklib.c: fix wrong flag value. +Mon Dec 22 14:35:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * string.c (rb_external_str_new_with_enc): set ASCII-8BIT if + encoding is US-ASCII and string contains 8bit characters. + Mon Dec 22 12:26:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * cygwin/GNUmakefile.in (rubydll.def), win32/mkexports.rb @@ -7931,13 +7931,8 @@ gettable_gen(struct parser_params *parser, ID id) return NEW_FALSE(); } else if (id == keyword__FILE__) { - VALUE str = rb_external_str_new_with_enc(ruby_sourcefile, strlen(ruby_sourcefile), - rb_filesystem_encoding()); - if (rb_enc_str_coderange(str) != ENC_CODERANGE_7BIT && - ENCODING_GET(str) == rb_usascii_encindex()) { - rb_enc_associate(str, rb_ascii8bit_encoding()); - } - return NEW_STR(str); + return NEW_STR(rb_external_str_new_with_enc(ruby_sourcefile, strlen(ruby_sourcefile), + rb_filesystem_encoding())); } else if (id == keyword__LINE__) { return NEW_LIT(INT2FIX(ruby_sourceline)); @@ -538,6 +538,11 @@ rb_external_str_new_with_enc(const char *ptr, long len, rb_encoding *eenc) VALUE str; str = rb_tainted_str_new(ptr, len); + if (rb_enc_str_coderange(str) != ENC_CODERANGE_7BIT && + eenc == rb_usascii_encoding()) { + rb_enc_associate(str, rb_ascii8bit_encoding()); + return str; + } rb_enc_associate(str, eenc); return rb_str_conv_enc(str, eenc, rb_default_internal_encoding()); } |