X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=token.c;h=9c35b34d4146877ecb52360698511cd3f406423c;hb=0b51d8dd64a117bfca6119be6d8fd1d35570ee1f;hp=e7c7abc8eb9550e77d7d75edf79827506a1224d0;hpb=3c9d1105cdebe8a419b5e8a2b53e52ef4fa386a0;p=cparser

diff --git a/token.c b/token.c
index e7c7abc..9c35b34 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 };
 
@@ -86,11 +86,6 @@ void exit_tokens(void)
 
 void print_token_kind(FILE *f, token_kind_t token_kind)
 {
-	if(token_kind == T_EOF) {
-		fputs("end of file", f);
-		return;
-	}
-
 	if (token_kind >= lengthof(token_symbols)) {
 		fputs("invalid token", f);
 		return;
@@ -108,46 +103,36 @@ char const *get_string_encoding_prefix(string_encoding_t const enc)
 	panic("invalid string encoding");
 }
 
-static void print_stringrep(const string_t *string, FILE *f)
-{
-	for (size_t i = 0; i < string->size; ++i) {
-		fputc(string->begin[i], f);
-	}
-}
-
 void print_token(FILE *f, const token_t *token)
 {
-	switch(token->kind) {
+	char        delim = '\'';
+	char const *enc   = "";
+	char const *val;
+	switch (token->kind) {
 	case T_IDENTIFIER:
+	case T_MACRO_PARAMETER:
 	case T_UNKNOWN_CHAR:
-		print_token_kind(f, (token_kind_t)token->kind);
-		fprintf(f, " '%s'", token->base.symbol->string);
+		val = token->base.symbol->string;
 		break;
 
+	case T_HEADERNAME:
+	case T_STRING_LITERAL:
+		delim = '"';
+		/* FALLTHROUGH */
+	case T_CHARACTER_CONSTANT:
+		enc = get_string_encoding_prefix(token->literal.string.encoding);
+		/* FALLTHROUGH */
 	case T_NUMBER:
-		fprintf(f, "number '%s'", token->literal.string.begin);
+		val = token->literal.string.begin;
 		break;
 
-		char delim;
-	case T_STRING_LITERAL:     delim = '"';  goto print_string;
-	case T_CHARACTER_CONSTANT: delim = '\''; goto print_string;
-print_string:
-		print_token_kind(f, (token_kind_t)token->kind);
-		fprintf(f, " %s%c", get_string_encoding_prefix(token->literal.string.encoding), delim);
-		print_stringrep(&token->literal.string, f);
-		fputc(delim, f);
-		break;
-
-	default:
-		if (token->base.symbol) {
-			fprintf(f, "'%s'", token->base.symbol->string);
-		} else {
-			fputc('\'', f);
-			print_token_kind(f, (token_kind_t)token->kind);
-			fputc('\'', f);
-		}
-		break;
+	default: {
+		char const *kind  = (token->base.symbol ? token->base.symbol : token_symbols[token->kind])->string;
+		fprintf(f, "'%s'", kind);
+		return;
+	}
 	}
+	fprintf(f, "%s %s%c%s%c", token_symbols[token->kind]->string, enc, delim, val, delim);
 }
 
 bool tokens_would_paste(token_kind_t token1, token_kind_t token2)