From 1fca0d5ddda6ad52618012f80b0aa0bd39763111 Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 23 Dec 2008 15:13:18 +0000 Subject: * string.c (rb_external_str_new_with_enc): set ASCII-8BIT if encoding is US-ASCII and string contains 8bit characters. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20952 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- parse.y | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'parse.y') diff --git a/parse.y b/parse.y index f99277ec9..76bf51a0a 100644 --- a/parse.y +++ b/parse.y @@ -7923,13 +7923,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)); -- cgit