X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=token.c;h=7c8fbe54972c38b8a558681fd4f1a37c67909a14;hb=6a9cb81d6a96969b8608d395820f20d5b0d5baaa;hp=3145d79df82fcd3afa3255fc41823f8eb0ba039e;hpb=6d7d61de445629e1590d3a2ba2990ef7a651368a;p=cparser

diff --git a/token.c b/token.c
index 3145d79..7c8fbe5 100644
--- a/token.c
+++ b/token.c
@@ -34,55 +34,65 @@ static symbol_t *pp_token_symbols[TP_LAST_TOKEN];
 
 const source_position_t builtin_source_position = { "<built-in>", 0 };
 
-void init_tokens(void)
+static int last_id;
+
+static symbol_t *intern_register_token(token_type_t id, const char *string)
 {
-	symbol_t *symbol;
-	int       last_id = -2;
+	assert(0 <= id && id < T_LAST_TOKEN);
+	symbol_t *symbol = symbol_table_insert(string);
+	if (token_symbols[id] == NULL)
+		token_symbols[id] = symbol;
+	return symbol;
+}
 
-	memset(token_symbols, 0, T_LAST_TOKEN * sizeof(token_symbols[0]));
-	memset(pp_token_symbols, 0, TP_LAST_TOKEN * sizeof(pp_token_symbols[0]));
+static symbol_t *intern_register_pp_token(token_type_t id, const char *string)
+{
+	assert(0 <= id && id < TP_LAST_TOKEN);
+	symbol_t *symbol = symbol_table_insert(string);
+	if (pp_token_symbols[id] == NULL)
+		pp_token_symbols[id] = symbol;
+	return symbol;
+}
 
-#define T(mode,x,str,val)                                          \
-	if (T_##x > 255) {                                             \
-		assert(T_##x >= last_id);                                  \
-		last_id = T_##x;                                           \
-	}                                                              \
-	if (c_mode & (mode)) {                                         \
-		assert(T_##x >= 0 && T_##x < T_LAST_TOKEN);                \
-		symbol               = symbol_table_insert(str);           \
-		symbol->ID           = T_##x;                              \
-		if (token_symbols[T_##x] == NULL)                          \
-			token_symbols[T_##x] = symbol;                         \
+static void register_token(unsigned mode, token_type_t id, const char *string)
+{
+	if (id > 255) {
+		assert(id >= last_id);
+		last_id = id;
+	}
+	if (c_mode & mode) {
+		symbol_t *symbol = intern_register_token(id, string);
+		symbol->ID = id;
 	}
+}
 
-#define TS(x,str,val)                                              \
-	assert(T_##x >= 0 && T_##x < T_LAST_TOKEN);                    \
-	symbol               = symbol_table_insert(str);               \
-	if (token_symbols[T_##x] == NULL)                              \
-		token_symbols[T_##x] = symbol;                             \
+static void register_pp_token(unsigned mode, token_type_t id,
+                              const char *string)
+{
+	if (! (c_mode & mode))
+		return;
 
-#include "tokens.inc"
+	symbol_t *symbol = intern_register_token(id, string);
+	symbol->pp_ID = id;
+}
 
-#undef TS
-#undef T
+void init_tokens(void)
+{
+	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 (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;                     \
-	}
+	last_id = -2;
 
-#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;
+#define T(mode,x,str,val)  register_token(mode, T_##x, str);
+#define TS(x,str,val)      intern_register_token(T_##x, str);
+#include "tokens.inc"
+#undef TS
+#undef T
 
+#define T(mode,x,str,val)  register_pp_token(mode, TP_##x, str);
+#define TS(x,str,val)      intern_register_pp_token(TP_##x, str);
 #include "tokens_preprocessor.inc"
-
+#undef TS
 #undef T
 }
 
@@ -124,20 +134,42 @@ symbol_t *get_token_symbol(const token_t *token)
 	return token_symbols[token->type];
 }
 
+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->type) {
 	case T_IDENTIFIER:
-		fprintf(f, "identifier '%s'", token->v.symbol->string);
+		fprintf(f, "identifier '%s'", token->symbol->string);
 		break;
 	case T_INTEGER:
-		fprintf(f, "integer number '%lld'", token->v.intvalue);
-		break;
+	case T_INTEGER_OCTAL:
+	case T_INTEGER_HEXADECIMAL:
 	case T_FLOATINGPOINT:
-		fprintf(f, "floating-point number '%LF'", token->v.floatvalue);
+	case T_FLOATINGPOINT_HEXADECIMAL:
+		print_token_type(f, (token_type_t)token->type);
+		fputs(" '", f);
+		print_stringrep(&token->literal, f);
+		if (token->symbol != NULL)
+			fputs(token->symbol->string, f);
+		fputc('\'', f);
 		break;
+	case T_WIDE_STRING_LITERAL:
 	case T_STRING_LITERAL:
-		fprintf(f, "string \"%s\"", token->v.string.begin);
+		print_token_type(f, (token_type_t)token->type);
+		fprintf(f, " \"%s\"", token->literal.begin);
+		break;
+	case T_CHARACTER_CONSTANT:
+	case T_WIDE_CHARACTER_CONSTANT:
+		print_token_type(f, (token_type_t)token->type);
+		fputs(" \'", f);
+		print_stringrep(&token->literal, f);
+		fputs("'", f);
 		break;
 	default:
 		fputc('\'', f);
@@ -180,13 +212,13 @@ void print_pp_token(FILE *f, const token_t *token)
 {
 	switch((preprocessor_token_type_t) token->type) {
 	case TP_IDENTIFIER:
-		fprintf(f, "identifier '%s'", token->v.symbol->string);
+		fprintf(f, "identifier '%s'", token->symbol->string);
 		break;
 	case TP_NUMBER:
-		fprintf(f, "number '%s'", token->v.string.begin);
+		fprintf(f, "number '%s'", token->literal.begin);
 		break;
 	case TP_STRING_LITERAL:
-		fprintf(f, "string \"%s\"", token->v.string.begin);
+		fprintf(f, "string \"%s\"", token->literal.begin);
 		break;
 	default:
 		print_pp_token_type(f, (preprocessor_token_type_t) token->type);