From 5072c6bd2e2e365b1cc92e921cbf75d34fb26c0f Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 10 Nov 2008 14:41:37 +0100 Subject: [PATCH] re PR c++/38021 (C++ hang for new keywords) PR c++/38021 * parser.c (cp_parser_enum_specifier): After parsing :, parse definitely. Don't return early if type specifier is erroneous. * g++.dg/cpp0x/enum1.C: New test. From-SVN: r141739 --- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/parser.c | 23 +++++++++++++++-------- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp0x/enum1.C | 6 ++++++ 4 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/enum1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ec7a1aa5263..81941e262f1 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2008-11-10 Jakub Jelinek + + PR c++/38021 + * parser.c (cp_parser_enum_specifier): After parsing :, + parse definitely. Don't return early if type specifier + is erroneous. + 2008-11-06 David Edelsohn PR target/26397 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 40f2a3a11ec..c819082c781 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -11780,6 +11780,7 @@ cp_parser_enum_specifier (cp_parser* parser) tree type; tree attributes; bool scoped_enum_p = false; + bool has_underlying_type = false; tree underlying_type = NULL_TREE; /* Parse tentatively so that we can back up if we don't find a @@ -11805,7 +11806,7 @@ cp_parser_enum_specifier (cp_parser* parser) scoped_enum_p = true; } - + attributes = cp_parser_attributes_opt (parser); if (cp_lexer_next_token_is (parser->lexer, CPP_NAME)) @@ -11818,18 +11819,22 @@ cp_parser_enum_specifier (cp_parser* parser) { cp_decl_specifier_seq type_specifiers; + /* At this point this is surely not elaborated type specifier. */ + if (!cp_parser_parse_definitely (parser)) + return NULL_TREE; + if (cxx_dialect == cxx98) maybe_warn_cpp0x ("scoped enums"); /* Consume the `:'. */ cp_lexer_consume_token (parser->lexer); + has_underlying_type = true; + /* Parse the type-specifier-seq. */ cp_parser_type_specifier_seq (parser, /*is_condition=*/false, &type_specifiers); - if (type_specifiers.type == error_mark_node) - return error_mark_node; - + /* If that didn't work, stop. */ if (type_specifiers.type != error_mark_node) { @@ -11838,15 +11843,17 @@ cp_parser_enum_specifier (cp_parser* parser) if (underlying_type == error_mark_node) underlying_type = NULL_TREE; } - else - cp_parser_error (parser, "expected underlying type of enumeration"); } /* Look for the `{' but don't consume it yet. */ if (!cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE)) - cp_parser_simulate_error (parser); + { + cp_parser_error (parser, "expected %<{%>"); + if (has_underlying_type) + return NULL_TREE; + } - if (!cp_parser_parse_definitely (parser)) + if (!has_underlying_type && !cp_parser_parse_definitely (parser)) return NULL_TREE; /* Issue an error message if type-definitions are forbidden here. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b341ead6f0a..412c77abaee 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-11-10 Jakub Jelinek + + PR c++/38021 + * g++.dg/cpp0x/enum1.C: New test. + 2008-11-02 Ralph Loader PR middle-end/37807 diff --git a/gcc/testsuite/g++.dg/cpp0x/enum1.C b/gcc/testsuite/g++.dg/cpp0x/enum1.C new file mode 100644 index 00000000000..af691f028b1 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/enum1.C @@ -0,0 +1,6 @@ +// PR c++/38021 +// { dg-do compile } +// { dg-options "-std=gnu++0x" } + +enum : { }; // { dg-error "expected type-specifier" } +enum : 3 { }; // { dg-error "expected" } -- 2.30.2