X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-parser.y;h=757af5d53f74ddd81ecfe634f8f6fdedb249fddb;hp=fcc877ba7abacea65ef199f16b593a85bd119ec9;hb=d2ea163bc5534c67811ac131dedfa864cb3959c1;hpb=3e11b713fa76482be45bff5b067cfab5ab6e9be1 diff --git a/formats/ctf/metadata/ctf-parser.y b/formats/ctf/metadata/ctf-parser.y index fcc877ba..757af5d5 100644 --- a/formats/ctf/metadata/ctf-parser.y +++ b/formats/ctf/metadata/ctf-parser.y @@ -26,13 +26,12 @@ #include #include #include +#include #include "ctf-scanner.h" #include "ctf-parser.h" #include "ctf-ast.h" -/* - * TODO: support enum, variant and struct declarations in scopes. - */ +int yydebug; /* Join two lists, put "add" at the end of "head". */ static inline void @@ -47,13 +46,11 @@ _cds_list_splice_tail (struct cds_list_head *add, struct cds_list_head *head) } } -#define printf_dbg(fmt, args...) fprintf(stderr, "%s: " fmt, __func__, ## args) - int yyparse(struct ctf_scanner *scanner); int yylex(union YYSTYPE *yyval, struct ctf_scanner *scanner); int yylex_init_extra(struct ctf_scanner *scanner, yyscan_t * ptr_yy_globals); -int yylex_destroy(yyscan_t yyscanner) ; -void yyset_in(FILE * in_str, yyscan_t scanner); +int yylex_destroy(yyscan_t yyscanner); +void yyrestart(FILE * in_str, yyscan_t scanner); int yydebug; @@ -67,8 +64,10 @@ static const char *node_type_to_str[] = { [ NODE_UNKNOWN ] = "NODE_UNKNOWN", [ NODE_ROOT ] = "NODE_ROOT", [ NODE_EVENT ] = "NODE_EVENT", + [ NODE_ENV ] = "NODE_ENV", [ 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", @@ -171,7 +170,7 @@ static void push_scope(struct ctf_scanner *scanner) { struct ctf_scanner_scope *ns; - printf_dbg("push scope\n"); + printf_debug("push scope\n"); ns = malloc(sizeof(struct ctf_scanner_scope)); init_scope(ns, scanner->cs); scanner->cs = ns; @@ -181,7 +180,7 @@ static void pop_scope(struct ctf_scanner *scanner) { struct ctf_scanner_scope *os; - printf_dbg("pop scope\n"); + printf_debug("pop scope\n"); os = scanner->cs; scanner->cs = os->parent; finalize_scope(os); @@ -193,7 +192,7 @@ static int lookup_type(struct ctf_scanner_scope *s, const char *id) int ret; ret = (int) (long) g_hash_table_lookup(s->types, id); - printf_dbg("lookup %p %s %d\n", s, id, ret); + printf_debug("lookup %p %s %d\n", s, id, ret); return ret; } @@ -208,13 +207,13 @@ int is_type(struct ctf_scanner *scanner, const char *id) break; } } - printf_dbg("is type %s %d\n", id, ret); + printf_debug("is type %s %d\n", id, ret); return ret; } static void add_type(struct ctf_scanner *scanner, struct gc_string *id) { - printf_dbg("add type %s\n", id->s); + printf_debug("add type %s\n", id->s); if (lookup_type(scanner->cs, id->s)) return; g_hash_table_insert(scanner->cs->types, id->s, id->s); @@ -246,9 +245,15 @@ static struct ctf_node *make_node(struct ctf_scanner *scanner, case NODE_STREAM: CDS_INIT_LIST_HEAD(&node->u.stream.declaration_list); break; + case NODE_ENV: + CDS_INIT_LIST_HEAD(&node->u.env.declaration_list); + break; 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); @@ -303,6 +308,7 @@ static struct ctf_node *make_node(struct ctf_scanner *scanner, break; case NODE_STRUCT: CDS_INIT_LIST_HEAD(&node->u._struct.declaration_list); + CDS_INIT_LIST_HEAD(&node->u._struct.min_align); break; case NODE_UNKNOWN: @@ -325,9 +331,15 @@ static int reparent_ctf_expression(struct ctf_node *node, case NODE_STREAM: _cds_list_splice_tail(&node->tmp_head, &parent->u.stream.declaration_list); break; + case NODE_ENV: + _cds_list_splice_tail(&node->tmp_head, &parent->u.env.declaration_list); + break; 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; @@ -377,9 +389,15 @@ static int reparent_typedef(struct ctf_node *node, struct ctf_node *parent) case NODE_STREAM: _cds_list_splice_tail(&node->tmp_head, &parent->u.stream.declaration_list); break; + case NODE_ENV: + _cds_list_splice_tail(&node->tmp_head, &parent->u.env.declaration_list); + break; 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; @@ -426,9 +444,15 @@ static int reparent_typealias(struct ctf_node *node, struct ctf_node *parent) case NODE_STREAM: _cds_list_splice_tail(&node->tmp_head, &parent->u.stream.declaration_list); break; + case NODE_ENV: + _cds_list_splice_tail(&node->tmp_head, &parent->u.env.declaration_list); + break; 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; @@ -474,7 +498,9 @@ static int reparent_type_specifier(struct ctf_node *node, case NODE_TYPE_SPECIFIER: case NODE_EVENT: case NODE_STREAM: + case NODE_ENV: case NODE_TRACE: + case NODE_CLOCK: case NODE_VARIANT: case NODE_STRUCT: case NODE_TYPEDEF: @@ -515,9 +541,15 @@ static int reparent_type_specifier_list(struct ctf_node *node, case NODE_STREAM: cds_list_add_tail(&node->siblings, &parent->u.stream.declaration_list); break; + case NODE_ENV: + cds_list_add_tail(&node->siblings, &parent->u.env.declaration_list); + break; 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; @@ -533,16 +565,13 @@ static int reparent_type_specifier_list(struct ctf_node *node, case NODE_TYPEALIAS_ALIAS: parent->u.typealias_alias.type_specifier_list = node; break; - case NODE_TYPE_DECLARATOR: - parent->u.type_declarator.type = TYPEDEC_NESTED; - parent->u.type_declarator.u.nested.length = node; - break; case NODE_ENUM: parent->u._enum.container_type = node; break; case NODE_STRUCT_OR_VARIANT_DECLARATION: parent->u.struct_or_variant_declaration.type_specifier_list = node; break; + case NODE_TYPE_DECLARATOR: case NODE_TYPE_SPECIFIER: case NODE_TYPEALIAS: case NODE_FLOATING_POINT: @@ -587,7 +616,9 @@ static int reparent_type_declarator(struct ctf_node *node, case NODE_ROOT: case NODE_EVENT: case NODE_STREAM: + case NODE_ENV: case NODE_TRACE: + case NODE_CLOCK: case NODE_VARIANT: case NODE_STRUCT: case NODE_TYPEALIAS: @@ -646,6 +677,13 @@ static int set_parent_node(struct ctf_node *node, return -EPERM; } break; + case NODE_ENV: + if (parent->type == NODE_ROOT) { + _cds_list_splice_tail(&node->tmp_head, &parent->u.root.env); + } else { + return -EPERM; + } + break; case NODE_TRACE: if (parent->type == NODE_ROOT) { _cds_list_splice_tail(&node->tmp_head, &parent->u.root.trace); @@ -653,6 +691,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); @@ -767,8 +812,10 @@ static struct ctf_ast *ctf_ast_alloc(void) CDS_INIT_LIST_HEAD(&ast->root.tmp_head); CDS_INIT_LIST_HEAD(&ast->root.u.root.declaration_list); CDS_INIT_LIST_HEAD(&ast->root.u.root.trace); + CDS_INIT_LIST_HEAD(&ast->root.u.root.env); 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; } @@ -790,6 +837,8 @@ struct ctf_scanner *ctf_scanner_alloc(FILE *input) struct ctf_scanner *scanner; int ret; + yydebug = babeltrace_debug; + scanner = malloc(sizeof(*scanner)); if (!scanner) return NULL; @@ -800,7 +849,8 @@ struct ctf_scanner *ctf_scanner_alloc(FILE *input) fprintf(stderr, "yylex_init error\n"); goto cleanup_scanner; } - yyset_in(input, scanner); + /* Start processing new stream */ + yyrestart(input, scanner->scanner); scanner->ast = ctf_ast_alloc(); if (!scanner->ast) @@ -809,6 +859,11 @@ struct ctf_scanner *ctf_scanner_alloc(FILE *input) scanner->cs = &scanner->root_scope; CDS_INIT_LIST_HEAD(&scanner->allocated_strings); + if (yydebug) + fprintf(stdout, "Scanner input is a%s.\n", + isatty(fileno(input)) ? "n interactive tty" : + " noninteractive file"); + return scanner; cleanup_lexer: @@ -839,8 +894,17 @@ void ctf_scanner_free(struct ctf_scanner *scanner) /* %locations */ %parse-param {struct ctf_scanner *scanner} %lex-param {struct ctf_scanner *scanner} +/* + * Expect two shift-reduce conflicts. Caused by enum name-opt : type {} + * vs struct { int :value; } (unnamed bit-field). The default is to + * shift, so whenever we encounter an enumeration, we are doing the + * proper thing (shift). It is illegal to declare an enumeration + * "bit-field", so it is OK if this situation ends up in a parsing + * error. + */ +%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 +%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 ENV 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 @@ -859,15 +923,18 @@ void ctf_scanner_free(struct ctf_scanner *scanner) %type declaration %type event_declaration %type stream_declaration +%type env_declaration %type trace_declaration +%type clock_declaration +%type integer_declaration_specifiers %type declaration_specifiers %type alias_declaration_specifiers %type type_declarator_list +%type integer_type_specifier %type type_specifier %type struct_type_specifier %type variant_type_specifier -%type declaration_specifiers_or_integer_constant %type enum_type_specifier %type struct_or_variant_declaration_list %type struct_or_variant_declaration @@ -949,8 +1016,14 @@ keywords: { $$ = yylval.gs; } | STREAM { $$ = yylval.gs; } + | ENV + { $$ = yylval.gs; } | TRACE { $$ = yylval.gs; } + | CLOCK + { $$ = yylval.gs; } + | TOK_ALIGN + { $$ = yylval.gs; } ; /* 1.5 Constants */ @@ -1010,7 +1083,6 @@ postfix_expression: $$->u.unary_expression.type = UNARY_STRING; $$->u.unary_expression.u.string = yylval.gs->s; } - | DECIMAL_CONSTANT { $$ = make_node(scanner, NODE_UNARY_EXPRESSION); @@ -1145,8 +1217,12 @@ declaration: { $$ = $1; } | stream_declaration { $$ = $1; } + | env_declaration + { $$ = $1; } | trace_declaration { $$ = $1; } + | clock_declaration + { $$ = $1; } | declaration_specifiers TYPEDEF declaration_specifiers type_declarator_list SEMICOLON { struct ctf_node *list; @@ -1178,7 +1254,7 @@ declaration: _cds_list_splice_tail(&($1)->u.type_specifier_list.head, &list->u.type_specifier_list.head); _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators); } - | TYPEALIAS declaration_specifiers abstract_declarator_list COLON alias_declaration_specifiers alias_abstract_declarator_list SEMICOLON + | TYPEALIAS declaration_specifiers abstract_declarator_list TYPEASSIGN alias_declaration_specifiers alias_abstract_declarator_list SEMICOLON { struct ctf_node *list; @@ -1245,6 +1321,28 @@ stream_declaration_end: { pop_scope(scanner); } ; +env_declaration: + env_declaration_begin env_declaration_end + { + $$ = make_node(scanner, NODE_ENV); + } + | env_declaration_begin ctf_assignment_expression_list env_declaration_end + { + $$ = make_node(scanner, NODE_ENV); + if (set_parent_node($2, $$)) + reparent_error(scanner, "env declaration"); + } + ; + +env_declaration_begin: + ENV LBRAC + { push_scope(scanner); } + ; + +env_declaration_end: + RBRAC SEMICOLON + { pop_scope(scanner); } + ; trace_declaration: trace_declaration_begin trace_declaration_end @@ -1269,6 +1367,63 @@ 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 + { + struct ctf_node *node; + + $$ = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + node = make_node(scanner, NODE_TYPE_SPECIFIER); + node->u.type_specifier.type = TYPESPEC_CONST; + cds_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head); + } + | integer_type_specifier + { + struct ctf_node *node; + + $$ = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); + node = $1; + cds_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head); + } + | integer_declaration_specifiers CONST + { + struct ctf_node *node; + + $$ = $1; + node = make_node(scanner, NODE_TYPE_SPECIFIER); + node->u.type_specifier.type = TYPESPEC_CONST; + cds_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head); + } + | integer_declaration_specifiers integer_type_specifier + { + $$ = $1; + cds_list_add_tail(&($2)->siblings, &($$)->u.type_specifier_list.head); + } + ; + declaration_specifiers: CONST { @@ -1313,6 +1468,64 @@ type_declarator_list: } ; +integer_type_specifier: + CHAR + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_CHAR; + } + | SHORT + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_SHORT; + } + | INT + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_INT; + } + | LONG + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_LONG; + } + | SIGNED + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_SIGNED; + } + | UNSIGNED + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_UNSIGNED; + } + | _BOOL + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_BOOL; + } + | ID_TYPE + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_ID_TYPE; + $$->u.type_specifier.id_type = yylval.gs->s; + } + | INTEGER LBRAC RBRAC + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_INTEGER; + $$->u.type_specifier.node = make_node(scanner, NODE_INTEGER); + } + | INTEGER LBRAC ctf_assignment_expression_list RBRAC + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_INTEGER; + $$->u.type_specifier.node = make_node(scanner, NODE_INTEGER); + if (set_parent_node($3, $$->u.type_specifier.node)) + reparent_error(scanner, "integer reparent error"); + } + ; + type_specifier: VOID { @@ -1408,6 +1621,12 @@ type_specifier: if (set_parent_node($3, $$->u.type_specifier.node)) reparent_error(scanner, "integer reparent error"); } + | STRING + { + $$ = make_node(scanner, NODE_TYPE_SPECIFIER); + $$->u.type_specifier.type = TYPESPEC_STRING; + $$->u.type_specifier.node = make_node(scanner, NODE_STRING); + } | STRING LBRAC RBRAC { $$ = make_node(scanner, NODE_TYPE_SPECIFIER); @@ -1433,14 +1652,12 @@ type_specifier: $$ = make_node(scanner, NODE_TYPE_SPECIFIER); $$->u.type_specifier.type = TYPESPEC_VARIANT; $$->u.type_specifier.node = $2; - $$ = $2; } | STRUCT struct_type_specifier { $$ = make_node(scanner, NODE_TYPE_SPECIFIER); $$->u.type_specifier.type = TYPESPEC_STRUCT; $$->u.type_specifier.node = $2; - $$ = $2; } ; @@ -1449,7 +1666,7 @@ struct_type_specifier: { $$ = make_node(scanner, NODE_STRUCT); $$->u._struct.has_body = 1; - if (set_parent_node($2, $$)) + if ($2 && set_parent_node($2, $$)) reparent_error(scanner, "struct reparent error"); } | IDENTIFIER struct_declaration_begin struct_or_variant_declaration_list struct_declaration_end @@ -1457,7 +1674,7 @@ struct_type_specifier: $$ = make_node(scanner, NODE_STRUCT); $$->u._struct.has_body = 1; $$->u._struct.name = $1->s; - if (set_parent_node($3, $$)) + if ($3 && set_parent_node($3, $$)) reparent_error(scanner, "struct reparent error"); } | ID_TYPE struct_declaration_begin struct_or_variant_declaration_list struct_declaration_end @@ -1465,7 +1682,7 @@ struct_type_specifier: $$ = make_node(scanner, NODE_STRUCT); $$->u._struct.has_body = 1; $$->u._struct.name = $1->s; - if (set_parent_node($3, $$)) + if ($3 && set_parent_node($3, $$)) reparent_error(scanner, "struct reparent error"); } | IDENTIFIER @@ -1480,6 +1697,32 @@ struct_type_specifier: $$->u._struct.has_body = 0; $$->u._struct.name = $1->s; } + | struct_declaration_begin struct_or_variant_declaration_list struct_declaration_end TOK_ALIGN LPAREN unary_expression RPAREN + { + $$ = make_node(scanner, NODE_STRUCT); + $$->u._struct.has_body = 1; + cds_list_add_tail(&($6)->siblings, &$$->u._struct.min_align); + if ($2 && set_parent_node($2, $$)) + reparent_error(scanner, "struct reparent error"); + } + | IDENTIFIER struct_declaration_begin struct_or_variant_declaration_list struct_declaration_end TOK_ALIGN LPAREN unary_expression RPAREN + { + $$ = make_node(scanner, NODE_STRUCT); + $$->u._struct.has_body = 1; + $$->u._struct.name = $1->s; + cds_list_add_tail(&($7)->siblings, &$$->u._struct.min_align); + if ($3 && set_parent_node($3, $$)) + reparent_error(scanner, "struct reparent error"); + } + | ID_TYPE struct_declaration_begin struct_or_variant_declaration_list struct_declaration_end TOK_ALIGN LPAREN unary_expression RPAREN + { + $$ = make_node(scanner, NODE_STRUCT); + $$->u._struct.has_body = 1; + $$->u._struct.name = $1->s; + cds_list_add_tail(&($7)->siblings, &$$->u._struct.min_align); + if ($3 && set_parent_node($3, $$)) + reparent_error(scanner, "struct reparent error"); + } ; struct_declaration_begin: @@ -1497,7 +1740,7 @@ variant_type_specifier: { $$ = make_node(scanner, NODE_VARIANT); $$->u.variant.has_body = 1; - if (set_parent_node($2, $$)) + if ($2 && set_parent_node($2, $$)) reparent_error(scanner, "variant reparent error"); } | LT IDENTIFIER GT variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end @@ -1505,7 +1748,7 @@ variant_type_specifier: $$ = make_node(scanner, NODE_VARIANT); $$->u.variant.has_body = 1; $$->u.variant.choice = $2->s; - if (set_parent_node($5, $$)) + if ($5 && set_parent_node($5, $$)) reparent_error(scanner, "variant reparent error"); } | LT ID_TYPE GT variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end @@ -1513,7 +1756,7 @@ variant_type_specifier: $$ = make_node(scanner, NODE_VARIANT); $$->u.variant.has_body = 1; $$->u.variant.choice = $2->s; - if (set_parent_node($5, $$)) + if ($5 && set_parent_node($5, $$)) reparent_error(scanner, "variant reparent error"); } | IDENTIFIER variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end @@ -1521,7 +1764,7 @@ variant_type_specifier: $$ = make_node(scanner, NODE_VARIANT); $$->u.variant.has_body = 1; $$->u.variant.name = $1->s; - if (set_parent_node($3, $$)) + if ($3 && set_parent_node($3, $$)) reparent_error(scanner, "variant reparent error"); } | IDENTIFIER LT IDENTIFIER GT variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end @@ -1530,7 +1773,7 @@ variant_type_specifier: $$->u.variant.has_body = 1; $$->u.variant.name = $1->s; $$->u.variant.choice = $3->s; - if (set_parent_node($6, $$)) + if ($6 && set_parent_node($6, $$)) reparent_error(scanner, "variant reparent error"); } | IDENTIFIER LT IDENTIFIER GT @@ -1546,7 +1789,7 @@ variant_type_specifier: $$->u.variant.has_body = 1; $$->u.variant.name = $1->s; $$->u.variant.choice = $3->s; - if (set_parent_node($6, $$)) + if ($6 && set_parent_node($6, $$)) reparent_error(scanner, "variant reparent error"); } | IDENTIFIER LT ID_TYPE GT @@ -1561,7 +1804,7 @@ variant_type_specifier: $$ = make_node(scanner, NODE_VARIANT); $$->u.variant.has_body = 1; $$->u.variant.name = $1->s; - if (set_parent_node($3, $$)) + if ($3 && set_parent_node($3, $$)) reparent_error(scanner, "variant reparent error"); } | ID_TYPE LT IDENTIFIER GT variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end @@ -1570,7 +1813,7 @@ variant_type_specifier: $$->u.variant.has_body = 1; $$->u.variant.name = $1->s; $$->u.variant.choice = $3->s; - if (set_parent_node($6, $$)) + if ($6 && set_parent_node($6, $$)) reparent_error(scanner, "variant reparent error"); } | ID_TYPE LT IDENTIFIER GT @@ -1586,7 +1829,7 @@ variant_type_specifier: $$->u.variant.has_body = 1; $$->u.variant.name = $1->s; $$->u.variant.choice = $3->s; - if (set_parent_node($6, $$)) + if ($6 && set_parent_node($6, $$)) reparent_error(scanner, "variant reparent error"); } | ID_TYPE LT ID_TYPE GT @@ -1608,32 +1851,6 @@ variant_declaration_end: { pop_scope(scanner); } ; -declaration_specifiers_or_integer_constant: - declaration_specifiers - { $$ = $1; } - | DECIMAL_CONSTANT - { - $$ = make_node(scanner, NODE_UNARY_EXPRESSION); - $$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT; - sscanf(yylval.gs->s, "%" PRIu64, - &$$->u.unary_expression.u.unsigned_constant); - } - | OCTAL_CONSTANT - { - $$ = make_node(scanner, NODE_UNARY_EXPRESSION); - $$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT; - sscanf(yylval.gs->s, "0%" PRIo64, - &$$->u.unary_expression.u.unsigned_constant); - } - | HEXADECIMAL_CONSTANT - { - $$ = make_node(scanner, NODE_UNARY_EXPRESSION); - $$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT; - sscanf(yylval.gs->s, "0x%" PRIx64, - &$$->u.unary_expression.u.unsigned_constant); - } - ; - enum_type_specifier: LBRAC enumerator_list RBRAC { @@ -1641,12 +1858,12 @@ enum_type_specifier: $$->u._enum.has_body = 1; _cds_list_splice_tail(&($2)->tmp_head, &($$)->u._enum.enumerator_list); } - | LT declaration_specifiers GT LBRAC enumerator_list RBRAC + | COLON integer_declaration_specifiers LBRAC enumerator_list RBRAC { $$ = make_node(scanner, NODE_ENUM); $$->u._enum.has_body = 1; ($$)->u._enum.container_type = $2; - _cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list); + _cds_list_splice_tail(&($4)->tmp_head, &($$)->u._enum.enumerator_list); } | IDENTIFIER LBRAC enumerator_list RBRAC { @@ -1655,13 +1872,13 @@ enum_type_specifier: $$->u._enum.enum_id = $1->s; _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list); } - | IDENTIFIER LT declaration_specifiers GT LBRAC enumerator_list RBRAC + | IDENTIFIER COLON integer_declaration_specifiers LBRAC enumerator_list RBRAC { $$ = make_node(scanner, NODE_ENUM); $$->u._enum.has_body = 1; $$->u._enum.enum_id = $1->s; ($$)->u._enum.container_type = $3; - _cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list); + _cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list); } | ID_TYPE LBRAC enumerator_list RBRAC { @@ -1670,13 +1887,13 @@ enum_type_specifier: $$->u._enum.enum_id = $1->s; _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list); } - | ID_TYPE LT declaration_specifiers GT LBRAC enumerator_list RBRAC + | ID_TYPE COLON integer_declaration_specifiers LBRAC enumerator_list RBRAC { $$ = make_node(scanner, NODE_ENUM); $$->u._enum.has_body = 1; $$->u._enum.enum_id = $1->s; ($$)->u._enum.container_type = $3; - _cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list); + _cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list); } | LBRAC enumerator_list COMMA RBRAC { @@ -1684,12 +1901,12 @@ enum_type_specifier: $$->u._enum.has_body = 1; _cds_list_splice_tail(&($2)->tmp_head, &($$)->u._enum.enumerator_list); } - | LT declaration_specifiers GT LBRAC enumerator_list COMMA RBRAC + | COLON integer_declaration_specifiers LBRAC enumerator_list COMMA RBRAC { $$ = make_node(scanner, NODE_ENUM); $$->u._enum.has_body = 1; ($$)->u._enum.container_type = $2; - _cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list); + _cds_list_splice_tail(&($4)->tmp_head, &($$)->u._enum.enumerator_list); } | IDENTIFIER LBRAC enumerator_list COMMA RBRAC { @@ -1698,13 +1915,13 @@ enum_type_specifier: $$->u._enum.enum_id = $1->s; _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list); } - | IDENTIFIER LT declaration_specifiers GT LBRAC enumerator_list COMMA RBRAC + | IDENTIFIER COLON integer_declaration_specifiers LBRAC enumerator_list COMMA RBRAC { $$ = make_node(scanner, NODE_ENUM); $$->u._enum.has_body = 1; $$->u._enum.enum_id = $1->s; ($$)->u._enum.container_type = $3; - _cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list); + _cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list); } | IDENTIFIER { @@ -1712,13 +1929,6 @@ enum_type_specifier: $$->u._enum.has_body = 0; $$->u._enum.enum_id = $1->s; } - | IDENTIFIER LT declaration_specifiers GT - { - $$ = make_node(scanner, NODE_ENUM); - $$->u._enum.has_body = 0; - $$->u._enum.enum_id = $1->s; - ($$)->u._enum.container_type = $3; - } | ID_TYPE LBRAC enumerator_list COMMA RBRAC { $$ = make_node(scanner, NODE_ENUM); @@ -1726,13 +1936,13 @@ enum_type_specifier: $$->u._enum.enum_id = $1->s; _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list); } - | ID_TYPE LT declaration_specifiers GT LBRAC enumerator_list COMMA RBRAC + | ID_TYPE COLON integer_declaration_specifiers LBRAC enumerator_list COMMA RBRAC { $$ = make_node(scanner, NODE_ENUM); $$->u._enum.has_body = 1; $$->u._enum.enum_id = $1->s; ($$)->u._enum.container_type = $3; - _cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list); + _cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list); } | ID_TYPE { @@ -1740,13 +1950,6 @@ enum_type_specifier: $$->u._enum.has_body = 0; $$->u._enum.enum_id = $1->s; } - | ID_TYPE LT declaration_specifiers GT - { - $$ = make_node(scanner, NODE_ENUM); - $$->u._enum.has_body = 0; - $$->u._enum.enum_id = $1->s; - ($$)->u._enum.container_type = $3; - } ; struct_or_variant_declaration_list: @@ -1806,7 +2009,7 @@ struct_or_variant_declaration: ($$)->u.struct_or_variant_declaration.type_specifier_list = list; _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators); } - | TYPEALIAS declaration_specifiers abstract_declarator_list COLON alias_declaration_specifiers alias_abstract_declarator_list SEMICOLON + | TYPEALIAS declaration_specifiers abstract_declarator_list TYPEASSIGN alias_declaration_specifiers alias_abstract_declarator_list SEMICOLON { struct ctf_node *list; @@ -2012,12 +2215,13 @@ direct_abstract_declarator: $$->u.type_declarator.type = TYPEDEC_NESTED; $$->u.type_declarator.u.nested.type_declarator = $2; } - | direct_abstract_declarator LSBRAC declaration_specifiers_or_integer_constant RSBRAC + | direct_abstract_declarator LSBRAC unary_expression RSBRAC { $$ = make_node(scanner, NODE_TYPE_DECLARATOR); $$->u.type_declarator.type = TYPEDEC_NESTED; $$->u.type_declarator.u.nested.type_declarator = $1; - ($$)->u.type_declarator.u.nested.length = $3; + CDS_INIT_LIST_HEAD(&($$)->u.type_declarator.u.nested.length); + _cds_list_splice_tail(&($3)->tmp_head, &($$)->u.type_declarator.u.nested.length); } | direct_abstract_declarator LSBRAC RSBRAC { @@ -2061,12 +2265,13 @@ direct_alias_abstract_declarator: $$->u.type_declarator.type = TYPEDEC_NESTED; $$->u.type_declarator.u.nested.type_declarator = $2; } - | direct_alias_abstract_declarator LSBRAC declaration_specifiers_or_integer_constant RSBRAC + | direct_alias_abstract_declarator LSBRAC unary_expression RSBRAC { $$ = make_node(scanner, NODE_TYPE_DECLARATOR); $$->u.type_declarator.type = TYPEDEC_NESTED; $$->u.type_declarator.u.nested.type_declarator = $1; - ($$)->u.type_declarator.u.nested.length = $3; + CDS_INIT_LIST_HEAD(&($$)->u.type_declarator.u.nested.length); + _cds_list_splice_tail(&($3)->tmp_head, &($$)->u.type_declarator.u.nested.length); } | direct_alias_abstract_declarator LSBRAC RSBRAC { @@ -2100,12 +2305,13 @@ direct_declarator: $$->u.type_declarator.type = TYPEDEC_NESTED; $$->u.type_declarator.u.nested.type_declarator = $2; } - | direct_declarator LSBRAC declaration_specifiers_or_integer_constant RSBRAC + | direct_declarator LSBRAC unary_expression RSBRAC { $$ = make_node(scanner, NODE_TYPE_DECLARATOR); $$->u.type_declarator.type = TYPEDEC_NESTED; $$->u.type_declarator.u.nested.type_declarator = $1; - ($$)->u.type_declarator.u.nested.length = $3; + CDS_INIT_LIST_HEAD(&($$)->u.type_declarator.u.nested.length); + _cds_list_splice_tail(&($3)->tmp_head, &($$)->u.type_declarator.u.nested.length); } ; @@ -2133,12 +2339,13 @@ direct_type_declarator: $$->u.type_declarator.type = TYPEDEC_NESTED; $$->u.type_declarator.u.nested.type_declarator = $2; } - | direct_type_declarator LSBRAC declaration_specifiers_or_integer_constant RSBRAC + | direct_type_declarator LSBRAC unary_expression RSBRAC { $$ = make_node(scanner, NODE_TYPE_DECLARATOR); $$->u.type_declarator.type = TYPEDEC_NESTED; $$->u.type_declarator.u.nested.type_declarator = $1; - ($$)->u.type_declarator.u.nested.length = $3; + CDS_INIT_LIST_HEAD(&($$)->u.type_declarator.u.nested.length); + _cds_list_splice_tail(&($3)->tmp_head, &($$)->u.type_declarator.u.nested.length); } ; @@ -2191,9 +2398,8 @@ ctf_assignment_expression: reparent_error(scanner, "ctf_assignment_expression left expects string"); _cds_list_splice_tail(&($3)->tmp_head, &($$)->u.ctf_expression.right); } - | unary_expression TYPEASSIGN type_specifier /* Only allow struct */ + | unary_expression TYPEASSIGN declaration_specifiers /* Only allow struct */ { - struct ctf_node *list; /* * Because we have left and right, cannot use * set_parent_node. @@ -2202,9 +2408,7 @@ ctf_assignment_expression: _cds_list_splice_tail(&($1)->tmp_head, &($$)->u.ctf_expression.left); if ($1->u.unary_expression.type != UNARY_STRING) reparent_error(scanner, "ctf_assignment_expression left expects string"); - list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST); - cds_list_add_tail(&($3)->siblings, &list->u.type_specifier_list.head); - cds_list_add_tail(&list->siblings, &($$)->u.ctf_expression.right); + cds_list_add_tail(&($3)->siblings, &($$)->u.ctf_expression.right); } | declaration_specifiers TYPEDEF declaration_specifiers type_declarator_list { @@ -2237,7 +2441,7 @@ ctf_assignment_expression: ($$)->u.struct_or_variant_declaration.type_specifier_list = list; _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators); } - | TYPEALIAS declaration_specifiers abstract_declarator_list COLON alias_declaration_specifiers alias_abstract_declarator_list + | TYPEALIAS declaration_specifiers abstract_declarator_list TYPEASSIGN alias_declaration_specifiers alias_abstract_declarator_list { struct ctf_node *list;