2019-05-27 16:46:39 +00:00
|
|
|
Index: gcc/cp/parse.y
|
|
|
|
|
===================================================================
|
|
|
|
|
--- gcc/cp/parse.y.orig 2019-05-27 18:40:52.000000000 +0200
|
|
|
|
|
+++ gcc/cp/parse.y 2019-05-27 18:41:16.000000000 +0200
|
|
|
|
|
@@ -821,7 +821,7 @@ fndef:
|
2014-05-21 14:08:40 +00:00
|
|
|
|
|
|
|
|
constructor_declarator:
|
|
|
|
|
nested_name_specifier SELFNAME '('
|
|
|
|
|
- { $$ = begin_constructor_declarator ($1, $2); }
|
|
|
|
|
+ { $<ttype>$ = begin_constructor_declarator ($1, $2); }
|
|
|
|
|
parmlist ')' cv_qualifiers exception_specification_opt
|
|
|
|
|
{ $$ = make_call_declarator ($<ttype>4, $5, $7, $8); }
|
|
|
|
|
| nested_name_specifier SELFNAME LEFT_RIGHT cv_qualifiers exception_specification_opt
|
2019-05-27 16:46:39 +00:00
|
|
|
@@ -829,7 +829,7 @@ constructor_declarator:
|
2014-05-21 14:08:40 +00:00
|
|
|
$$ = make_call_declarator ($$, empty_parms (), $4, $5);
|
|
|
|
|
}
|
|
|
|
|
| global_scope nested_name_specifier SELFNAME '('
|
|
|
|
|
- { $$ = begin_constructor_declarator ($2, $3); }
|
|
|
|
|
+ { $<ttype>$ = begin_constructor_declarator ($2, $3); }
|
|
|
|
|
parmlist ')' cv_qualifiers exception_specification_opt
|
|
|
|
|
{ $$ = make_call_declarator ($<ttype>5, $6, $8, $9); }
|
|
|
|
|
| global_scope nested_name_specifier SELFNAME LEFT_RIGHT cv_qualifiers exception_specification_opt
|
2019-05-27 16:46:39 +00:00
|
|
|
@@ -837,7 +837,7 @@ constructor_declarator:
|
2014-05-21 14:08:40 +00:00
|
|
|
$$ = make_call_declarator ($$, empty_parms (), $5, $6);
|
|
|
|
|
}
|
|
|
|
|
| nested_name_specifier self_template_type '('
|
|
|
|
|
- { $$ = begin_constructor_declarator ($1, $2); }
|
|
|
|
|
+ { $<ttype>$ = begin_constructor_declarator ($1, $2); }
|
|
|
|
|
parmlist ')' cv_qualifiers exception_specification_opt
|
|
|
|
|
{ $$ = make_call_declarator ($<ttype>4, $5, $7, $8); }
|
|
|
|
|
| nested_name_specifier self_template_type LEFT_RIGHT cv_qualifiers exception_specification_opt
|
2019-05-27 16:46:39 +00:00
|
|
|
@@ -845,7 +845,7 @@ constructor_declarator:
|
2014-05-21 14:08:40 +00:00
|
|
|
$$ = make_call_declarator ($$, empty_parms (), $4, $5);
|
|
|
|
|
}
|
|
|
|
|
| global_scope nested_name_specifier self_template_type '('
|
|
|
|
|
- { $$ = begin_constructor_declarator ($2, $3); }
|
|
|
|
|
+ { $<ttype>$ = begin_constructor_declarator ($2, $3); }
|
|
|
|
|
parmlist ')' cv_qualifiers exception_specification_opt
|
|
|
|
|
{ $$ = make_call_declarator ($<ttype>5, $6, $8, $9); }
|
|
|
|
|
| global_scope nested_name_specifier self_template_type LEFT_RIGHT cv_qualifiers exception_specification_opt
|
2019-05-27 16:46:39 +00:00
|
|
|
Index: gcc/c-parse.in
|
|
|
|
|
===================================================================
|
|
|
|
|
--- gcc/c-parse.in.orig 2019-05-27 18:40:48.000000000 +0200
|
|
|
|
|
+++ gcc/c-parse.in 2019-05-27 18:41:16.000000000 +0200
|
|
|
|
|
@@ -1751,7 +1751,7 @@ enum_head:
|
2014-05-21 14:08:40 +00:00
|
|
|
|
|
|
|
|
structsp_attr:
|
|
|
|
|
struct_head identifier '{'
|
|
|
|
|
- { $$ = start_struct (RECORD_TYPE, $2);
|
|
|
|
|
+ { $<ttype>$ = start_struct (RECORD_TYPE, $2);
|
|
|
|
|
/* Start scope of tag before parsing components. */
|
|
|
|
|
}
|
|
|
|
|
component_decl_list '}' maybe_attribute
|
2019-05-27 16:46:39 +00:00
|
|
|
@@ -1761,7 +1761,7 @@ structsp_attr:
|
2014-05-21 14:08:40 +00:00
|
|
|
$3, chainon ($1, $5));
|
|
|
|
|
}
|
|
|
|
|
| union_head identifier '{'
|
|
|
|
|
- { $$ = start_struct (UNION_TYPE, $2); }
|
|
|
|
|
+ { $<ttype>$ = start_struct (UNION_TYPE, $2); }
|
|
|
|
|
component_decl_list '}' maybe_attribute
|
|
|
|
|
{ $$ = finish_struct ($<ttype>4, $5, chainon ($1, $7)); }
|
|
|
|
|
| union_head '{' component_decl_list '}' maybe_attribute
|
2019-05-27 16:46:39 +00:00
|
|
|
@@ -1769,12 +1769,12 @@ structsp_attr:
|
|
|
|
|
$3, chainon ($1, $5));
|
|
|
|
|
}
|
|
|
|
|
| enum_head identifier '{'
|
|
|
|
|
- { $$ = start_enum ($2); }
|
|
|
|
|
+ { $<ttype>$ = start_enum ($2); }
|
|
|
|
|
enumlist maybecomma_warn '}' maybe_attribute
|
|
|
|
|
{ $$ = finish_enum ($<ttype>4, nreverse ($5),
|
|
|
|
|
chainon ($1, $8)); }
|
|
|
|
|
| enum_head '{'
|
|
|
|
|
- { $$ = start_enum (NULL_TREE); }
|
|
|
|
|
+ { $<ttype>$ = start_enum (NULL_TREE); }
|
|
|
|
|
enumlist maybecomma_warn '}' maybe_attribute
|
|
|
|
|
{ $$ = finish_enum ($<ttype>3, nreverse ($4),
|
|
|
|
|
chainon ($1, $7)); }
|
|
|
|
|
Index: gcc/c-parse.y
|
|
|
|
|
===================================================================
|
|
|
|
|
--- gcc/c-parse.y.orig 2019-05-27 18:40:52.000000000 +0200
|
|
|
|
|
+++ gcc/c-parse.y 2019-05-27 18:41:16.000000000 +0200
|
|
|
|
|
@@ -1661,7 +1661,7 @@ enum_head:
|
|
|
|
|
|
|
|
|
|
structsp_attr:
|
|
|
|
|
struct_head identifier '{'
|
|
|
|
|
- { $$ = start_struct (RECORD_TYPE, $2);
|
|
|
|
|
+ { $<ttype>$ = start_struct (RECORD_TYPE, $2);
|
|
|
|
|
/* Start scope of tag before parsing components. */
|
|
|
|
|
}
|
|
|
|
|
component_decl_list '}' maybe_attribute
|
|
|
|
|
@@ -1671,7 +1671,7 @@ structsp_attr:
|
|
|
|
|
$3, chainon ($1, $5));
|
|
|
|
|
}
|
|
|
|
|
| union_head identifier '{'
|
|
|
|
|
- { $$ = start_struct (UNION_TYPE, $2); }
|
|
|
|
|
+ { $<ttype>$ = start_struct (UNION_TYPE, $2); }
|
|
|
|
|
component_decl_list '}' maybe_attribute
|
|
|
|
|
{ $$ = finish_struct ($<ttype>4, $5, chainon ($1, $7)); }
|
|
|
|
|
| union_head '{' component_decl_list '}' maybe_attribute
|
|
|
|
|
@@ -1679,12 +1679,12 @@ structsp_attr:
|
2014-05-21 14:08:40 +00:00
|
|
|
$3, chainon ($1, $5));
|
|
|
|
|
}
|
|
|
|
|
| enum_head identifier '{'
|
|
|
|
|
- { $$ = start_enum ($2); }
|
|
|
|
|
+ { $<ttype>$ = start_enum ($2); }
|
|
|
|
|
enumlist maybecomma_warn '}' maybe_attribute
|
|
|
|
|
{ $$ = finish_enum ($<ttype>4, nreverse ($5),
|
|
|
|
|
chainon ($1, $8)); }
|
|
|
|
|
| enum_head '{'
|
|
|
|
|
- { $$ = start_enum (NULL_TREE); }
|
|
|
|
|
+ { $<ttype>$ = start_enum (NULL_TREE); }
|
|
|
|
|
enumlist maybecomma_warn '}' maybe_attribute
|
|
|
|
|
{ $$ = finish_enum ($<ttype>3, nreverse ($4),
|
|
|
|
|
chainon ($1, $7)); }
|
