diff options
| -rw-r--r-- | test/ruby/test_econv.rb | 4 | ||||
| -rw-r--r-- | transcode.c | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/test/ruby/test_econv.rb b/test/ruby/test_econv.rb index caa0fca8b7..5a4af9b6a3 100644 --- a/test/ruby/test_econv.rb +++ b/test/ruby/test_econv.rb @@ -922,7 +922,9 @@ class TestEncodingConverter < Test::Unit::TestCase end newlines.each do |nl| opts = {newline: :universal, nl => true} - ec2 = Encoding::Converter.new("", "", **opts) + ec2 = assert_warning(/:newline option preceds/, opts.inspect) do + Encoding::Converter.new("", "", **opts) + end assert_equal(ec1, ec2) end end diff --git a/transcode.c b/transcode.c index a336f5d9ad..5cdaaaf61f 100644 --- a/transcode.c +++ b/transcode.c @@ -2418,6 +2418,7 @@ static int econv_opts(VALUE opt, int ecflags) { VALUE v; + int newlineflag = 0; v = rb_hash_aref(opt, sym_invalid); if (NIL_P(v)) { @@ -2463,6 +2464,7 @@ econv_opts(VALUE opt, int ecflags) #ifdef ENABLE_ECONV_NEWLINE_OPTION v = rb_hash_aref(opt, sym_newline); if (!NIL_P(v)) { + newlineflag = 2; ecflags &= ~ECONV_NEWLINE_DECORATOR_MASK; if (v == sym_universal) { ecflags |= ECONV_UNIVERSAL_NEWLINE_DECORATOR; @@ -2484,10 +2486,9 @@ econv_opts(VALUE opt, int ecflags) rb_raise(rb_eArgError, "unexpected value for newline option"); } } - else #endif { - int setflags = 0, newlineflag = 0; + int setflags = 0; v = rb_hash_aref(opt, sym_universal_newline); if (RTEST(v)) @@ -2504,9 +2505,15 @@ econv_opts(VALUE opt, int ecflags) setflags |= ECONV_CR_NEWLINE_DECORATOR; newlineflag |= !NIL_P(v); - if (newlineflag) { + switch (newlineflag) { + case 1: ecflags &= ~ECONV_NEWLINE_DECORATOR_MASK; ecflags |= setflags; + break; + + case 3: + rb_warning(":newline option preceds other newline options"); + break; } } |