diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-30 14:36:09 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-30 14:36:09 +0000 |
commit | 43a9c5a36470224bea23acb42339735efc27702b (patch) | |
tree | f4ab58447115e3b616ed82dd3dcf043de6a5e391 | |
parent | 90229f89a53f942b2aa3a2e583ab717b1e831aa7 (diff) |
merges r20056 from trunk into ruby_1_9_1.
* ruby.c (load_file_internal): should not set script encoding to
ASCII-8BIT.
* ruby.c (load_file_internal): do not auto convert scripts even
when default_internal is set. [ruby-core:19579]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20064 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | ruby.c | 4 |
2 files changed, 10 insertions, 5 deletions
@@ -19,6 +19,14 @@ Thu Oct 30 09:31:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * encoding.c (rb_enc_set_default_internal): ditto for internal. +Thu Oct 30 03:30:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * ruby.c (load_file_internal): should not set script encoding to + ASCII-8BIT. + + * ruby.c (load_file_internal): do not auto convert scripts even + when default_internal is set. [ruby-core:19579] + Thu Oct 30 02:20:33 2008 Yusuke Endoh <mame@tsg.ne.jp> * array.c (rb_ary_sort_bang): remove SEGV when replacing array with @@ -117,9 +125,6 @@ Wed Oct 29 11:01:46 2008 NAKAMURA Usaku <usa@ruby-lang.org> Wed Oct 29 09:30:04 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ruby.c (load_file_internal): use ASCII-8BIT to prevent conversion. - [ruby-core:19579] - * ruby.c (load_file_internal): cache common interned IDs. Wed Oct 29 00:43:39 2008 Tadayoshi Funaba <tadf@dotrb.org> @@ -1356,9 +1356,9 @@ load_file_internal(VALUE arg) enc = rb_locale_encoding(); } else { - enc = rb_ascii8bit_encoding(); + enc = rb_usascii_encoding(); } - rb_funcall(f, set_encoding, 1, rb_enc_from_encoding(enc)); + rb_funcall(f, set_encoding, 2, rb_enc_from_encoding(enc), rb_str_new_cstr("-")); tree = (NODE *)rb_parser_compile_file(parser, fname, f, line_start); rb_funcall(f, set_encoding, 1, rb_parser_encoding(parser)); if (script && rb_parser_end_seen_p(parser)) { |