From 4051959be99ddba084673788892d3e26bac13621 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Mon, 6 Jul 1998 22:30:16 +0000 Subject: c-parse.in (struct_head, [...]): New nonterminals. * c-parse.in (struct_head, union_head, enum_head): New nonterminals. (structsp): Use them. Update files generated from c-parse.in. * extend.texi (Type Attributes): Document it. From-SVN: r20971 --- gcc/c-parse.in | 52 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 15 deletions(-) (limited to 'gcc/c-parse.in') diff --git a/gcc/c-parse.in b/gcc/c-parse.in index d7725e5..16500c5 100644 --- a/gcc/c-parse.in +++ b/gcc/c-parse.in @@ -197,6 +197,7 @@ end ifc %type structsp component_decl_list component_decl_list2 %type component_decl components component_declarator %type enumlist enumerator +%type struct_head union_head enum_head %type typename absdcl absdcl1 type_quals %type xexpr parms parm identifiers @@ -1440,42 +1441,63 @@ notype_declarator: | IDENTIFIER ; +struct_head: + STRUCT + { $$ = NULL_TREE; } + | STRUCT attributes + { $$ = $2; } + ; + +union_head: + UNION + { $$ = NULL_TREE; } + | UNION attributes + { $$ = $2; } + ; + +enum_head: + ENUM + { $$ = NULL_TREE; } + | ENUM attributes + { $$ = $2; } + ; + structsp: - STRUCT identifier '{' + struct_head identifier '{' { $$ = start_struct (RECORD_TYPE, $2); /* Start scope of tag before parsing components. */ } component_decl_list '}' maybe_attribute - { $$ = finish_struct ($4, $5, $7); } - | STRUCT '{' component_decl_list '}' maybe_attribute + { $$ = finish_struct ($4, $5, chainon ($1, $7)); } + | struct_head '{' component_decl_list '}' maybe_attribute { $$ = finish_struct (start_struct (RECORD_TYPE, NULL_TREE), - $3, $5); + $3, chainon ($1, $5)); } - | STRUCT identifier + | struct_head identifier { $$ = xref_tag (RECORD_TYPE, $2); } - | UNION identifier '{' + | union_head identifier '{' { $$ = start_struct (UNION_TYPE, $2); } component_decl_list '}' maybe_attribute - { $$ = finish_struct ($4, $5, $7); } - | UNION '{' component_decl_list '}' maybe_attribute + { $$ = finish_struct ($4, $5, chainon ($1, $7)); } + | union_head '{' component_decl_list '}' maybe_attribute { $$ = finish_struct (start_struct (UNION_TYPE, NULL_TREE), - $3, $5); + $3, chainon ($1, $5)); } - | UNION identifier + | union_head identifier { $$ = xref_tag (UNION_TYPE, $2); } - | ENUM identifier '{' + | enum_head identifier '{' { $3 = suspend_momentary (); $$ = start_enum ($2); } enumlist maybecomma_warn '}' maybe_attribute - { $$ = finish_enum ($4, nreverse ($5), $8); + { $$= finish_enum ($4, nreverse ($5), chainon ($1, $8)); resume_momentary ($3); } - | ENUM '{' + | enum_head '{' { $2 = suspend_momentary (); $$ = start_enum (NULL_TREE); } enumlist maybecomma_warn '}' maybe_attribute - { $$ = finish_enum ($3, nreverse ($4), $7); + { $$= finish_enum ($3, nreverse ($4), chainon ($1, $7)); resume_momentary ($2); } - | ENUM identifier + | enum_head identifier { $$ = xref_tag (ENUMERAL_TYPE, $2); } ; -- cgit v1.1