diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-25 06:12:44 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-25 06:12:44 +0000 |
commit | 95e59bd9e073edfe57b9c773ca414e6bb5ef5d83 (patch) | |
tree | 3e499463b9a5a46863d28ddbb873211bc5d8cfe7 /ruby.c | |
parent | a470a2f1e184bf46642e54df093e32896dcf6e4e (diff) |
* ruby.c (process_options): not set encoding of -e option from -E
option if they are not compatible.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r-- | ruby.c | 20 |
1 files changed, 18 insertions, 2 deletions
@@ -1000,14 +1000,30 @@ process_options(VALUE arg) enc = rb_enc_from_index(opt->ext.enc.index); } else { - enc = rb_locale_encoding(); + enc = 0; } if (opt->e_script) { - rb_enc_associate(opt->e_script, enc); + rb_encoding *eenc = rb_locale_encoding(); + if (!enc) { + enc = eenc; + } + else if (!rb_enc_asciicompat(enc)) { + rb_warning("%s is not ASCII compatible, ignored for -e", + rb_enc_name(enc)); + } + else if (eenc != enc && + (rb_enc_str_coderange(opt->e_script) != ENC_CODERANGE_7BIT)) { + rb_warning("-e conatains non ASCII string, encoding %s is not used", + rb_enc_name(enc)); + } + rb_enc_associate(opt->e_script, eenc); require_libraries(); tree = rb_parser_compile_string(parser, opt->script, opt->e_script, 1); } else { + if (!enc) { + enc = rb_locale_encoding(); + } if (opt->script[0] == '-' && !opt->script[1]) { forbid_setid("program input from stdin"); } |