/*
* This file is part of cparser.
- * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ * Copyright (C) 2007-2009 Matthias Braun <matze@braunis.de>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
unsigned error_count = 0;
/** Number of occurred warnings. */
unsigned warning_count = 0;
+bool show_column = true;
static const source_position_t *curr_pos = NULL;
*/
static void print_source_position(FILE *out, const source_position_t *pos)
{
- fprintf(out, "at line %u", pos->linenr);
+ fprintf(out, "at line %u", pos->lineno);
+ if (show_column)
+ fprintf(out, ":%u", pos->colno);
if (curr_pos == NULL || curr_pos->input_name != pos->input_name)
fprintf(out, " of \"%s\"", pos->input_name);
}
fputc(*f, stderr);
break;
- case 'C': {
- const wint_t val = va_arg(ap, wint_t);
- fprintf(stderr, "%lc", val);
- break;
- }
-
case 'c': {
const unsigned char val = (unsigned char) va_arg(ap, int);
fputc(val, stderr);
break;
}
+ case 'S': {
+ const string_t *str = va_arg(ap, const string_t*);
+ for (size_t i = 0; i < str->size; ++i) {
+ fputc(str->begin[i], stderr);
+ }
+ break;
+ }
+
case 'u': {
const unsigned int val = va_arg(ap, unsigned int);
fprintf(stderr, "%u", val);
case 'Q': {
const unsigned qualifiers = va_arg(ap, unsigned);
- print_type_qualifiers(qualifiers);
+ print_type_qualifiers(qualifiers, QUAL_SEP_NONE);
break;
}
va_end(ap);
}
-static void errorvf(const source_position_t *pos,
- const char *const fmt, va_list ap)
+static void diagnosticposvf(source_position_t const *const pos, char const *const kind, char const *const fmt, va_list ap)
{
- fprintf(stderr, "%s:%u: error: ", pos->input_name, pos->linenr);
- ++error_count;
+ FILE *const out = stderr;
+ fprintf(out, "%s:%u:", pos->input_name, pos->lineno);
+ if (show_column)
+ fprintf(out, "%u:", pos->colno);
+ fprintf(out, " %s: ", kind);
curr_pos = pos;
diagnosticvf(fmt, ap);
- fputc('\n', stderr);
+ fputc('\n', out);
+}
+static void errorvf(const source_position_t *pos,
+ const char *const fmt, va_list ap)
+{
+ ++error_count;
+ diagnosticposvf(pos, "error", fmt, ap);
if (warning.fatal_errors)
exit(EXIT_FAILURE);
}
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);
++warning_count;
- curr_pos = pos;
- diagnosticvf(fmt, ap);
- fputc('\n', stderr);
+ diagnosticposvf(pos, "warning", fmt, ap);
}
void warningf(const source_position_t *pos, const char *const fmt, ...)
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);
- curr_pos = pos;
- diagnosticvf(fmt, ap);
- fputc('\n', stderr);
+ diagnosticposvf(pos, "internal error", fmt, ap);
}
void internal_errorf(const source_position_t *pos, const char *const fmt, ...)