Remove \n from error messages.

[cparser] / token.c

diff --git a/token.c b/token.c
index 1177945..50de656 100644 (file)
--- a/token.c
+++ b/token.c
@@ -70,9 +70,7 @@ void init_tokens(void)
        memset(token_symbols, 0, T_LAST_TOKEN * sizeof(token_symbols[0]));
 
 #define T(mode,x,str,val)  register_token(mode, x, str);
-#define TS(x,str,val)      intern_register_token(x, str);
 #include "tokens.inc"
-#undef TS
 #undef T
 
 #define T(token) register_pp_token(TP_##token, #token);
@@ -97,8 +95,11 @@ void print_token_kind(FILE *f, token_kind_t token_kind)
 char const *get_string_encoding_prefix(string_encoding_t const enc)
 {
        switch (enc) {
-       case STRING_ENCODING_CHAR: return "";
-       case STRING_ENCODING_WIDE: return "L";
+       case STRING_ENCODING_CHAR:   return "";
+       case STRING_ENCODING_CHAR16: return "u";
+       case STRING_ENCODING_CHAR32: return "U";
+       case STRING_ENCODING_UTF8:   return "u8";
+       case STRING_ENCODING_WIDE:   return "L";
        }
        panic("invalid string encoding");
 }
@@ -115,7 +116,6 @@ void print_token(FILE *f, const token_t *token)
                val = token->base.symbol->string;
                break;
 
-       case T_HEADERNAME:
        case T_STRING_LITERAL:
                delim = '"';
                /* FALLTHROUGH */