X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-lexer.l;h=a282bf7a473d6a8bd04ab3feba5906e801a7a213;hp=a779397479013a3ae4b86507a36a8b731db631b6;hb=d876a5baf224612e7e44d3cfda2dc1d57ea91ea4;hpb=e0734b961129b5d328a6a6d751c00b45036874e6

diff --git a/formats/ctf/metadata/ctf-lexer.l b/formats/ctf/metadata/ctf-lexer.l
index a7793974..a282bf7a 100644
--- a/formats/ctf/metadata/ctf-lexer.l
+++ b/formats/ctf/metadata/ctf-lexer.l
@@ -38,6 +38,9 @@ static void yyunput (int c, register char * yy_bp , yyscan_t yyscanner)
 	__attribute__((unused));
 static int input (yyscan_t yyscanner) __attribute__((unused));
 
+BT_HIDDEN
+int import_string(struct ctf_scanner *scanner, YYSTYPE *lvalp, const char *src, char delim);
+
 %}
 
 %x comment_ml comment_sl string_lit char_const
@@ -53,7 +56,6 @@ UCHARLOWERCASE			\\u{HEXDIGIT}{4}
 UCHARUPPERCASE			\\U{HEXDIGIT}{8}
 ID_NONDIGIT			{NONDIGIT}|{UCHARLOWERCASE}|{UCHARUPPERCASE}
 IDENTIFIER			{ID_NONDIGIT}({ID_NONDIGIT}|{DIGIT})*
-ESCSEQ				\\(\'|\"|\?|\\|a|b|f|n|r|t|v|{OCTALDIGIT}{1,3}|u{HEXDIGIT}{4}|U{HEXDIGIT}{8}|x{HEXDIGIT}+)
 %%
 
 				/*
@@ -64,23 +66,14 @@ ESCSEQ				\\(\'|\"|\?|\\|a|b|f|n|r|t|v|{OCTALDIGIT}{1,3}|u{HEXDIGIT}{4}|U{HEXDIG
 "/*"				BEGIN(comment_ml);
 <comment_ml>[^*\n]*		/* eat anything that's not a '*' */
 <comment_ml>"*"+[^*/\n]*	/* eat up '*'s not followed by '/'s */
-<comment_ml>\n			++yylineno;
+<comment_ml>\n
 <comment_ml>"*"+"/"		BEGIN(INITIAL);
 
 "//"				BEGIN(comment_sl);
-<comment_sl>[^\n]*\n		++yylineno; BEGIN(INITIAL);
-
-L\'				BEGIN(char_const); return CHARACTER_CONSTANT_START;
-\'				BEGIN(char_const); return CHARACTER_CONSTANT_START;
-<char_const>\'			BEGIN(INITIAL); return SQUOTE;
-
-L\"				BEGIN(string_lit); return STRING_LITERAL_START;
-\"				BEGIN(string_lit); return STRING_LITERAL_START;
-<string_lit>\"			BEGIN(INITIAL); return DQUOTE;
+<comment_sl>[^\n]*\n		BEGIN(INITIAL);
 
-<char_const,string_lit>ESCSEQ	return ESCSEQ;
-<char_const,string_lit>\n	; /* ignore */
-<char_const,string_lit>.	setstring(yyextra, yylval, yytext); return CHAR_STRING_TOKEN;
+L?\"(\\.|[^\\"])*\"		{ if (import_string(yyextra, yylval, yytext, '\"') < 0) return ERROR; else return STRING_LITERAL; }
+L?\'(\\.|[^\\'])*\'		{ if (import_string(yyextra, yylval, yytext, '\'') < 0) return ERROR; else return CHARACTER_LITERAL; }
 
 "["				return LSBRAC;
 "]"				return RSBRAC;
@@ -133,6 +126,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;
 %%