Skip to content

R
riscv-gcc-1
Commit 52fbc847 by Jason Merrill
Options

parse.y (fn.def2): Fix 'attrs' format. 

	* parse.y (fn.def2): Fix 'attrs' format.
	* Makefile.in (CONFLICTS): Update.
	* parse.y (expr_or_declarator_intern): New rule.
	(expr_or_declarator, direct_notype_declarator, primary,
	functional_cast): Use it.
	(notype_declarator_intern): New rule.
	(notype_declarator, complex_notype_declarator): Use it.

From-SVN: r23159
parent 176b6042
Showing with 74 additions and 17 deletions
gcc/cp/ChangeLog
1998-10-18 Jason Merrill <jason@yorick.cygnus.com>
* parse.y (fn.def2): Fix 'attrs' format.
1998-10-18 Alastair J. Houghton <ajh8@doc.ic.ac.uk>
* Makefile.in (CONFLICTS): Update.
* parse.y (expr_or_declarator_intern): New rule.
(expr_or_declarator, direct_notype_declarator, primary,
functional_cast): Use it.
(notype_declarator_intern): New rule.
(notype_declarator, complex_notype_declarator): Use it.
1998-10-17 Jason Merrill <jason@yorick.cygnus.com> 1998-10-17 Jason Merrill <jason@yorick.cygnus.com>
* decl.c (grokfndecl): Set DECL_CONTEXT to namespace if appropriate. * decl.c (grokfndecl): Set DECL_CONTEXT to namespace if appropriate.
......
gcc/cp/Makefile.in
...@@ -219,7 +219,7 @@ parse.o : $(PARSE_C) $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h lex.h \ ...@@ -219,7 +219,7 @@ parse.o : $(PARSE_C) $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h lex.h \
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(BIG_SWITCHFLAG) \ $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(BIG_SWITCHFLAG) \
`echo $(PARSE_C) | sed 's,^\./,,'` `echo $(PARSE_C) | sed 's,^\./,,'`
CONFLICTS = expect 25 shift/reduce conflicts and 42 reduce/reduce conflicts. CONFLICTS = expect 35 shift/reduce conflicts and 42 reduce/reduce conflicts.
$(PARSE_H) : $(PARSE_C) $(PARSE_H) : $(PARSE_C)
$(PARSE_C) : $(srcdir)/parse.y $(PARSE_C) : $(srcdir)/parse.y
@echo $(CONFLICTS) @echo $(CONFLICTS)
......
gcc/cp/decl.c
...@@ -8555,6 +8555,11 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, attrlist) ...@@ -8555,6 +8555,11 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, attrlist)
decl = *next; decl = *next;
switch (TREE_CODE (decl)) switch (TREE_CODE (decl))
{ {
case TREE_LIST:
/* For attributes. */
next = &TREE_VALUE (decl);
break;
case COND_EXPR: case COND_EXPR:
ctype = NULL_TREE; ctype = NULL_TREE;
next = &TREE_OPERAND (decl, 0); next = &TREE_OPERAND (decl, 0);
...@@ -9432,6 +9437,16 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, attrlist) ...@@ -9432,6 +9437,16 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, attrlist)
} }
switch (TREE_CODE (declarator)) switch (TREE_CODE (declarator))
{ {
case TREE_LIST:
{
/* We encode a declarator with embedded attributes using
a TREE_LIST. */
tree attrs = TREE_PURPOSE (declarator);
declarator = TREE_VALUE (declarator);
decl_attributes (type, attrs, NULL_TREE);
}
break;
case ARRAY_REF: case ARRAY_REF:
{ {
register tree itype = NULL_TREE; register tree itype = NULL_TREE;
......
gcc/cp/decl2.c
...@@ -3939,6 +3939,10 @@ finish_decl_parsing (decl) ...@@ -3939,6 +3939,10 @@ finish_decl_parsing (decl)
case ARRAY_REF: case ARRAY_REF:
TREE_OPERAND (decl, 0) = finish_decl_parsing (TREE_OPERAND (decl, 0)); TREE_OPERAND (decl, 0) = finish_decl_parsing (TREE_OPERAND (decl, 0));
return decl; return decl;
case TREE_LIST:
/* For attribute handling. */
TREE_VALUE (decl) = finish_decl_parsing (TREE_VALUE (decl));
return decl;
default: default:
my_friendly_abort (5); my_friendly_abort (5);
return NULL_TREE; return NULL_TREE;
......
gcc/cp/parse.c
This source diff could not be displayed because it is too large. You can view the blob instead.
gcc/cp/parse.y
...@@ -203,6 +203,7 @@ empty_parms () ...@@ -203,6 +203,7 @@ empty_parms ()
%type <ttype> compstmt implicitly_scoped_stmt %type <ttype> compstmt implicitly_scoped_stmt
%type <ttype> declarator notype_declarator after_type_declarator %type <ttype> declarator notype_declarator after_type_declarator
%type <ttype> notype_declarator_intern
%type <ttype> direct_notype_declarator direct_after_type_declarator %type <ttype> direct_notype_declarator direct_after_type_declarator
%type <itype> components notype_components %type <itype> components notype_components
%type <ttype> component_decl component_decl_1 %type <ttype> component_decl component_decl_1
...@@ -216,7 +217,8 @@ empty_parms () ...@@ -216,7 +217,8 @@ empty_parms ()
%type <ttype> xexpr parmlist parms bad_parm %type <ttype> xexpr parmlist parms bad_parm
%type <ttype> identifiers_or_typenames %type <ttype> identifiers_or_typenames
%type <ttype> fcast_or_absdcl regcast_or_absdcl %type <ttype> fcast_or_absdcl regcast_or_absdcl
%type <ttype> expr_or_declarator complex_notype_declarator %type <ttype> expr_or_declarator expr_or_declarator_intern
%type <ttype> complex_notype_declarator
%type <ttype> notype_unqualified_id unqualified_id qualified_id %type <ttype> notype_unqualified_id unqualified_id qualified_id
%type <ttype> template_id do_id object_template_id notype_template_declarator %type <ttype> template_id do_id object_template_id notype_template_declarator
%type <ttype> overqualified_id notype_qualified_id any_id %type <ttype> overqualified_id notype_qualified_id any_id
...@@ -725,10 +727,12 @@ fn.def2: ...@@ -725,10 +727,12 @@ fn.def2:
| typed_declspecs declarator | typed_declspecs declarator
{ tree specs, attrs; { tree specs, attrs;
split_specs_attrs ($1.t, &specs, &attrs); split_specs_attrs ($1.t, &specs, &attrs);
attrs = build_tree_list (attrs, NULL_TREE);
$$ = start_method (specs, $2, attrs); goto rest_of_mdef; } $$ = start_method (specs, $2, attrs); goto rest_of_mdef; }
| declmods notype_declarator | declmods notype_declarator
{ tree specs, attrs; { tree specs, attrs;
split_specs_attrs ($1, &specs, &attrs); split_specs_attrs ($1, &specs, &attrs);
attrs = build_tree_list (attrs, NULL_TREE);
$$ = start_method (specs, $2, attrs); goto rest_of_mdef; } $$ = start_method (specs, $2, attrs); goto rest_of_mdef; }
| notype_declarator | notype_declarator
{ $$ = start_method (NULL_TREE, $$, NULL_TREE); { $$ = start_method (NULL_TREE, $$, NULL_TREE);
...@@ -736,6 +740,7 @@ fn.def2: ...@@ -736,6 +740,7 @@ fn.def2:
| declmods constructor_declarator | declmods constructor_declarator
{ tree specs, attrs; { tree specs, attrs;
split_specs_attrs ($1, &specs, &attrs); split_specs_attrs ($1, &specs, &attrs);
attrs = build_tree_list (attrs, NULL_TREE);
$$ = start_method (specs, $2, attrs); goto rest_of_mdef; } $$ = start_method (specs, $2, attrs); goto rest_of_mdef; }
| constructor_declarator | constructor_declarator
{ $$ = start_method (NULL_TREE, $$, NULL_TREE); { $$ = start_method (NULL_TREE, $$, NULL_TREE);
...@@ -1325,13 +1330,23 @@ unqualified_id: ...@@ -1325,13 +1330,23 @@ unqualified_id:
| SELFNAME | SELFNAME
; ;
expr_or_declarator_intern:
expr_or_declarator
| attributes expr_or_declarator
{
/* Provide support for '(' attributes '*' declarator ')'
etc */
$$ = decl_tree_cons ($1, $2, NULL_TREE);
}
;
expr_or_declarator: expr_or_declarator:
notype_unqualified_id notype_unqualified_id
| '*' expr_or_declarator %prec UNARY | '*' expr_or_declarator_intern %prec UNARY
{ $$ = build_parse_node (INDIRECT_REF, $2); } { $$ = build_parse_node (INDIRECT_REF, $2); }
| '&' expr_or_declarator %prec UNARY | '&' expr_or_declarator_intern %prec UNARY
{ $$ = build_parse_node (ADDR_EXPR, $2); } { $$ = build_parse_node (ADDR_EXPR, $2); }
| '(' expr_or_declarator ')' | '(' expr_or_declarator_intern ')'
{ $$ = $2; } { $$ = $2; }
; ;
...@@ -1348,8 +1363,8 @@ direct_notype_declarator: ...@@ -1348,8 +1363,8 @@ direct_notype_declarator:
to the Koenig lookup shift in primary, below. I hate yacc. */ to the Koenig lookup shift in primary, below. I hate yacc. */
| notype_unqualified_id %prec '(' | notype_unqualified_id %prec '('
| notype_template_declarator | notype_template_declarator
| '(' expr_or_declarator ')' | '(' expr_or_declarator_intern ')'
{ $$ = finish_decl_parsing ($2); } { $$ = finish_decl_parsing ($2); }
; ;
primary: primary:
...@@ -1378,7 +1393,7 @@ primary: ...@@ -1378,7 +1393,7 @@ primary:
} }
| '(' expr ')' | '(' expr ')'
{ $$ = finish_parenthesized_expr ($2); } { $$ = finish_parenthesized_expr ($2); }
| '(' expr_or_declarator ')' | '(' expr_or_declarator_intern ')'
{ $2 = reparse_decl_as_expr (NULL_TREE, $2); { $2 = reparse_decl_as_expr (NULL_TREE, $2);
$$ = finish_parenthesized_expr ($2); } $$ = finish_parenthesized_expr ($2); }
| '(' error ')' | '(' error ')'
...@@ -2774,16 +2789,26 @@ direct_after_type_declarator: ...@@ -2774,16 +2789,26 @@ direct_after_type_declarator:
/* A declarator allowed whether or not there has been /* A declarator allowed whether or not there has been
an explicit typespec. These cannot redeclare a typedef-name. */ an explicit typespec. These cannot redeclare a typedef-name. */
notype_declarator_intern:
notype_declarator
| attributes notype_declarator
{
/* Provide support for '(' attributes '*' declarator ')'
etc */
$$ = decl_tree_cons ($1, $2, NULL_TREE);
}
;
notype_declarator: notype_declarator:
'*' nonempty_cv_qualifiers notype_declarator %prec UNARY '*' nonempty_cv_qualifiers notype_declarator_intern %prec UNARY
{ $$ = make_pointer_declarator ($2.t, $3); } { $$ = make_pointer_declarator ($2.t, $3); }
| '&' nonempty_cv_qualifiers notype_declarator %prec UNARY | '&' nonempty_cv_qualifiers notype_declarator_intern %prec UNARY
{ $$ = make_reference_declarator ($2.t, $3); } { $$ = make_reference_declarator ($2.t, $3); }
| '*' notype_declarator %prec UNARY | '*' notype_declarator_intern %prec UNARY
{ $$ = make_pointer_declarator (NULL_TREE, $2); } { $$ = make_pointer_declarator (NULL_TREE, $2); }
| '&' notype_declarator %prec UNARY | '&' notype_declarator_intern %prec UNARY
{ $$ = make_reference_declarator (NULL_TREE, $2); } { $$ = make_reference_declarator (NULL_TREE, $2); }
| ptr_to_mem cv_qualifiers notype_declarator | ptr_to_mem cv_qualifiers notype_declarator_intern
{ tree arg = make_pointer_declarator ($2, $3); { tree arg = make_pointer_declarator ($2, $3);
$$ = build_parse_node (SCOPE_REF, $1, arg); $$ = build_parse_node (SCOPE_REF, $1, arg);
} }
...@@ -2791,15 +2816,15 @@ notype_declarator: ...@@ -2791,15 +2816,15 @@ notype_declarator:
; ;
complex_notype_declarator: complex_notype_declarator:
'*' nonempty_cv_qualifiers notype_declarator %prec UNARY '*' nonempty_cv_qualifiers notype_declarator_intern %prec UNARY
{ $$ = make_pointer_declarator ($2.t, $3); } { $$ = make_pointer_declarator ($2.t, $3); }
| '&' nonempty_cv_qualifiers notype_declarator %prec UNARY | '&' nonempty_cv_qualifiers notype_declarator_intern %prec UNARY
{ $$ = make_reference_declarator ($2.t, $3); } { $$ = make_reference_declarator ($2.t, $3); }
| '*' complex_notype_declarator %prec UNARY | '*' complex_notype_declarator %prec UNARY
{ $$ = make_pointer_declarator (NULL_TREE, $2); } { $$ = make_pointer_declarator (NULL_TREE, $2); }
| '&' complex_notype_declarator %prec UNARY | '&' complex_notype_declarator %prec UNARY
{ $$ = make_reference_declarator (NULL_TREE, $2); } { $$ = make_reference_declarator (NULL_TREE, $2); }
| ptr_to_mem cv_qualifiers notype_declarator | ptr_to_mem cv_qualifiers notype_declarator_intern
{ tree arg = make_pointer_declarator ($2, $3); { tree arg = make_pointer_declarator ($2, $3);
$$ = build_parse_node (SCOPE_REF, $1, arg); $$ = build_parse_node (SCOPE_REF, $1, arg);
} }
...@@ -2851,7 +2876,7 @@ overqualified_id: ...@@ -2851,7 +2876,7 @@ overqualified_id:
functional_cast: functional_cast:
typespec '(' nonnull_exprlist ')' typespec '(' nonnull_exprlist ')'
{ $$ = build_functional_cast ($1.t, $3); } { $$ = build_functional_cast ($1.t, $3); }
| typespec '(' expr_or_declarator ')' | typespec '(' expr_or_declarator_intern ')'
{ $$ = reparse_decl_as_expr ($1.t, $3); } { $$ = reparse_decl_as_expr ($1.t, $3); }
| typespec fcast_or_absdcl %prec EMPTY | typespec fcast_or_absdcl %prec EMPTY
{ $$ = reparse_absdcl_as_expr ($1.t, $2); } { $$ = reparse_absdcl_as_expr ($1.t, $2); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment