kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Refactor out rb_decorate_message from print_errinfo

Browse source 
rb_decorate_message adds bold escape sequences to message, and the class
name of exception (like " (RuntimeError)) of "message (RuntimeError)").
This commit is contained in:
Yusuke Endoh 2022-02-01 17:03:58 +09:00
parent f207f7a193
commit 3af316fa8c
Notes: git 2022-02-22 11:56:16 +09:00
1 changed files with 49 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
eval_error.c
View file

@ -89,11 +89,9 @@ static const char reset[] = CSI_BEGIN""CSI_SGR;
static void static void
print_errinfo(const VALUE eclass, const VALUE errat, const VALUE emesg, const VALUE str, int highlight) print_errinfo(const VALUE eclass, const VALUE errat, const VALUE emesg, const VALUE str, int highlight)
{ {
const char *einfo = "";
long elen = 0; long elen = 0;
VALUE mesg; VALUE mesg;
if (emesg != Qundef) {
if (NIL_P(errat) || RARRAY_LEN(errat) == 0 || if (NIL_P(errat) || RARRAY_LEN(errat) == 0 ||
NIL_P(mesg = RARRAY_AREF(errat, 0))) { NIL_P(mesg = RARRAY_AREF(errat, 0))) {
error_pos(str); error_pos(str);
@ -104,10 +102,8 @@ print_errinfo(const VALUE eclass, const VALUE errat, const VALUE emesg, const VA
} }
if (!NIL_P(emesg)) { if (!NIL_P(emesg)) {
einfo = RSTRING_PTR(emesg);
elen = RSTRING_LEN(emesg); elen = RSTRING_LEN(emesg);
} }
}
if (eclass == rb_eRuntimeError && elen == 0) { if (eclass == rb_eRuntimeError && elen == 0) {
if (highlight) write_warn(str, underline); if (highlight) write_warn(str, underline);
@ -125,6 +121,39 @@ print_errinfo(const VALUE eclass, const VALUE errat, const VALUE emesg, const VA
if (highlight) write_warn(str, reset); if (highlight) write_warn(str, reset);
write_warn(str, "\n"); write_warn(str, "\n");
} }
else {
write_warn_str(str, emesg);
write_warn(str, "\n");
}
}
}
VALUE
rb_decorate_message(const VALUE eclass, const VALUE emesg, int highlight)
{
const char *einfo = "";
long elen = 0;
VALUE str = rb_str_new2("");
if (!NIL_P(emesg)) {
einfo = RSTRING_PTR(emesg);
elen = RSTRING_LEN(emesg);
}
if (eclass == rb_eRuntimeError && elen == 0) {
if (highlight) write_warn(str, underline);
write_warn(str, "unhandled exception");
if (highlight) write_warn(str, reset);
}
else {
VALUE epath;
epath = rb_class_name(eclass);
if (elen == 0) {
if (highlight) write_warn(str, underline);
write_warn_str(str, epath);
if (highlight) write_warn(str, reset);
}
else { else {
/* emesg is a String instance */ /* emesg is a String instance */
const char *tail = 0; const char *tail = 0;
@ -149,25 +178,24 @@ print_errinfo(const VALUE eclass, const VALUE errat, const VALUE emesg, const VA
} }
write_warn2(str, ")", 1); write_warn2(str, ")", 1);
if (highlight) write_warn(str, reset); if (highlight) write_warn(str, reset);
write_warn2(str, "\n", 1);
} }
if (tail && einfo+elen > tail) { if (tail && einfo+elen > tail) {
if (!highlight) { if (!highlight) {
write_warn2(str, "\n", 1);
write_warn2(str, tail, einfo+elen-tail); write_warn2(str, tail, einfo+elen-tail);
if (einfo[elen-1] != '\n') write_warn2(str, "\n", 1);
} }
else { else {
elen -= tail - einfo; elen -= tail - einfo;
einfo = tail; einfo = tail;
write_warn2(str, "\n", 1); write_warn2(str, "\n", 1);
while (elen > 0) { while (elen > 0) {
write_warn2(str, "\n", 1);
tail = memchr(einfo, '\n', elen); tail = memchr(einfo, '\n', elen);
if (!tail || tail > einfo) { if (!tail || tail > einfo) {
write_warn(str, bold); write_warn(str, bold);
write_warn2(str, einfo, tail ? tail-einfo : elen); write_warn2(str, einfo, tail ? tail-einfo : elen);
write_warn(str, reset); write_warn(str, reset);
if (!tail) { if (!tail) {
write_warn2(str, "\n", 1);
break; break;
} }
} }
@ -180,11 +208,10 @@ print_errinfo(const VALUE eclass, const VALUE errat, const VALUE emesg, const VA
} }
} }
} }
else if (!epath) {
write_warn2(str, "\n", 1);
}
} }
} }
return str;
} }
static void static void
@ -257,6 +284,7 @@ show_cause(VALUE errinfo, VALUE str, VALUE highlight, VALUE reverse, long backtr
volatile VALUE eclass = CLASS_OF(cause); volatile VALUE eclass = CLASS_OF(cause);
VALUE errat = rb_get_backtrace(cause); VALUE errat = rb_get_backtrace(cause);
VALUE emesg = rb_get_message(cause); VALUE emesg = rb_get_message(cause);
emesg = rb_decorate_message(eclass, emesg, RTEST(highlight));
if (reverse) { if (reverse) {
show_cause(cause, str, highlight, reverse, backtrace_limit, shown_causes); show_cause(cause, str, highlight, reverse, backtrace_limit, shown_causes);
print_backtrace(eclass, errat, str, TRUE, backtrace_limit); print_backtrace(eclass, errat, str, TRUE, backtrace_limit);
@ -284,6 +312,7 @@ rb_error_write(VALUE errinfo, VALUE emesg, VALUE errat, VALUE str, VALUE highlig
errat = Qnil; errat = Qnil;
} }
eclass = CLASS_OF(errinfo); eclass = CLASS_OF(errinfo);
emesg = rb_decorate_message(eclass, emesg, RTEST(highlight));
if (reverse) { if (reverse) {
static const char traceback[] = "Traceback " static const char traceback[] = "Traceback "
"(most recent call last):\n"; "(most recent call last):\n";