eval_error.c: default nil as "reverse" is now false [Feature #8661]

ruby · Apr 21, 2020 · 3ef09c6 · 3ef09c6
1 parent bf11bf3
commit 3ef09c6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -1156,13 +1156,11 @@ def test_full_message
     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