From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sat, 30 Mar 2013 15:16:59 +0000 (-0400)
Subject: Show token in CTF parser error
X-Git-Tag: v1.1.1~67
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=740aad2620e2ea0714b28778b1a47b2b2e1a4760

Show token in CTF parser error

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/formats/ctf/metadata/ctf-parser.y b/formats/ctf/metadata/ctf-parser.y
index 912f1212..6397f428 100644
--- a/formats/ctf/metadata/ctf-parser.y
+++ b/formats/ctf/metadata/ctf-parser.y
@@ -67,6 +67,8 @@ BT_HIDDEN
 void yyrestart(FILE * in_str, yyscan_t scanner);
 BT_HIDDEN
 int yyget_lineno(yyscan_t yyscanner);
+BT_HIDDEN
+char *yyget_text(yyscan_t yyscanner);
 
 struct gc_string {
 	struct bt_list_head gc;
@@ -820,8 +822,9 @@ static int set_parent_node(struct ctf_node *node,
 BT_HIDDEN
 void yyerror(struct ctf_scanner *scanner, const char *str)
 {
-	fprintf(stderr, "error at line %d: %s\n",
-		yyget_lineno(scanner->scanner), str);
+	fprintf(stderr, "error at line %d, token \"%s\": %s\n",
+		yyget_lineno(scanner->scanner),
+		yyget_text(scanner->scanner), str);
 }
  
 BT_HIDDEN