/** true if warnings should be inhibited */
bool inhibit_all_warnings = false;
+static const source_position_t *curr_pos = NULL;
+
+/**
+ * prints an additional source position
+ */
+static void print_source_position(FILE *out, const source_position_t *pos) {
+ fprintf(out, "at line %u", pos->linenr);
+ if (curr_pos == NULL || curr_pos->input_name != pos->input_name)
+ fprintf(out, " of \"%s\"", pos->input_name);
+}
+
/**
* Issue a diagnostic message.
*/
break;
}
+ case 'u': {
+ const unsigned int val = va_arg(ap, unsigned int);
+ fprintf(stderr, "%u", val);
+ break;
+ }
+
case 'Y': {
const symbol_t *const symbol = va_arg(ap, const symbol_t*);
- fputs(symbol->string, stderr);
+ if (symbol == NULL)
+ fputs("(null)", stderr);
+ else
+ fputs(symbol->string, stderr);
break;
}
case 'k': {
if (extended) {
- bool first = false;
+ bool first = true;
va_list* toks = va_arg(ap, va_list*);
const char* const delimiter = va_arg(ap, const char*);
for (;;) {
break;
}
+ case 'P': {
+ const source_position_t *pos = va_arg(ap, const source_position_t *);
+ print_source_position(stderr, pos);
+ break;
+ }
+
default:
panic("unknown format specifier");
}
va_list ap;
va_start(ap, fmt);
++diagnostic_count;
+ curr_pos = NULL;
diagnosticvf(fmt, ap);
va_end(ap);
}
-static void errorvf(const source_position_t pos,
+static void errorvf(const source_position_t *pos,
const char *const fmt, va_list ap)
{
- fprintf(stderr, "%s:%u: error: ", pos.input_name, pos.linenr);
+ fprintf(stderr, "%s:%u: error: ", pos->input_name, pos->linenr);
++error_count;
+ curr_pos = pos;
diagnosticvf(fmt, ap);
fputc('\n', stderr);
exit(EXIT_FAILURE);
}
-void errorf(const source_position_t pos, const char *const fmt, ...)
+void errorf(const source_position_t *pos, const char *const fmt, ...)
{
va_list ap;
va_start(ap, fmt);
+ curr_pos = pos;
errorvf(pos, fmt, ap);
va_end(ap);
}
-static void warningvf(const source_position_t pos,
+static void warningvf(const source_position_t *pos,
const char *const fmt, va_list ap)
{
- fprintf(stderr, "%s:%u: warning: ", pos.input_name, pos.linenr);
+ fprintf(stderr, "%s:%u: warning: ", pos->input_name, pos->linenr);
++warning_count;
+ curr_pos = pos;
diagnosticvf(fmt, ap);
fputc('\n', stderr);
}
-void warningf(const source_position_t pos, const char *const fmt, ...)
+void warningf(const source_position_t *pos, const char *const fmt, ...)
{
if (inhibit_all_warnings)
return;
va_list ap;
va_start(ap, fmt);
+ curr_pos = pos;
if (warning.s_are_errors) {
errorvf(pos, fmt, ap);
} else {
va_end(ap);
}
-static void internal_errorvf(const source_position_t pos,
+static void internal_errorvf(const source_position_t *pos,
const char *const fmt, va_list ap)
{
- fprintf(stderr, "%s:%u: internal error: ", pos.input_name, pos.linenr);
+ fprintf(stderr, "%s:%u: internal error: ", pos->input_name, pos->linenr);
+ curr_pos = pos;
diagnosticvf(fmt, ap);
fputc('\n', stderr);
}
-void internal_errorf(const source_position_t pos, const char *const fmt, ...)
+void internal_errorf(const source_position_t *pos, const char *const fmt, ...)
{
va_list ap;
va_start(ap, fmt);
+ curr_pos = pos;
internal_errorvf(pos, fmt, ap);
va_end(ap);
abort();