X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=token.c;h=3145d79df82fcd3afa3255fc41823f8eb0ba039e;hb=22d24ddd2209686fa723a62ccc19b7c2eea2d172;hp=31e2a00de95d1cd3ff696cbfbb96f82ea05fcf64;hpb=07431fba71121c10a9b99e32c988cebc0dae5587;p=cparser

diff --git a/token.c b/token.c
index 31e2a00..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
@@ -119,23 +119,30 @@ void print_token_type(FILE *f, token_type_t token_type)
 	}
 }
 
+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, "floating-point 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;
 	}
 }
@@ -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);