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 (process_options): -e'script' is locale encoding by default.

Browse source 
(load_file): ruby script from stdin is locale encoding by default.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14998 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2008-01-11 19:41:22 +00:00
parent 353a69229d
commit 7f9c3b1c97
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Jan 12 04:38:38 2008 NARUSE, Yui <naruse@ruby-lang.org>
* ruby.c (process_options): -e'script' is locale encoding by default.
(load_file): ruby script from stdin is locale encoding by default.
Sat Jan 12 04:31:59 2008 NARUSE, Yui <naruse@ruby-lang.org>
* ext/nkf/nkf-utf8/nkf.c: fix bug: -m was -m0.

16
ruby.c
View file

@ -984,9 +984,14 @@ process_options(VALUE arg)
if (opt->enc_name != 0) {
opt->enc_index = opt_enc_index(opt->enc_name);
}
if (opt->enc_index >= 0) {
enc = rb_enc_from_index(opt->enc_index);
}
else {
enc = rb_locale_encoding();
}
if (opt->e_script) {
if (opt->enc_index >= 0)
rb_enc_associate_index(opt->e_script, opt->enc_index);
rb_enc_associate(opt->e_script, enc);
require_libraries();
tree = rb_parser_compile_string(parser, opt->script, opt->e_script, 1);
}
@ -1021,12 +1026,6 @@ process_options(VALUE arg)
}
}
if (opt->enc_index >= 0) {
enc = rb_enc_from_index(opt->enc_index);
}
else {
enc = rb_locale_encoding();
}
rb_enc_set_default_external(rb_enc_from_encoding(enc));
return (VALUE)tree;
@ -1153,6 +1152,7 @@ load_file(VALUE parser, const char *fname, int script, struct cmdline_options *o
require_libraries(); /* Why here? unnatural */
}
if (opt->enc_index >= 0) rb_enc_associate_index(f, opt->enc_index);
else rb_enc_associate(f, rb_locale_encoding());
tree = (NODE *)rb_parser_compile_file(parser, fname, f, line_start);
if (script && rb_parser_end_seen_p(parser)) {
rb_define_global_const("DATA", f);