From c455f9d583959ff7a8181d216c26ff1f1cab52aa Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Sun, 6 Feb 2011 20:07:26 -0500 Subject: [PATCH] Cleanup parser code Signed-off-by: Mathieu Desnoyers --- formats/ctf/metadata/ctf-lexer.l | 2 +- formats/ctf/metadata/ctf-parser.y | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/formats/ctf/metadata/ctf-lexer.l b/formats/ctf/metadata/ctf-lexer.l index 763a1bb8..d2151a72 100644 --- 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, "\n", yytext); setstring(yytext); if (is_type(yytext)) return ID_TYPE; else return IDENTIFIER; +{IDENTIFIER} printf_dbg("\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 f5cb22ad..0d7c9c17 100644 --- 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 IDENTIFIER ID_TYPE %token ERROR @@ -175,12 +174,6 @@ int main(int argc, char **argv) struct ctf_node *n; } -/* %token UPPERCASE_L LOWERCASE_L _U _NONDIGIT */ -/*%type decl type_decl event_decl stream_decl trace_decl type_def -%type event_attrib field_attrib assign_attrib -%type event_attrib_list attrib_list field_list appendval_list -%type field value type_expr typename typename_postfix -%type typename_prefix identifier */ %% file: -- 2.34.1