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 | |
parent | f83bc706bf9fba4873972f885c792613b32c651c (diff) | |
download | ruby-522c538e93cfdb55ea2848d1029f5bca99e403da.tar.gz |
* 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | io.c | 16 | ||||
-rw-r--r-- | test/ruby/test_io_m17n.rb | 46 |
3 files changed, 60 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Sat Dec 25 14:27:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * io.c (rb_io_extract_encoding_option): accept Encoding object as + encoding: optional argument. [ruby-dev:42884] + Sat Dec 25 13:37:55 2010 Ryan Davis <ryand-ruby@zenspider.com> * lib/minitest/*.rb: Imported minitest 2.0.2 r6093. @@ -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; diff --git a/test/ruby/test_io_m17n.rb b/test/ruby/test_io_m17n.rb index 0ae8c793b0..f9fb3e0c5b 100644 --- a/test/ruby/test_io_m17n.rb +++ b/test/ruby/test_io_m17n.rb @@ -114,7 +114,27 @@ EOT } end - def test_open_r_enc_in_opt2 + def test_open_r_encname_in_opt + with_tmpdir { + generate_file('tmp', "") + open("tmp", "r", encoding: Encoding::EUC_JP) {|f| + assert_equal(Encoding::EUC_JP, f.external_encoding) + assert_equal(nil, f.internal_encoding) + } + } + end + + def test_open_r_ext_enc_in_opt + with_tmpdir { + generate_file('tmp', "") + open("tmp", "r", external_encoding: Encoding::EUC_JP) {|f| + assert_equal(Encoding::EUC_JP, f.external_encoding) + assert_equal(nil, f.internal_encoding) + } + } + end + + def test_open_r_ext_encname_in_opt with_tmpdir { generate_file('tmp', "") open("tmp", "r", external_encoding: "euc-jp") {|f| @@ -127,6 +147,16 @@ EOT def test_open_r_enc_enc with_tmpdir { generate_file('tmp', "") + open("tmp", "r", external_encoding: Encoding::EUC_JP, internal_encoding: Encoding::UTF_8) {|f| + assert_equal(Encoding::EUC_JP, f.external_encoding) + assert_equal(Encoding::UTF_8, f.internal_encoding) + } + } + end + + def test_open_r_encname_encname + with_tmpdir { + generate_file('tmp', "") open("tmp", "r:euc-jp:utf-8") {|f| assert_equal(Encoding::EUC_JP, f.external_encoding) assert_equal(Encoding::UTF_8, f.internal_encoding) @@ -134,7 +164,7 @@ EOT } end - def test_open_r_enc_enc_in_opt + def test_open_r_encname_encname_in_opt with_tmpdir { generate_file('tmp', "") open("tmp", "r", encoding: "euc-jp:utf-8") {|f| @@ -144,7 +174,17 @@ EOT } end - def test_open_r_enc_enc_in_opt2 + def test_open_r_enc_enc_in_opt + with_tmpdir { + generate_file('tmp', "") + open("tmp", "r", external_encoding: Encoding::EUC_JP, internal_encoding: Encoding::UTF_8) {|f| + assert_equal(Encoding::EUC_JP, f.external_encoding) + assert_equal(Encoding::UTF_8, f.internal_encoding) + } + } + end + + def test_open_r_encname_encname_in_opt with_tmpdir { generate_file('tmp', "") open("tmp", "r", external_encoding: "euc-jp", internal_encoding: "utf-8") {|f| |