summaryrefslogtreecommitdiff
path: root/eval_error.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-23 08:39:03 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-23 08:39:03 +0000
commitdaad618740a3ce9e266086cf7dfa7adcfb239a20 ()
treebb42a78b3bb679b411ff2a951cac81adba488e3f /eval_error.c
parent28278b836beae2370f6c596713061a1fd4e104e7 (diff)
eval_error.c: rb_error_write flags
* eval_error.c (rb_error_write): add highlight and reverse mode flags. defaulted to rb_stderr_tty_p() if Qnil. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--eval_error.c42
1 files changed, 33 insertions, 9 deletions
@@ -79,12 +79,16 @@ error_print(rb_execution_context_t *ec)
rb_ec_error_print(ec, ec->errinfo);
}
static void
print_errinfo(const VALUE eclass, const VALUE errat, const VALUE emesg, const VALUE str, int highlight)
{
- static const char underline[] = "\033[4;1m";
- static const char bold[] = "\033[1m";
- static const char reset[] = "\033[m";
const char *einfo = "";
long elen = 0;
VALUE mesg;
@@ -199,7 +203,7 @@ print_backtrace(const VALUE eclass, const VALUE errat, const VALUE str, int reve
}
void
-rb_error_write(VALUE errinfo, VALUE errat, VALUE str)
{
volatile VALUE eclass = Qundef, emesg = Qundef;
@@ -216,13 +220,33 @@ rb_error_write(VALUE errinfo, VALUE errat, VALUE str)
emesg = e;
}
}
- if (rb_stderr_tty_p()) {
- write_warn(str, "\033[1mTraceback \033[m(most recent call last):\n");
print_backtrace(eclass, errat, str, TRUE);
- print_errinfo(eclass, errat, emesg, str, TRUE);
}
else {
- print_errinfo(eclass, errat, emesg, str, FALSE);
print_backtrace(eclass, errat, str, FALSE);
}
}
@@ -242,7 +266,7 @@ rb_ec_error_print(rb_execution_context_t * volatile ec, volatile VALUE errinfo)
errat = rb_get_backtrace(errinfo);
}
- rb_error_write(errinfo, errat, Qnil);
EC_POP_TAG();
ec->errinfo = errinfo;