diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 10 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/enum2.C | 7 | ||||
| -rw-r--r-- | gcc/testsuite/g++.old-deja/g++.pt/enum5.C | 4 |
5 files changed, 30 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index eff52c9..4ad1c6e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2004-12-02 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + + PR c++/18123 + * parser.c (cp_parser_type_specifier): Catch template declaration + of enum. + 2004-12-01 Matt Austern <austern@apple.com> * name-lookup.c (namespace_binding): Omit alias check for global namespace. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 3e25076..51b8f10 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -9130,7 +9130,15 @@ cp_parser_type_specifier (cp_parser* parser, && cp_lexer_peek_nth_token (parser->lexer, 3)->type == CPP_OPEN_BRACE)) { - type_spec = cp_parser_enum_specifier (parser); + if (parser->num_template_parameter_lists) + { + error ("template declaration of %qs", "enum"); + cp_parser_skip_to_end_of_block_or_statement (parser); + type_spec = error_mark_node; + } + else + type_spec = cp_parser_enum_specifier (parser); + if (declares_class_or_enum) *declares_class_or_enum = 2; if (decl_specs) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7842f63..84eae74 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2004-12-02 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + + PR c++/18123 + * g++.dg/parse/enum2.C: New test. + * g++.old-deja/g++.pt/enum5.C: Adjust error location. + 2004-12-02 Nick Clifton <nickc@redhat.com> * gcc.target/xstormy16: New test directory. diff --git a/gcc/testsuite/g++.dg/parse/enum2.C b/gcc/testsuite/g++.dg/parse/enum2.C new file mode 100644 index 0000000..f29d3b5 --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/enum2.C @@ -0,0 +1,7 @@ +// { dg-do compile } + +// Origin: Volker Reichelt <reichelt@gcc.gnu.org> + +// PR c++/18123: ICE pushing tag from invalid template. + +template<int> enum E { e }; // { dg-error "template declaration" } diff --git a/gcc/testsuite/g++.old-deja/g++.pt/enum5.C b/gcc/testsuite/g++.old-deja/g++.pt/enum5.C index a7c5ea3..d4eea4f 100644 --- a/gcc/testsuite/g++.old-deja/g++.pt/enum5.C +++ b/gcc/testsuite/g++.old-deja/g++.pt/enum5.C @@ -1,4 +1,4 @@ // { dg-do assemble } -template <> -enum E {e}; // { dg-error "" } template declaration of enum +template <> // { dg-error "" } template declaration of enum +enum E {e}; |