X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=token.c;h=31e2a00de95d1cd3ff696cbfbb96f82ea05fcf64;hb=17bd55e2d79b4f83671cfae9f15bee62ba4d0829;hp=bdb331aff836e5ec261bf563be33e3bbca026ce1;hpb=68a770de4603c696518d3dd2f278985262a1a2a2;p=cparser

diff --git a/token.c b/token.c
index bdb331a..31e2a00 100644
--- a/token.c
+++ b/token.c
@@ -51,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"
 
@@ -65,15 +67,19 @@ void init_tokens(void)
 #undef T
 
 #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;                             \
-	pp_token_symbols[TP_##x] = symbol;
+	if (c_mode & (mode)) {                                         \
+		assert(TP_##x >= 0 && TP_##x < TP_LAST_TOKEN);             \
+		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);           \
-	pp_token_symbols[TP_##x] = symbol;
+	if (pp_token_symbols[TP_##x] == NULL)                          \
+		pp_token_symbols[TP_##x] = symbol;
 
 #include "tokens_preprocessor.inc"
 
@@ -103,10 +109,10 @@ void print_token_type(FILE *f, token_type_t token_type)
 
 	const symbol_t *symbol = token_symbols[token_type];
 	if(symbol != NULL) {
-		fprintf(f, "'%s'", symbol->string);
+		fputs(symbol->string, f);
 	} else {
 		if(token_type >= 0 && token_type < 256) {
-			fprintf(f, "'%c'", token_type);
+			fputc(token_type, f);
 			return;
 		}
 		fputs("unknown token", f);
@@ -117,16 +123,16 @@ void print_token(FILE *f, const token_t *token)
 {
 	switch(token->type) {
 	case T_IDENTIFIER:
-		fprintf(f, "symbol '%s'", token->v.symbol->string);
+		fprintf(f, "symbol %s", token->v.symbol->string);
 		break;
 	case T_INTEGER:
 		fprintf(f, "integer number %lld", token->v.intvalue);
 		break;
 	case T_FLOATINGPOINT:
-		fprintf(f, "floatingpointer number %LF", token->v.floatvalue);
+		fprintf(f, "floating-point number %LF", token->v.floatvalue);
 		break;
 	case T_STRING_LITERAL:
-		fprintf(f, "string '%s'", token->v.string.begin); /* TODO suboptimal */
+		fprintf(f, "string \"%s\"", token->v.string.begin);
 		break;
 	default:
 		print_token_type(f, (token_type_t)token->type);
@@ -134,29 +140,29 @@ void print_token(FILE *f, const token_t *token)
 	}
 }
 
-void print_pp_token_type(FILE *f, preprocessor_token_type_t token_type)
+void print_pp_token_type(FILE *f, int token_type)
 {
-	if(token_type == TP_EOF) {
+	if (token_type == TP_EOF) {
 		fputs("end of file", f);
 		return;
 	}
-	if(token_type == TP_ERROR) {
+	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) {
+	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);
+	if (symbol != NULL) {
+		fputs(symbol->string, f);
 	} else {
 		if(token_type >= 0 && token_type < 256) {
-			fprintf(f, "'%c'", token_type);
+			fputc(token_type, f);
 			return;
 		}
 		fputs("unknown token", f);
@@ -167,13 +173,13 @@ 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);
+		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);
+		fprintf(f, "string \"%s\"", token->v.string.begin);
 		break;
 	default:
 		print_pp_token_type(f, (preprocessor_token_type_t) token->type);