Add eat_token() for more clarity in the preprocessor.

[cparser] / diagnostic.c

diff --git a/diagnostic.c b/diagnostic.c
index 59db260..27fdda9 100644 (file)
--- a/diagnostic.c
+++ b/diagnostic.c
@@ -29,8 +29,6 @@
 #include "type.h"
 #include "warning.h"
 
-/** Number of occurred diagnostics. */
-unsigned diagnostic_count        = 0;
 /** Number of occurred errors. */
 unsigned error_count             = 0;
 /** Number of occurred warnings. */
@@ -52,6 +50,25 @@ static void print_source_position(FILE *out, const source_position_t *pos)
                fprintf(out, " of \"%s\"", pos->input_name);
 }
 
+static void fpututf32(utf32 const c, FILE *const out)
+{
+       if (c < 0x80U) {
+               fputc(c, out);
+       } else if (c < 0x800) {
+               fputc(0xC0 | (c >> 6), out);
+               fputc(0x80 | (c & 0x3F), out);
+       } else if (c < 0x10000) {
+               fputc(0xE0 | ( c >> 12), out);
+               fputc(0x80 | ((c >>  6) & 0x3F), out);
+               fputc(0x80 | ( c        & 0x3F), out);
+       } else {
+               fputc(0xF0 | ( c >> 18), out);
+               fputc(0x80 | ((c >> 12) & 0x3F), out);
+               fputc(0x80 | ((c >>  6) & 0x3F), out);
+               fputc(0x80 | ( c        & 0x3F), out);
+       }
+}
+
 /**
  * Issue a diagnostic message.
  */
@@ -63,10 +80,12 @@ static void diagnosticvf(char const *fmt, va_list ap)
 
                bool extended  = false;
                bool flag_zero = false;
+               bool flag_long = false;
                for (;; ++f) {
                        switch (*f) {
                        case '#': extended  = true; break;
                        case '0': flag_zero = true; break;
+                       case 'l': flag_long = true; break;
                        default:  goto done_flags;
                        }
                }
@@ -84,8 +103,13 @@ done_flags:;
                        break;
 
                case 'c': {
-                       const unsigned char val = (unsigned char) va_arg(ap, int);
-                       fputc(val, stderr);
+                       if (flag_long) {
+                               const utf32 val = va_arg(ap, utf32);
+                               fpututf32(val, stderr);
+                       } else {
+                               const unsigned char val = (unsigned char) va_arg(ap, int);
+                               fputc(val, stderr);
+                       }
                        break;
                }
 
@@ -153,12 +177,6 @@ done_flags:;
                        break;
                }
 
-               case 't': {
-                       const token_t *const token = va_arg(ap, const token_t*);
-                       print_pp_token(stderr, token);
-                       break;
-               }
-
                case 'K': {
                        const token_t* const token = va_arg(ap, const token_t*);
                        print_token(stderr, token);
@@ -171,7 +189,7 @@ done_flags:;
                                va_list*          toks      = va_arg(ap, va_list*);
                                const char* const delimiter = va_arg(ap, const char*);
                                for (;;) {
-                                       const token_kind_t tok = va_arg(*toks, token_kind_t);
+                                       const token_kind_t tok = (token_kind_t)va_arg(*toks, int);
                                        if (tok == 0)
                                                break;
                                        if (first) {
@@ -182,7 +200,7 @@ done_flags:;
                                        print_token_kind(stderr, tok);
                                }
                        } else {
-                               const token_kind_t token = va_arg(ap, token_kind_t);
+                               const token_kind_t token = (token_kind_t)va_arg(ap, int);
                                print_token_kind(stderr, token);
                        }
                        break;
@@ -221,7 +239,6 @@ void diagnosticf(const char *const fmt, ...)
 {
        va_list ap;
        va_start(ap, fmt);
-       ++diagnostic_count;
        curr_pos = NULL;
        diagnosticvf(fmt, ap);
        va_end(ap);
@@ -241,7 +258,6 @@ static void diagnosticposvf(source_position_t const *const pos, char const *cons
 static void errorvf(const source_position_t *pos,
                     const char *const fmt, va_list ap)
 {
-       curr_pos = pos;
        ++error_count;
        diagnosticposvf(pos, "error", fmt, ap);
        fputc('\n', stderr);
@@ -296,7 +312,6 @@ 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();