Rewrite expect(): Do not jump on error anymore, but keep on parsing.

[cparser] / diagnostic.c

diff --git a/diagnostic.c b/diagnostic.c
index b2ba266..a0b40e6 100644 (file)
--- a/diagnostic.c
+++ b/diagnostic.c
@@ -47,7 +47,7 @@ static void print_source_position(FILE *out, const source_position_t *pos)
 {
        fprintf(out, "at line %u", pos->lineno);
        if (show_column)
-               fprintf(out, ":%u", pos->colno);
+               fprintf(out, ":%u", (unsigned)pos->colno);
        if (curr_pos == NULL || curr_pos->input_name != pos->input_name)
                fprintf(out, " of \"%s\"", pos->input_name);
 }
@@ -153,7 +153,7 @@ static void diagnosticvf(const char *const fmt, va_list ap)
                                                va_list*          toks      = va_arg(ap, va_list*);
                                                const char* const delimiter = va_arg(ap, const char*);
                                                for (;;) {
-                                                       const token_type_t tok = va_arg(*toks, token_type_t);
+                                                       const token_kind_t tok = va_arg(*toks, token_kind_t);
                                                        if (tok == 0)
                                                                break;
                                                        if (first) {
@@ -161,11 +161,11 @@ static void diagnosticvf(const char *const fmt, va_list ap)
                                                        } else {
                                                                fputs(delimiter, stderr);
                                                        }
-                                                       print_token_type(stderr, tok);
+                                                       print_token_kind(stderr, tok);
                                                }
                                        } else {
-                                               const token_type_t token = va_arg(ap, token_type_t);
-                                               print_token_type(stderr, token);
+                                               const token_kind_t token = va_arg(ap, token_kind_t);
+                                               print_token_kind(stderr, token);
                                        }
                                        break;
                                }
@@ -216,7 +216,7 @@ static void diagnosticposvf(source_position_t const *const pos, char const *cons
        FILE *const out = stderr;
        fprintf(out, "%s:%u:", pos->input_name, pos->lineno);
        if (show_column)
-               fprintf(out, "%u:", pos->colno);
+               fprintf(out, "%u:", (unsigned)pos->colno);
        fprintf(out, " %s: ", kind);
        curr_pos = pos;
        diagnosticvf(fmt, ap);
@@ -246,7 +246,7 @@ void warningf(warning_t const warn, source_position_t const* pos, char const *co
        va_list ap;
        va_start(ap, fmt);
        warning_switch_t const *const s = get_warn_switch(warn);
-       switch (s->state) {
+       switch ((unsigned) s->state) {
                        char const* kind;
                case WARN_STATE_ON:
                        if (is_warn_on(WARN_ERROR)) {