X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=token.c;h=7d2104cef8f2cad94f0c69ac0a77b9d63fbba399;hb=211aaabd26e2f4eab27d054b1984c66904fb45c2;hp=9db11b1273006dda2342138bbe4d0531ed0fc2d1;hpb=c5504016fe0afd83afb11f11ec3e331a526f142a;p=cparser

diff --git a/token.c b/token.c
index 9db11b1..7d2104c 100644
--- 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 */