diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2000-11-28 10:23:03 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2000-11-28 10:23:03 +0000 |
| commit | 2f3608c33e4b7787fb460981463958df9caf387e (patch) | |
| tree | 23878c0662c756fdd96927e7e0fa17452fb40257 | |
| parent | eeb753839ff6f622aecf03483ecaedf69d7d25c5 (diff) | |
| download | gcc-2f3608c33e4b7787fb460981463958df9caf387e.zip gcc-2f3608c33e4b7787fb460981463958df9caf387e.tar.gz gcc-2f3608c33e4b7787fb460981463958df9caf387e.tar.bz2 | |
spew.c (yyerror): Cope if yylval.ttype is NULL.
cp:
* spew.c (yyerror): Cope if yylval.ttype is NULL.
testsuite:
* g++.old-deja/g++.other/parse2.C: New test.
From-SVN: r37816
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/spew.c | 12 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.old-deja/g++.other/parse2.C | 11 |
4 files changed, 27 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7f18e81..9d486f6 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2000-11-28 Nathan Sidwell <nathan@codesourcery.com> + * spew.c (yyerror): Cope if yylval.ttype is NULL. + +2000-11-28 Nathan Sidwell <nathan@codesourcery.com> + * decl.c (grokdeclarator): Diagnose undefined template contexts. 2000-11-28 Nathan Sidwell <nathan@codesourcery.com> diff --git a/gcc/cp/spew.c b/gcc/cp/spew.c index 070cf2f..38d8bd0 100644 --- a/gcc/cp/spew.c +++ b/gcc/cp/spew.c @@ -1398,9 +1398,13 @@ yyerror (msgid) || last_token == CPP_INT || last_token == CPP_FLOAT) error ("%s before numeric constant", string); - else if (last_token == CPP_NAME - && TREE_CODE (yylval.ttype) == IDENTIFIER_NODE) - error ("%s before \"%s\"", string, IDENTIFIER_POINTER (yylval.ttype)); + else if (last_token == CPP_NAME) + { + if (yylval.ttype && TREE_CODE (yylval.ttype) == IDENTIFIER_NODE) + error ("%s before `%s'", string, IDENTIFIER_POINTER (yylval.ttype)); + else + error ("%s before `%c'", string, yychar); + } else - error ("%s before '%s' token", string, NAME(last_token)); + error ("%s before `%s' token", string, NAME (last_token)); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f827bf0..06f689b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2000-11-28 Nathan Sidwell <nathan@codesourcery.com> + * g++.old-deja/g++.other/parse2.C: New test. + +2000-11-28 Nathan Sidwell <nathan@codesourcery.com> + * g++.old-deja/g++.pt/incomplete1.C: New test. 2000-11-28 Nathan Sidwell <nathan@codesourcery.com> diff --git a/gcc/testsuite/g++.old-deja/g++.other/parse2.C b/gcc/testsuite/g++.old-deja/g++.other/parse2.C new file mode 100644 index 0000000..6ecc6e5 --- /dev/null +++ b/gcc/testsuite/g++.old-deja/g++.other/parse2.C @@ -0,0 +1,11 @@ +// Build don't link: + +// Copyright (C) 2000 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 24 Nov 2000 <nathan@codesourcery.com> + +// Bug 531: We ICEd trying to give a parse error. + +struct X +{ + bool operator (const X &) const; // ERROR - parse error +}; |