diff options
| author | Nobuyoshi Nakada <[email protected]> | 2020-04-21 18:23:20 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <[email protected]> | 2020-04-21 19:29:16 +0900 |
| commit | 3ef09c6e66cf28455536593af60a7c7072fb1777 (patch) | |
| tree | d43bf9a56cc34a6af6090fd961acce6f5b8a9007 | |
| parent | bf11bf31e2e795bb22c939a5b5cd412c98208982 (diff) | |
eval_error.c: default nil as "reverse" is now false [Feature #8661]
| -rw-r--r-- | eval_error.c | 4 | ||||
| -rw-r--r-- | test/ruby/test_exception.rb | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/eval_error.c b/eval_error.c index 809d8aef00..89e27afe56 100644 --- a/eval_error.c +++ b/eval_error.c @@ -309,9 +309,9 @@ rb_error_write(VALUE errinfo, VALUE emesg, VALUE errat, VALUE str, VALUE highlig errat = Qnil; } eclass = CLASS_OF(errinfo); - if (NIL_P(reverse) || NIL_P(highlight)) { + if (NIL_P(reverse)) reverse = Qfalse; + if (NIL_P(highlight)) { VALUE tty = (VALUE)rb_stderr_tty_p(); - if (NIL_P(reverse)) reverse = tty; if (NIL_P(highlight)) highlight = tty; } if (reverse) { diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index 9d7ffd8825..9529fc8013 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -1156,13 +1156,11 @@ $stderr = $stdout; raise "\x82\xa0"') do |outs, errs, status| if Exception.to_tty? assert_match(/\e/, message) message = message.gsub(/\e\[[\d;]*m/, '') - assert_operator(message, :start_with?, remark) - assert_operator(message, :end_with?, bottom) else assert_not_match(/\e/, message) - assert_operator(message, :start_with?, bottom) - assert_operator(message, :end_with?, top) end + assert_operator(message, :start_with?, bottom) + assert_operator(message, :end_with?, top) end def test_exception_in_message |