From: Etienne Bergeron <etienneb@google.com>
Date: Tue, 2 Apr 2013 23:24:22 +0000 (-0400)
Subject: Print error on invalid token
X-Git-Tag: v1.1.1~61
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=d4050a6975dffde3b369258ef7d2d9f32371ace9

Print error on invalid token

Includes an optimisation for ignored token parsing.

Signed-off-by: Etienne Bergeron <etienneb@google.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/formats/ctf/metadata/ctf-lexer.l b/formats/ctf/metadata/ctf-lexer.l
index 905da991..c79b6c83 100644
--- a/formats/ctf/metadata/ctf-lexer.l
+++ b/formats/ctf/metadata/ctf-lexer.l
@@ -133,6 +133,6 @@ _Imaginary			setstring(yyextra, yylval, yytext); return _IMAGINARY;
 0{OCTALDIGIT}*{INTEGER_SUFFIX}?	setstring(yyextra, yylval, yytext); return OCTAL_CONSTANT;
 0[xX]{HEXDIGIT}+{INTEGER_SUFFIX}?	setstring(yyextra, yylval, yytext); return HEXADECIMAL_CONSTANT;
 {IDENTIFIER}			printf_debug("<IDENTIFIER %s>\n", yytext); setstring(yyextra, yylval, yytext); if (is_type(yyextra, yytext)) return ID_TYPE; else return IDENTIFIER;
-[ \t\n\r]+			; /* ignore */
-.				return ERROR;
+[ \t\r\n]			; /* ignore */
+.				printfl_error(yylineno, "invalid character '0x%02X'", yytext[0]);  return ERROR;
 %%