From e0c14875ccc7df4e6a13052f1af19a69b5bc7e16 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 21 Apr 2011 02:55:54 -0400 Subject: [PATCH] typealias: Fix reduce conflict in grammar for abstract declarators Signed-off-by: Mathieu Desnoyers --- formats/ctf/metadata/ctf-parser.y | 97 ++++++++++++++----------------- 1 file changed, 45 insertions(+), 52 deletions(-) diff --git a/formats/ctf/metadata/ctf-parser.y b/formats/ctf/metadata/ctf-parser.y index 07d98738..1a76c655 100644 --- a/formats/ctf/metadata/ctf-parser.y +++ b/formats/ctf/metadata/ctf-parser.y @@ -814,7 +814,6 @@ void ctf_scanner_free(struct ctf_scanner *scanner) %type alias_declaration_specifiers %type type_declarator_list -%type abstract_type_declarator_list %type type_specifier %type struct_type_specifier %type variant_type_specifier @@ -829,12 +828,13 @@ void ctf_scanner_free(struct ctf_scanner *scanner) %type abstract_declarator_list %type abstract_declarator %type direct_abstract_declarator +%type alias_abstract_declarator_list +%type alias_abstract_declarator +%type direct_alias_abstract_declarator %type declarator %type direct_declarator %type type_declarator %type direct_type_declarator -%type abstract_type_declarator -%type direct_abstract_type_declarator %type pointer %type ctf_assignment_expression_list %type ctf_assignment_expression @@ -1116,7 +1116,7 @@ declaration: _cds_list_splice_tail(&($1)->tmp_head, &($$)->u._typedef.declaration_specifier); _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators); } - | TYPEALIAS declaration_specifiers abstract_declarator_list COLON alias_declaration_specifiers abstract_type_declarator_list SEMICOLON + | TYPEALIAS declaration_specifiers abstract_declarator_list COLON alias_declaration_specifiers alias_abstract_declarator_list SEMICOLON { $$ = make_node(scanner, NODE_TYPEALIAS); $$->u.typealias.target = make_node(scanner, NODE_TYPEALIAS_TARGET); @@ -1233,16 +1233,6 @@ type_declarator_list: } ; -abstract_type_declarator_list: - abstract_type_declarator - { $$ = $1; } - | abstract_type_declarator_list COMMA abstract_type_declarator - { - $$ = $1; - cds_list_add_tail(&($3)->siblings, &($$)->tmp_head); - } - ; - type_specifier: VOID { @@ -1694,7 +1684,7 @@ struct_or_variant_declaration: _cds_list_splice_tail(&($1)->tmp_head, &($$)->u._typedef.declaration_specifier); _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators); } - | TYPEALIAS declaration_specifiers abstract_declarator_list COLON alias_declaration_specifiers abstract_type_declarator_list SEMICOLON + | TYPEALIAS declaration_specifiers abstract_declarator_list COLON alias_declaration_specifiers alias_abstract_declarator_list SEMICOLON { $$ = make_node(scanner, NODE_TYPEALIAS); $$->u.typealias.target = make_node(scanner, NODE_TYPEALIAS_TARGET); @@ -1894,63 +1884,79 @@ direct_abstract_declarator: } ; -declarator: - direct_declarator +alias_abstract_declarator_list: + alias_abstract_declarator { $$ = $1; } - | pointer direct_declarator + | alias_abstract_declarator_list COMMA alias_abstract_declarator + { + $$ = $1; + cds_list_add_tail(&($3)->siblings, &($$)->tmp_head); + } + ; + +alias_abstract_declarator: + direct_alias_abstract_declarator + { $$ = $1; } + | pointer direct_alias_abstract_declarator { $$ = $2; cds_list_splice(&($1)->tmp_head, &($$)->u.type_declarator.pointers); } ; -direct_declarator: - IDENTIFIER +direct_alias_abstract_declarator: + /* empty */ { $$ = make_node(scanner, NODE_TYPE_DECLARATOR); - $$->u.type_declarator.type = TYPEDEC_ID; - $$->u.type_declarator.u.id = $1->s; + $$->u.type_declarator.type = TYPEDEC_ID; + /* id is NULL */ } - | LPAREN declarator RPAREN + | LPAREN alias_abstract_declarator RPAREN { $$ = make_node(scanner, NODE_TYPE_DECLARATOR); $$->u.type_declarator.type = TYPEDEC_NESTED; $$->u.type_declarator.u.nested.type_declarator = $2; } - | direct_declarator LSBRAC type_specifier_or_integer_constant RSBRAC + | direct_alias_abstract_declarator LSBRAC type_specifier_or_integer_constant 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; } + | direct_alias_abstract_declarator LSBRAC 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.abstract_array = 1; + } ; -type_declarator: - direct_type_declarator +declarator: + direct_declarator { $$ = $1; } - | pointer direct_type_declarator + | pointer direct_declarator { $$ = $2; cds_list_splice(&($1)->tmp_head, &($$)->u.type_declarator.pointers); } ; -direct_type_declarator: +direct_declarator: IDENTIFIER { - add_type(scanner, $1); $$ = make_node(scanner, NODE_TYPE_DECLARATOR); $$->u.type_declarator.type = TYPEDEC_ID; $$->u.type_declarator.u.id = $1->s; } - | LPAREN type_declarator RPAREN + | LPAREN declarator RPAREN { $$ = make_node(scanner, NODE_TYPE_DECLARATOR); $$->u.type_declarator.type = TYPEDEC_NESTED; $$->u.type_declarator.u.nested.type_declarator = $2; } - | direct_type_declarator LSBRAC type_specifier_or_integer_constant RSBRAC + | direct_declarator LSBRAC type_specifier_or_integer_constant RSBRAC { $$ = make_node(scanner, NODE_TYPE_DECLARATOR); $$->u.type_declarator.type = TYPEDEC_NESTED; @@ -1959,50 +1965,37 @@ direct_type_declarator: } ; -abstract_type_declarator: - direct_abstract_type_declarator +type_declarator: + direct_type_declarator { $$ = $1; } - | pointer direct_abstract_type_declarator + | pointer direct_type_declarator { $$ = $2; cds_list_splice(&($1)->tmp_head, &($$)->u.type_declarator.pointers); } ; -direct_abstract_type_declarator: - /* empty */ - { - $$ = make_node(scanner, NODE_TYPE_DECLARATOR); - $$->u.type_declarator.type = TYPEDEC_ID; - /* id is NULL */ - } - | IDENTIFIER +direct_type_declarator: + IDENTIFIER { add_type(scanner, $1); $$ = make_node(scanner, NODE_TYPE_DECLARATOR); $$->u.type_declarator.type = TYPEDEC_ID; $$->u.type_declarator.u.id = $1->s; } - | LPAREN abstract_type_declarator RPAREN + | LPAREN type_declarator RPAREN { $$ = make_node(scanner, NODE_TYPE_DECLARATOR); $$->u.type_declarator.type = TYPEDEC_NESTED; $$->u.type_declarator.u.nested.type_declarator = $2; } - | direct_abstract_type_declarator LSBRAC type_specifier_or_integer_constant RSBRAC + | direct_type_declarator LSBRAC type_specifier_or_integer_constant 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; } - | direct_abstract_type_declarator LSBRAC 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.abstract_array = 1; - } ; pointer: @@ -2086,7 +2079,7 @@ ctf_assignment_expression: _cds_list_splice_tail(&($1)->tmp_head, &($$)->u._typedef.declaration_specifier); _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators); } - | TYPEALIAS declaration_specifiers abstract_declarator_list COLON alias_declaration_specifiers abstract_type_declarator_list + | TYPEALIAS declaration_specifiers abstract_declarator_list COLON alias_declaration_specifiers alias_abstract_declarator_list { $$ = make_node(scanner, NODE_TYPEALIAS); $$->u.typealias.target = make_node(scanner, NODE_TYPEALIAS_TARGET); -- 2.34.1