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

diff --git a/token.c b/token.c
index fd589e9..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,33 +109,40 @@ 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);
 		break;
 	default:
+		fputc('\'', f);
 		print_token_type(f, (token_type_t)token->type);
+		fputc('\'', f);
 		break;
 	}
 }
@@ -159,10 +166,10 @@ void print_pp_token_type(FILE *f, int token_type)
 
 	const symbol_t *symbol = pp_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);
@@ -173,10 +180,10 @@ 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);