Route all computed goto statements of a function through one IJmp.

[cparser] / token.c

diff --git a/token.c b/token.c
index 9db11b1..7d2104c 100644 (file)
--- a/token.c
+++ b/token.c
@@ -31,7 +31,7 @@
 #include "adt/error.h"
 #include "adt/util.h"
 
-static symbol_t *token_symbols[T_LAST_TOKEN];
+symbol_t *token_symbols[T_LAST_TOKEN];
 
 const source_position_t builtin_source_position = { "<built-in>", 0, 0, true };
 
@@ -69,10 +69,8 @@ void init_tokens(void)
 {
        memset(token_symbols, 0, T_LAST_TOKEN * sizeof(token_symbols[0]));
 
-#define T(mode,x,str,val)  register_token(mode, T_##x, str);
-#define TS(x,str,val)      intern_register_token(T_##x, str);
+#define T(mode,x,str,val)  register_token(mode, x, str);
 #include "tokens.inc"
-#undef TS
 #undef T
 
 #define T(token) register_pp_token(TP_##token, #token);
@@ -110,11 +108,11 @@ void print_token(FILE *f, const token_t *token)
        char const *val;
        switch (token->kind) {
        case T_IDENTIFIER:
+       case T_MACRO_PARAMETER:
        case T_UNKNOWN_CHAR:
                val = token->base.symbol->string;
                break;
 
-       case T_HEADERNAME:
        case T_STRING_LITERAL:
                delim = '"';
                /* FALLTHROUGH */