gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2026-08-20 13:54:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor warning diagnostic code to reduce repeated output logic

Browse Source
This commit is contained in:
Rangi
2026-07-04 23:02:16 -04:00
committed by Rangi
parent de36a11be7
commit 6e643406a2
9 changed files with 174 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/link/warning.cpp
+34 -79
View File
@@ -39,32 +39,6 @@ Diagnostics<WarningLevel, WarningID> warnings = {
};
// clang-format on
static void printDiag(
FileStackNode const *src,
uint32_t lineNo,
char const *fmt,
va_list args,
char const *type,
StyleColor color,
char const *flagfmt,
char const *flag
) {
style_Set(stderr, color, true);
fprintf(stderr, "%s: ", type);
style_Reset(stderr);
vfprintf(stderr, fmt, args);
if (flagfmt) {
style_Set(stderr, color, true);
putc(' ', stderr);
fprintf(stderr, flagfmt, flag);
}
putc('\n', stderr);
if (src) {
src->printBacktrace(lineNo);
}
}
[[noreturn]]
static void abortLinking(char const *verb) {
style_Set(stderr, STYLE_RED, true);
@@ -82,30 +56,36 @@ static void abortLinking(char const *verb) {
void warning(FileStackNode const *src, uint32_t lineNo, char const *fmt, ...) {
va_list args;
va_start(args, fmt);
printDiag(src, lineNo, fmt, args, "warning", STYLE_YELLOW, nullptr, nullptr);
vwarnx(fmt, args);
va_end(args);
if (src) {
src->printBacktrace(lineNo);
}
}
void warning(char const *fmt, ...) {
va_list args;
va_start(args, fmt);
printDiag(nullptr, 0, fmt, args, "warning", STYLE_YELLOW, nullptr, nullptr);
vwarnx(fmt, args);
va_end(args);
}
void error(FileStackNode const *src, uint32_t lineNo, char const *fmt, ...) {
va_list args;
va_start(args, fmt);
printDiag(src, lineNo, fmt, args, "error", STYLE_RED, nullptr, nullptr);
verrorx(fmt, args);
va_end(args);
if (src) {
src->printBacktrace(lineNo);
}
warnings.incrementErrors();
}
void error(char const *fmt, ...) {
va_list args;
va_start(args, fmt);
printDiag(nullptr, 0, fmt, args, "error", STYLE_RED, nullptr, nullptr);
verrorx(fmt, args);
va_end(args);
warnings.incrementErrors();
@@ -114,11 +94,10 @@ void error(char const *fmt, ...) {
void scriptError(char const *fmt, ...) {
va_list args;
va_start(args, fmt);
printDiag(nullptr, 0, fmt, args, "error", STYLE_RED, nullptr, nullptr);
verrorx(fmt, args);
va_end(args);
lexer_TraceCurrent();
warnings.incrementErrors();
}
@@ -126,9 +105,12 @@ void scriptError(char const *fmt, ...) {
void fatal(FileStackNode const *src, uint32_t lineNo, char const *fmt, ...) {
va_list args;
va_start(args, fmt);
printDiag(src, lineNo, fmt, args, "FATAL", STYLE_RED, nullptr, nullptr);
vfatalx(fmt, args);
va_end(args);
if (src) {
src->printBacktrace(lineNo);
}
warnings.incrementErrors();
abortLinking(nullptr);
}
@@ -137,7 +119,7 @@ void fatal(FileStackNode const *src, uint32_t lineNo, char const *fmt, ...) {
void fatal(char const *fmt, ...) {
va_list args;
va_start(args, fmt);
printDiag(nullptr, 0, fmt, args, "FATAL", STYLE_RED, nullptr, nullptr);
vfatalx(fmt, args);
va_end(args);
warnings.incrementErrors();
@@ -154,18 +136,13 @@ void fatalTwo(
...
) {
va_list args;
style_Set(stderr, STYLE_RED, true);
fputs("FATAL: ", stderr);
style_Reset(stderr);
va_start(args, fmt);
vfprintf(stderr, fmt, args);
vfatalx(fmt, args);
va_end(args);
putc('\n', stderr);
src1.printBacktrace(lineNo1);
fputs(" and also:\n", stderr);
src2.printBacktrace(lineNo2);
warnings.incrementErrors();
abortLinking(nullptr);
}
@@ -177,53 +154,31 @@ void requireZeroErrors() {
}
void warning(FileStackNode const *src, uint32_t lineNo, WarningID id, char const *fmt, ...) {
char const *flag = warnings.warningFlags[id].name;
va_list args;
va_start(args, fmt);
switch (warnings.getWarningBehavior(id)) {
case WarningBehavior::DISABLED:
break;
case WarningBehavior::ENABLED:
printDiag(src, lineNo, fmt, args, "warning", STYLE_YELLOW, "[-W%s]", flag);
break;
case WarningBehavior::ERROR:
printDiag(src, lineNo, fmt, args, "error", STYLE_RED, "[-Werror=%s]", flag);
warnings.incrementErrors();
break;
}
WarningBehavior behavior = printDiagnostic(warnings, id, fmt, args);
va_end(args);
if (behavior != WarningBehavior::DISABLED) {
if (src) {
src->printBacktrace(lineNo);
}
if (behavior == WarningBehavior::ERROR) {
warnings.incrementErrors();
}
}
}
void scriptWarning(WarningID id, char const *fmt, ...) {
char const *flag = warnings.warningFlags[id].name;
va_list args;
va_start(args, fmt);
switch (warnings.getWarningBehavior(id)) {
case WarningBehavior::DISABLED:
break;
case WarningBehavior::ENABLED:
printDiag(nullptr, 0, fmt, args, "warning", STYLE_YELLOW, "[-W%s]", flag);
lexer_TraceCurrent();
break;
case WarningBehavior::ERROR:
printDiag(nullptr, 0, fmt, args, "error", STYLE_RED, "[-Werror=%s]", flag);
lexer_TraceCurrent();
warnings.incrementErrors();
break;
}
WarningBehavior behavior = printDiagnostic(warnings, id, fmt, args);
va_end(args);
if (behavior != WarningBehavior::DISABLED) {
lexer_TraceCurrent();
if (behavior == WarningBehavior::ERROR) {
warnings.incrementErrors();
}
}
}