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

* ruby.c (load_file): script files should not be affected by locale.

Browse Source 
[ruby-dev:33054]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15021 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-01-13 04:50:48 +00:00
parent a7b36aebe8
commit 60e38b6efb
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun Jan 13 13:50:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (load_file): script files should not be affected by locale.
[ruby-dev:33054]
Sun Jan 13 12:01:32 2008 Eric Hodel <drbrain@segment7.net> Sun Jan 13 12:01:32 2008 Eric Hodel <drbrain@segment7.net>
* lib/rdoc/generators*: Reorganize RDoc generators. * lib/rdoc/generators*: Reorganize RDoc generators.

8
ruby.c
View File

@ -1151,8 +1151,12 @@ load_file(VALUE parser, const char *fname, int script, struct cmdline_options *o
} }
require_libraries(); /* Why here? unnatural */ require_libraries(); /* Why here? unnatural */
} }
if (opt->enc_index >= 0) rb_enc_associate_index(f, opt->enc_index); if (opt->enc_index >= 0) {
else rb_enc_associate(f, rb_locale_encoding()); rb_enc_associate_index(f, opt->enc_index);
}
else if (f == rb_stdin) {
rb_enc_associate(f, rb_locale_encoding());
}
tree = (NODE *)rb_parser_compile_file(parser, fname, f, line_start); tree = (NODE *)rb_parser_compile_file(parser, fname, f, line_start);
if (script && rb_parser_end_seen_p(parser)) { if (script && rb_parser_end_seen_p(parser)) {
rb_define_global_const("DATA", f); rb_define_global_const("DATA", f);