X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-lexer.l;h=f5ff02f1aa17084b9b1c1e920d6317e7194b3252;hp=3e53febda86288298d43485d6708258ab62d32e8;hb=73d159163aa1c2b8e9da78ade3ded6ef1c81513f;hpb=6dc474b8729f78928cb91e888cd94f3dcba03eb7

diff --git a/formats/ctf/metadata/ctf-lexer.l b/formats/ctf/metadata/ctf-lexer.l
index 3e53febd..f5ff02f1 100644
--- a/formats/ctf/metadata/ctf-lexer.l
+++ b/formats/ctf/metadata/ctf-lexer.l
@@ -18,6 +18,7 @@
  */
 
 #include <stdio.h>
+#include <babeltrace/babeltrace-internal.h>
 #include "ctf-scanner.h"
 #include "ctf-parser.h"
 #include "ctf-ast.h"
@@ -29,8 +30,6 @@ static void yyunput (int c, register char * yy_bp , yyscan_t yyscanner)
 	__attribute__((unused));
 static int input (yyscan_t yyscanner) __attribute__((unused));
 
-#define printf_dbg(fmt, args...)	fprintf(stderr, "%s: " fmt, __func__, ##args)
-
 %}
 
 %x comment_ml comment_sl string_lit char_const
@@ -94,8 +93,10 @@ L\"				BEGIN(string_lit); return STRING_LITERAL_START;
 "."				return DOT;
 =				return EQUAL;
 ","				return COMMA;
+align				setstring(yyextra, yylval, yytext); return TOK_ALIGN;
 const				setstring(yyextra, yylval, yytext); return CONST;
 char				setstring(yyextra, yylval, yytext); return CHAR;
+clock				setstring(yyextra, yylval, yytext); return CLOCK;
 double				setstring(yyextra, yylval, yytext); return DOUBLE;
 enum				setstring(yyextra, yylval, yytext); return ENUM;
 event				setstring(yyextra, yylval, yytext); return EVENT;
@@ -121,7 +122,7 @@ _Imaginary			setstring(yyextra, yylval, yytext); return _IMAGINARY;
 [1-9]{DIGIT}*{INTEGER_SUFFIX}?	setstring(yyextra, yylval, yytext); return DECIMAL_CONSTANT;
 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_dbg("<IDENTIFIER %s>\n", yytext); setstring(yyextra, yylval, yytext); if (is_type(yyextra, yytext)) return ID_TYPE; else return IDENTIFIER;
+{IDENTIFIER}			printf_debug("<IDENTIFIER %s>\n", yytext); setstring(yyextra, yylval, yytext); if (is_type(yyextra, yytext)) return ID_TYPE; else return IDENTIFIER;
 [ \t\n]+			; /* ignore */
 .				return ERROR;
 %%