|
 |
4ac4fd |
--- gcc/c-parse.in.jj 2009-03-09 14:27:38.000000000 +0100
|
|
|
4ac4fd |
+++ gcc/c-parse.in 2009-03-09 14:33:29.000000000 +0100
|
|
|
4ac4fd |
@@ -1713,7 +1713,7 @@ enum_head:
|
|
|
4ac4fd |
|
|
|
4ac4fd |
structsp_attr:
|
|
|
4ac4fd |
struct_head identifier '{'
|
|
|
4ac4fd |
- { $$ = start_struct (RECORD_TYPE, $2);
|
|
|
4ac4fd |
+ { $<ttype>$ = start_struct (RECORD_TYPE, $2);
|
|
|
4ac4fd |
/* Start scope of tag before parsing components. */
|
|
|
4ac4fd |
}
|
|
|
4ac4fd |
component_decl_list '}' maybe_attribute
|
|
|
4ac4fd |
@@ -1723,7 +1723,7 @@ structsp_attr:
|
|
|
4ac4fd |
$3, chainon ($1, $5));
|
|
|
4ac4fd |
}
|
|
|
4ac4fd |
| union_head identifier '{'
|
|
|
4ac4fd |
- { $$ = start_struct (UNION_TYPE, $2); }
|
|
|
4ac4fd |
+ { $<ttype>$ = start_struct (UNION_TYPE, $2); }
|
|
|
4ac4fd |
component_decl_list '}' maybe_attribute
|
|
|
4ac4fd |
{ $$ = finish_struct ($<ttype>4, $5, chainon ($1, $7)); }
|
|
|
4ac4fd |
| union_head '{' component_decl_list '}' maybe_attribute
|
|
|
4ac4fd |
@@ -1731,12 +1731,12 @@ structsp_attr:
|
|
|
4ac4fd |
$3, chainon ($1, $5));
|
|
|
4ac4fd |
}
|
|
|
4ac4fd |
| enum_head identifier '{'
|
|
|
4ac4fd |
- { $$ = start_enum ($2); }
|
|
|
4ac4fd |
+ { $<ttype>$ = start_enum ($2); }
|
|
|
4ac4fd |
enumlist maybecomma_warn '}' maybe_attribute
|
|
|
4ac4fd |
{ $$ = finish_enum ($<ttype>4, nreverse ($5),
|
|
|
4ac4fd |
chainon ($1, $8)); }
|
|
|
4ac4fd |
| enum_head '{'
|
|
|
4ac4fd |
- { $$ = start_enum (NULL_TREE); }
|
|
|
4ac4fd |
+ { $<ttype>$ = start_enum (NULL_TREE); }
|
|
|
4ac4fd |
enumlist maybecomma_warn '}' maybe_attribute
|
|
|
4ac4fd |
{ $$ = finish_enum ($<ttype>3, nreverse ($4),
|
|
|
4ac4fd |
chainon ($1, $7)); }
|
|
|
4ac4fd |
--- gcc/cp/parse.y.jj 2009-03-09 14:39:01.000000000 +0100
|
|
|
4ac4fd |
+++ gcc/cp/parse.y 2009-03-09 14:41:58.000000000 +0100
|
|
|
4ac4fd |
@@ -804,7 +804,7 @@ fndef:
|
|
|
4ac4fd |
|
|
|
4ac4fd |
constructor_declarator:
|
|
|
4ac4fd |
nested_name_specifier SELFNAME '('
|
|
|
4ac4fd |
- { $$ = begin_constructor_declarator ($1, $2); }
|
|
|
4ac4fd |
+ { $<ttype>$ = begin_constructor_declarator ($1, $2); }
|
|
|
4ac4fd |
parmlist ')' cv_qualifiers exception_specification_opt
|
|
|
4ac4fd |
{ $$ = make_call_declarator ($<ttype>4, $5, $7, $8); }
|
|
|
4ac4fd |
| nested_name_specifier SELFNAME LEFT_RIGHT cv_qualifiers exception_specification_opt
|
|
|
4ac4fd |
@@ -812,7 +812,7 @@ constructor_declarator:
|
|
|
4ac4fd |
$$ = make_call_declarator ($$, empty_parms (), $4, $5);
|
|
|
4ac4fd |
}
|
|
|
4ac4fd |
| global_scope nested_name_specifier SELFNAME '('
|
|
|
4ac4fd |
- { $$ = begin_constructor_declarator ($2, $3); }
|
|
|
4ac4fd |
+ { $<ttype>$ = begin_constructor_declarator ($2, $3); }
|
|
|
4ac4fd |
parmlist ')' cv_qualifiers exception_specification_opt
|
|
|
4ac4fd |
{ $$ = make_call_declarator ($<ttype>5, $6, $8, $9); }
|
|
|
4ac4fd |
| global_scope nested_name_specifier SELFNAME LEFT_RIGHT cv_qualifiers exception_specification_opt
|
|
|
4ac4fd |
@@ -820,7 +820,7 @@ constructor_declarator:
|
|
|
4ac4fd |
$$ = make_call_declarator ($$, empty_parms (), $5, $6);
|
|
|
4ac4fd |
}
|
|
|
4ac4fd |
| nested_name_specifier self_template_type '('
|
|
|
4ac4fd |
- { $$ = begin_constructor_declarator ($1, $2); }
|
|
|
4ac4fd |
+ { $<ttype>$ = begin_constructor_declarator ($1, $2); }
|
|
|
4ac4fd |
parmlist ')' cv_qualifiers exception_specification_opt
|
|
|
4ac4fd |
{ $$ = make_call_declarator ($<ttype>4, $5, $7, $8); }
|
|
|
4ac4fd |
| nested_name_specifier self_template_type LEFT_RIGHT cv_qualifiers exception_specification_opt
|
|
|
4ac4fd |
@@ -828,7 +828,7 @@ constructor_declarator:
|
|
|
4ac4fd |
$$ = make_call_declarator ($$, empty_parms (), $4, $5);
|
|
|
4ac4fd |
}
|
|
|
4ac4fd |
| global_scope nested_name_specifier self_template_type '('
|
|
|
4ac4fd |
- { $$ = begin_constructor_declarator ($2, $3); }
|
|
|
4ac4fd |
+ { $<ttype>$ = begin_constructor_declarator ($2, $3); }
|
|
|
4ac4fd |
parmlist ')' cv_qualifiers exception_specification_opt
|
|
|
4ac4fd |
{ $$ = make_call_declarator ($<ttype>5, $6, $8, $9); }
|
|
|
4ac4fd |
| global_scope nested_name_specifier self_template_type LEFT_RIGHT cv_qualifiers exception_specification_opt
|