diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-25 05:27:12 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-25 05:27:12 +0000 |
commit | 522c538e93cfdb55ea2848d1029f5bca99e403da (patch) | |
tree | f0944cb83c142206a70b231b73c3e5dedcff0a01 /io.c | |
parent | f83bc706bf9fba4873972f885c792613b32c651c (diff) |
* io.c (rb_io_extract_encoding_option): accept Encoding object as
encoding: optional argument. [ruby-dev:42884]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30349 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -4384,9 +4384,12 @@ rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2 if (v != Qundef) intenc = v; } if ((extenc != Qundef || intenc != Qundef) && !NIL_P(encoding)) { - rb_warn("Ignoring encoding parameter '%s': %s_encoding is used", - StringValueCStr(encoding), - extenc == Qundef ? "internal" : "external"); + if (!NIL_P(ruby_verbose)) { + int idx = rb_to_encoding_index(encoding); + rb_warn("Ignoring encoding parameter '%s': %s_encoding is used", + idx < 0 ? StringValueCStr(encoding) : rb_enc_name(rb_enc_from_index(idx)), + extenc == Qundef ? "internal" : "external"); + } encoding = Qnil; } if (extenc != Qundef && !NIL_P(extenc)) { @@ -4417,7 +4420,12 @@ rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2 } if (!NIL_P(encoding)) { extracted = 1; - parse_mode_enc(StringValueCStr(encoding), enc_p, enc2_p, fmode_p); + if (!NIL_P(tmp = rb_check_string_type(encoding))) { + parse_mode_enc(StringValueCStr(tmp), enc_p, enc2_p, fmode_p); + } + else { + rb_io_ext_int_to_encs(rb_to_encoding(encoding), NULL, enc_p, enc2_p); + } } else if (extenc != Qundef || intenc != Qundef) { extracted = 1; |