1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* parse.y (gettable_gen): the encoding of __FILE__ should be

Browse Source 
rb_filesystem_encoding().  [ruby-list:45733]

* parse.y (gettable_gen): __FILE__ should be ASCII-8BIT when
  filesystem encoding is US-ASCII and __FILE__ contains non 7bit
  characters.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20905 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-12-22 01:43:16 +00:00
parent 407ff29a6b
commit 1d4c164581
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Mon Dec 22 09:54:43 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (gettable_gen): the encoding of __FILE__ should be
rb_filesystem_encoding(). [ruby-list:45733]
* parse.y (gettable_gen): __FILE__ should be ASCII-8BIT when
filesystem encoding is US-ASCII and __FILE__ contains non 7bit
characters.
Mon Dec 22 02:54:56 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Mon Dec 22 02:54:56 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb: temporary patch for trouble on TkAqua (> Tk8.4.9). * ext/tk/lib/tk.rb: temporary patch for trouble on TkAqua (> Tk8.4.9).

8
parse.y
View File

@ -7923,7 +7923,13 @@ gettable_gen(struct parser_params *parser, ID id)
return NEW_FALSE(); return NEW_FALSE();
} }
else if (id == keyword__FILE__) { else if (id == keyword__FILE__) {
return NEW_STR(STR_NEW2(ruby_sourcefile)); 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);
} }
else if (id == keyword__LINE__) { else if (id == keyword__LINE__) {
return NEW_LIT(INT2FIX(ruby_sourceline)); return NEW_LIT(INT2FIX(ruby_sourceline));