procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

parse.y (reserved_declspecs): Don't handle attributes.

Browse source 
* parse.y (reserved_declspecs): Don't handle attributes.
        (reserved_typespecquals): Handle them here.
        * Make-lang.in (parse.c): Adjust expected conflicts.

From-SVN: r49678
This commit is contained in:
Jason Merrill 2002-02-11 10:52:20 -05:00
parent d6b2c47474
commit e6b9638bff
4 changed files with 44 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gcc/cp/ChangeLog
View file

@ -1,3 +1,9 @@
2002-02-11 Jason Merrill <jason@redhat.com>
* parse.y (reserved_declspecs): Don't handle attributes.
(reserved_typespecquals): Handle them here.
* Make-lang.in (parse.c): Adjust expected conflicts.
2002-02-08 Jakub Jelinek <jakub@redhat.com>
* parse.y (primary, primary_no_id): Use compstmt_or_stmtexpr
@ -1603,8 +1609,8 @@ Fri Sep 21 08:16:19 2001 J"orn Rennecke <amylaar@redhat.com>
2001-09-15 Gabriel Dos Reis <gdr@merlin.codesourcery.com>
* Make-lang.in (cp/error.o): Depend on real.h
* error.c: #include "real.h"
* Make-lang.in (cp/error.o): Depend on real.h
* error.c: #include "real.h"
2001-09-15 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>

2
gcc/cp/Make-lang.in
View file

@ -120,7 +120,7 @@ $(srcdir)/cp/cfns.h: $(srcdir)/cp/cfns.gperf
$(srcdir)/cp/parse.h: $(srcdir)/cp/parse.c
$(srcdir)/cp/parse.c: $(srcdir)/cp/parse.y
@echo "Expect 31 shift/reduce conflicts and 58 reduce/reduce conflicts."
@echo "Expect 33 shift/reduce conflicts and 58 reduce/reduce conflicts."
cd $(srcdir)/cp && \
if $(BISON) $(BISONFLAGS) -d -o p$$$$.c parse.y; then \
grep '^#define[ ]*YYEMPTY' p$$$$.c >> p$$$$.h ; \

8
gcc/cp/parse.y
View file

@ -1895,10 +1895,6 @@ reserved_declspecs:
warning ("`%s' is not at beginning of declaration",
IDENTIFIER_POINTER ($2));
$$ = tree_cons (NULL_TREE, $2, $$); }
| reserved_declspecs attributes
{ $$ = tree_cons ($2, NULL_TREE, $1); }
| attributes
{ $$ = tree_cons ($1, NULL_TREE, NULL_TREE); }
;
/* List of just storage classes and type modifiers.
@ -1966,6 +1962,10 @@ reserved_typespecquals:
{ $$ = build_tree_list (NULL_TREE, $1.t); }
| reserved_typespecquals typespecqual_reserved
{ $$ = tree_cons (NULL_TREE, $2.t, $1); }
| reserved_typespecquals attributes
{ $$ = tree_cons ($2, NULL_TREE, $1); }
| attributes %prec EMPTY
{ $$ = tree_cons ($1, NULL_TREE, NULL_TREE); }
;
/* A typespec (but not a type qualifier).

31
gcc/testsuite/g++.dg/ext/attrib4.C Normal file
View file

@ -0,0 +1,31 @@
// Test for syntax support of various attribute permutations.
int
__attribute__((noreturn))
__attribute__((unused))
one(void); // OK
__attribute__((noreturn))
__attribute__((unused))
int
two(void); // OK
int
__attribute__((unused))
three (void)
__attribute__((noreturn)); // OK
__attribute__((unused))
int
four (void)
__attribute__((noreturn)); // OK
int
five(void)
__attribute__((noreturn))
__attribute__((unused)); // OK
__attribute__((noreturn))
int
__attribute__((unused)) // parse error before '__attribute__' in C++
six (void); // OK in C