X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=token.c;h=3145d79df82fcd3afa3255fc41823f8eb0ba039e;hb=fbc026427aa34c595fea99e4d4608c76ea7c55c4;hp=ad4dc0d15e6994c5cd5685787ad77e6193c12e18;hpb=7730baff98a8ac2975b9550291ee78f19e14cd7e;p=cparser

diff --git a/token.c b/token.c
index ad4dc0d..3145d79 100644
--- a/token.c
+++ b/token.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ * Copyright (C) 2007-2009 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
@@ -109,60 +109,67 @@ 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);
 	}
 }
 
+symbol_t *get_token_symbol(const token_t *token)
+{
+	return token_symbols[token->type];
+}
+
 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, "identifier '%s'", token->v.symbol->string);
 		break;
 	case T_INTEGER:
-		fprintf(f, "integer number %lld", token->v.intvalue);
+		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:
+		fputc('\'', f);
 		print_token_type(f, (token_type_t)token->type);
+		fputc('\'', f);
 		break;
 	}
 }
 
-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);
@@ -173,13 +180,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, "identifier '%s'", token->v.symbol->string);
 		break;
 	case TP_NUMBER:
-		fprintf(f, "number %s", token->v.string.begin);
+		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);