X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-parser.y;h=78b63cc36d6adfbd4c465072418e2ed0b602f012;hp=d216cd0e6479acd1cb65a626336bf59b85539d2b;hb=73d159163aa1c2b8e9da78ade3ded6ef1c81513f;hpb=70bd0a12b09ce7f233189cf07e090fda593ebc48 diff --git a/formats/ctf/metadata/ctf-parser.y b/formats/ctf/metadata/ctf-parser.y index d216cd0e..78b63cc3 100644 --- a/formats/ctf/metadata/ctf-parser.y +++ b/formats/ctf/metadata/ctf-parser.y @@ -66,6 +66,7 @@ static const char *node_type_to_str[] = { [ NODE_EVENT ] = "NODE_EVENT", [ NODE_STREAM ] = "NODE_STREAM", [ NODE_TRACE ] = "NODE_TRACE", + [ NODE_CLOCK ] = "NODE_CLOCK", [ NODE_CTF_EXPRESSION ] = "NODE_CTF_EXPRESSION", [ NODE_UNARY_EXPRESSION ] = "NODE_UNARY_EXPRESSION", [ NODE_TYPEDEF ] = "NODE_TYPEDEF", @@ -246,6 +247,9 @@ static struct ctf_node *make_node(struct ctf_scanner *scanner, case NODE_TRACE: CDS_INIT_LIST_HEAD(&node->u.trace.declaration_list); break; + case NODE_CLOCK: + CDS_INIT_LIST_HEAD(&node->u.clock.declaration_list); + break; case NODE_CTF_EXPRESSION: CDS_INIT_LIST_HEAD(&node->u.ctf_expression.left); @@ -326,6 +330,9 @@ static int reparent_ctf_expression(struct ctf_node *node, case NODE_TRACE: _cds_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list); break; + case NODE_CLOCK: + _cds_list_splice_tail(&node->tmp_head, &parent->u.clock.declaration_list); + break; case NODE_FLOATING_POINT: _cds_list_splice_tail(&node->tmp_head, &parent->u.floating_point.expressions); break; @@ -378,6 +385,9 @@ static int reparent_typedef(struct ctf_node *node, struct ctf_node *parent) case NODE_TRACE: _cds_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list); break; + case NODE_CLOCK: + _cds_list_splice_tail(&node->tmp_head, &parent->u.clock.declaration_list); + break; case NODE_VARIANT: _cds_list_splice_tail(&node->tmp_head, &parent->u.variant.declaration_list); break; @@ -427,6 +437,9 @@ static int reparent_typealias(struct ctf_node *node, struct ctf_node *parent) case NODE_TRACE: _cds_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list); break; + case NODE_CLOCK: + _cds_list_splice_tail(&node->tmp_head, &parent->u.clock.declaration_list); + break; case NODE_VARIANT: _cds_list_splice_tail(&node->tmp_head, &parent->u.variant.declaration_list); break; @@ -473,6 +486,7 @@ static int reparent_type_specifier(struct ctf_node *node, case NODE_EVENT: case NODE_STREAM: case NODE_TRACE: + case NODE_CLOCK: case NODE_VARIANT: case NODE_STRUCT: case NODE_TYPEDEF: @@ -516,6 +530,9 @@ static int reparent_type_specifier_list(struct ctf_node *node, case NODE_TRACE: cds_list_add_tail(&node->siblings, &parent->u.trace.declaration_list); break; + case NODE_CLOCK: + cds_list_add_tail(&node->siblings, &parent->u.clock.declaration_list); + break; case NODE_VARIANT: cds_list_add_tail(&node->siblings, &parent->u.variant.declaration_list); break; @@ -583,6 +600,7 @@ static int reparent_type_declarator(struct ctf_node *node, case NODE_EVENT: case NODE_STREAM: case NODE_TRACE: + case NODE_CLOCK: case NODE_VARIANT: case NODE_STRUCT: case NODE_TYPEALIAS: @@ -648,6 +666,13 @@ static int set_parent_node(struct ctf_node *node, return -EPERM; } break; + case NODE_CLOCK: + if (parent->type == NODE_ROOT) { + _cds_list_splice_tail(&node->tmp_head, &parent->u.root.clock); + } else { + return -EPERM; + } + break; case NODE_CTF_EXPRESSION: return reparent_ctf_expression(node, parent); @@ -764,6 +789,7 @@ static struct ctf_ast *ctf_ast_alloc(void) CDS_INIT_LIST_HEAD(&ast->root.u.root.trace); CDS_INIT_LIST_HEAD(&ast->root.u.root.stream); CDS_INIT_LIST_HEAD(&ast->root.u.root.event); + CDS_INIT_LIST_HEAD(&ast->root.u.root.clock); return ast; } @@ -852,7 +878,7 @@ void ctf_scanner_free(struct ctf_scanner *scanner) */ %expect 2 %start file -%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 TOK_ALIGN +%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 CLOCK TYPEALIAS TYPEDEF UNSIGNED VARIANT VOID _BOOL _COMPLEX _IMAGINARY DECIMAL_CONSTANT OCTAL_CONSTANT HEXADECIMAL_CONSTANT TOK_ALIGN %token IDENTIFIER ID_TYPE %token ERROR %union @@ -872,6 +898,7 @@ void ctf_scanner_free(struct ctf_scanner *scanner) %type event_declaration %type stream_declaration %type trace_declaration +%type clock_declaration %type integer_declaration_specifiers %type declaration_specifiers %type alias_declaration_specifiers @@ -964,6 +991,8 @@ keywords: { $$ = yylval.gs; } | TRACE { $$ = yylval.gs; } + | CLOCK + { $$ = yylval.gs; } | TOK_ALIGN { $$ = yylval.gs; } ; @@ -1161,6 +1190,8 @@ declaration: { $$ = $1; } | trace_declaration { $$ = $1; } + | clock_declaration + { $$ = $1; } | declaration_specifiers TYPEDEF declaration_specifiers type_declarator_list SEMICOLON { struct ctf_node *list; @@ -1259,7 +1290,6 @@ stream_declaration_end: { pop_scope(scanner); } ; - trace_declaration: trace_declaration_begin trace_declaration_end { @@ -1283,6 +1313,29 @@ trace_declaration_end: { pop_scope(scanner); } ; +clock_declaration: + CLOCK clock_declaration_begin clock_declaration_end + { + $$ = make_node(scanner, NODE_CLOCK); + } + | CLOCK clock_declaration_begin ctf_assignment_expression_list clock_declaration_end + { + $$ = make_node(scanner, NODE_CLOCK); + if (set_parent_node($3, $$)) + reparent_error(scanner, "trace_declaration"); + } + ; + +clock_declaration_begin: + LBRAC + { push_scope(scanner); } + ; + +clock_declaration_end: + RBRAC SEMICOLON + { pop_scope(scanner); } + ; + integer_declaration_specifiers: CONST {