X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=token.c;h=946f5100fa19151dfae3b6b1978704e0441be361;hb=2e3abfd2c062bbe1b97f4b887672295842265df4;hp=9588981837ce18ad2dc7a9bc68a8d79dca6da607;hpb=fd16b92f058181088a385c3224c8814831c006d3;p=cparser

diff --git a/token.c b/token.c
index 9588981..946f510 100644
--- a/token.c
+++ b/token.c
@@ -20,6 +20,7 @@
 #include <config.h>
 
 #include "token_t.h"
+#include "symbol_t.h"
 
 #include <assert.h>
 #include <stdio.h>
@@ -29,8 +30,9 @@
 #include "adt/array.h"
 
 static symbol_t *token_symbols[T_LAST_TOKEN];
+static symbol_t *pp_token_symbols[TP_LAST_TOKEN];
 
-source_position_t builtin_source_position = { "<built-in>", 0 };
+const source_position_t builtin_source_position = { "<built-in>", 0 };
 
 void init_tokens(void)
 {
@@ -38,6 +40,7 @@ void init_tokens(void)
 	int       last_id = -2;
 
 	memset(token_symbols, 0, T_LAST_TOKEN * sizeof(token_symbols[0]));
+	memset(pp_token_symbols, 0, TP_LAST_TOKEN * sizeof(pp_token_symbols[0]));
 
 #define T(mode,x,str,val)                                          \
 	if (T_##x > 255) {                                             \
@@ -48,13 +51,15 @@ void init_tokens(void)
 		assert(T_##x >= 0 && T_##x < T_LAST_TOKEN);                \
 		symbol               = symbol_table_insert(str);           \
 		symbol->ID           = T_##x;                              \
-		token_symbols[T_##x] = symbol;                             \
+		if (token_symbols[T_##x] == NULL)                          \
+			token_symbols[T_##x] = symbol;                         \
 	}
 
 #define TS(x,str,val)                                              \
 	assert(T_##x >= 0 && T_##x < T_LAST_TOKEN);                    \
 	symbol               = symbol_table_insert(str);               \
-	token_symbols[T_##x] = symbol;
+	if (token_symbols[T_##x] == NULL)                              \
+		token_symbols[T_##x] = symbol;                             \
 
 #include "tokens.inc"
 
@@ -63,8 +68,16 @@ void init_tokens(void)
 
 #define T(mode,x,str,val)                                          \
 	assert(TP_##x >= 0 && TP_##x < TP_LAST_TOKEN);                 \
-	symbol               = symbol_table_insert(str);               \
-	symbol->pp_ID        = TP_##x;
+	symbol                   = symbol_table_insert(str);           \
+	symbol->pp_ID            = TP_##x;                             \
+	if (pp_token_symbols[TP_##x] == NULL)                          \
+		pp_token_symbols[TP_##x] = symbol;
+
+#define TS(x,str,val)                                              \
+	assert(TP_##x >= 0 && TP_##x < T_LAST_TOKEN);                  \
+	symbol                   = symbol_table_insert(str);           \
+	if (pp_token_symbols[TP_##x] == NULL)                          \
+		pp_token_symbols[TP_##x] = symbol;
 
 #include "tokens_preprocessor.inc"
 
@@ -124,3 +137,50 @@ void print_token(FILE *f, const token_t *token)
 		break;
 	}
 }
+
+void print_pp_token_type(FILE *f, preprocessor_token_type_t token_type)
+{
+	if(token_type == TP_EOF) {
+		fputs("end of file", f);
+		return;
+	}
+	if(token_type == TP_ERROR) {
+		fputs("error", f);
+		return;
+	}
+
+	int token_symbols_len = TP_LAST_TOKEN;
+	if(token_type < 0 || token_type >= token_symbols_len) {
+		fputs("invalid token", f);
+		return;
+	}
+
+	const symbol_t *symbol = pp_token_symbols[token_type];
+	if(symbol != NULL) {
+		fprintf(f, "'%s'", symbol->string);
+	} else {
+		if(token_type >= 0 && token_type < 256) {
+			fprintf(f, "'%c'", token_type);
+			return;
+		}
+		fputs("unknown token", f);
+	}
+}
+
+void print_pp_token(FILE *f, const token_t *token)
+{
+	switch((preprocessor_token_type_t) token->type) {
+	case TP_IDENTIFIER:
+		fprintf(f, "symbol '%s'", token->v.symbol->string);
+		break;
+	case TP_NUMBER:
+		fprintf(f, "number %s", token->v.string.begin);
+		break;
+	case TP_STRING_LITERAL:
+		fprintf(f, "string '%s'", token->v.string.begin);
+		break;
+	default:
+		print_pp_token_type(f, (preprocessor_token_type_t) token->type);
+		break;
+	}
+}