kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ruby.c (load_file): the encoding of DATA follows the source

Browse source 
file encoding. [ruby-dev:33693]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15428 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2008-02-11 01:47:26 +00:00
parent 65753a5838
commit bd5a15f76d
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Feb 11 10:43:31 2008 NARUSE, Yui <naruse@ruby-lang.org>
* ruby.c (load_file): the encoding of DATA follows the source
file encoding. [ruby-dev:33693]
Mon Feb 11 06:50:42 2008 Yusuke Endoh <mame@tsg.ne.jp>
* test/ruby/test_pack.rb: fix tests for 64bit CPU.

2
ruby.c
View file

@ -1192,8 +1192,8 @@ load_file(VALUE parser, const char *fname, int script, struct cmdline_options *o
else {
enc = rb_usascii_encoding();
}
rb_funcall(f, rb_intern("set_encoding"), 1, rb_enc_from_encoding(enc));
tree = (NODE *)rb_parser_compile_file(parser, fname, f, line_start);
rb_funcall(f, rb_intern("set_encoding"), 1, rb_parser_encoding(parser));
if (script && rb_parser_end_seen_p(parser)) {
rb_define_global_const("DATA", f);
}