From 7a944999163ccefc01673ed18c7ac5b21f5c7e9b Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Tue, 11 Mar 2008 16:40:36 +0000
Subject: [PATCH] More friendly error messages

---
 src/common.h  | 5 +++++
 src/parser.c  | 3 +--
 src/scanner.c | 9 +++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/common.h b/src/common.h
index 493594c..b7403fa 100644
--- a/src/common.h
+++ b/src/common.h
@@ -39,4 +39,9 @@ struct _C99
 	int in_switch;
 };
 
+
+/* functions */
+/* accessors */
+char const * code_get_string(TokenCode code);
+
 #endif /* !C99_C99_H */
diff --git a/src/parser.c b/src/parser.c
index 2eddbe7..28d7ddb 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -100,8 +100,7 @@ static int _parse_check(C99 * c99, TokenCode code)
 	int ret;
 
 	if((ret = (token_get_code(c99->token) != code)))
-		/* FIXME use a string for the code */
-		_parse_error(c99, "%s%x", "Expected code 0x", code);
+		_parse_error(c99, "Expected \"%s\"", code_get_string(code));
 	c99_scan(c99);
 	return ret;
 }
diff --git a/src/scanner.c b/src/scanner.c
index 87eaa71..1b4f493 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -47,6 +47,15 @@ static char * _tokens[] =
 };
 
 
+/* protected */
+/* functions */
+/* accessors */
+char const * code_get_string(TokenCode code)
+{
+	return _tokens[code];
+}
+
+
 /* public */
 /* functions */
 /* useful */