Cleanup parser code

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 763a1bb8d7c99974f6aab0c0c35abd7cd36a339d..d2151a72e1e9fb2218c027ab99f4c914d2d6ff0e 100644 (file)
--- a/formats/ctf/metadata/ctf-lexer.l
+++ b/formats/ctf/metadata/ctf-lexer.l
@@ -92,7 +92,7 @@ _Imaginary                    return _IMAGINARY;
 [1-9]{DIGIT}*{INTEGER_SUFFIX}? return DECIMAL_CONSTANT;
 0{OCTALDIGIT}*{INTEGER_SUFFIX}?        return OCTAL_CONSTANT;
 0[xX]{HEXDIGIT}+{INTEGER_SUFFIX}?      return HEXADECIMAL_CONSTANT;
-{IDENTIFIER}                   fprintf(stderr, "<IDENTIFIER %s>\n", yytext); setstring(yytext); if (is_type(yytext)) return ID_TYPE; else return IDENTIFIER;
+{IDENTIFIER}                   printf_dbg("<IDENTIFIER %s>\n", yytext); setstring(yytext); if (is_type(yytext)) return ID_TYPE; else return IDENTIFIER;
 [ \t\n]+                       ; /* ignore */
 .                              return ERROR;
 %%

diff --git a/formats/ctf/metadata/ctf-parser.y b/formats/ctf/metadata/ctf-parser.y
index f5cb22ad358eee395ecfad052cf8cfad79524a44..0d7c9c17fe618ec68f562ca94e506ebae77a1604 100644 (file)
--- a/formats/ctf/metadata/ctf-parser.y
+++ b/formats/ctf/metadata/ctf-parser.y
@@ -163,7 +163,6 @@ int main(int argc, char **argv)
 %}
 
 %start file
-/* %glr-parser */
 %token CHARACTER_CONSTANT_START SQUOTE STRING_LITERAL_START DQUOTE ESCSEQ CHAR_STRING_TOKEN LSBRAC RSBRAC LPAREN RPAREN LBRAC RBRAC RARROW STAR PLUS MINUS LT GT TYPEASSIGN COLON SEMICOLON DOTDOTDOT DOT EQUAL COMMA CONST CHAR DOUBLE ENUM EVENT FLOATING_POINT FLOAT INTEGER INT LONG SHORT SIGNED STREAM STRING STRUCT TRACE TYPEALIAS TYPEDEF UNSIGNED VARIANT VOID _BOOL _COMPLEX _IMAGINARY DECIMAL_CONSTANT OCTAL_CONSTANT HEXADECIMAL_CONSTANT
 %token <gs> IDENTIFIER ID_TYPE
 %token ERROR
@@ -175,12 +174,6 @@ int main(int argc, char **argv)
        struct ctf_node *n;
 }
 
-/* %token <c>UPPERCASE_L LOWERCASE_L _U _NONDIGIT */
-/*%type <n> decl type_decl event_decl stream_decl trace_decl type_def
-%type <n> event_attrib field_attrib assign_attrib 
-%type <n> event_attrib_list attrib_list field_list appendval_list
-%type <n> field value type_expr typename typename_postfix
-%type <gs> typename_prefix identifier */
 %%
 
 file: