X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=token.c;h=fd589e9dc345552b5cb3f91b3d3e606db53d5bc4;hb=a25daef22bc375bea28f7c8965c69edec5679e84;hp=c2d5345f0922bb8ee34d90530bdc8883a9cda8c4;hpb=0e0faae013a4302a0cc4f6e465301a82483e0a52;p=cparser

diff --git a/token.c b/token.c
index c2d5345..fd589e9 100644
--- a/token.c
+++ b/token.c
@@ -1,6 +1,26 @@
+/*
+ * This file is part of cparser.
+ * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
 #include <config.h>
 
 #include "token_t.h"
+#include "symbol_t.h"
 
 #include <assert.h>
 #include <stdio.h>
@@ -10,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)
 {
@@ -19,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) {                                             \
@@ -29,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"
 
@@ -43,9 +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;
+	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);           \
+	if (pp_token_symbols[TP_##x] == NULL)                          \
+		pp_token_symbols[TP_##x] = symbol;
 
 #include "tokens_preprocessor.inc"
 
@@ -75,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);
+		fprintf(f, "%s", symbol->string);
 	} else {
 		if(token_type >= 0 && token_type < 256) {
-			fprintf(f, "'%c'", token_type);
+			fprintf(f, "%c", token_type);
 			return;
 		}
 		fputs("unknown token", f);
@@ -89,7 +123,7 @@ 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);
@@ -98,10 +132,57 @@ void print_token(FILE *f, const token_t *token)
 		fprintf(f, "floatingpointer 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);
 		break;
 	}
 }
+
+void print_pp_token_type(FILE *f, int 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;
+	}
+}