parser.c (cp_parser_elaborated_type_specifier): Add fix-it to diagnostic of…

parser.c (cp_parser_elaborated_type_specifier): Add fix-it to diagnostic of invalid class/struct keyword after enum.

        * parser.c (cp_parser_elaborated_type_specifier): Add fix-it to
        diagnostic of invalid class/struct keyword after enum.

        * g++.dg/cpp0x/enum34.C: New test.

From-SVN: r247254

gcc/cp/ChangeLog

+2017-04-25  Volker Reichelt  <v.reichelt@netcologne.de>
+
+	* parser.c (cp_parser_elaborated_type_specifier): Add fix-it to
+	diagnostic of invalid class/struct keyword after enum.
+
 2017-04-25  David Malcolm  <dmalcolm@redhat.com>
 
 	* parser.c (cp_parser_member_declaration): Add fix-it hint

gcc/cp/parser.c

@@ -17270,12 +17270,16 @@ cp_parser_elaborated_type_specifier (cp_parser* parser,
       tag_type = enum_type;
       /* Issue a warning if the `struct' or `class' key (for C++0x scoped
 	 enums) is used here.  */
-      if (cp_lexer_next_token_is_keyword (parser->lexer, RID_CLASS)
-	  || cp_lexer_next_token_is_keyword (parser->lexer, RID_STRUCT))
+      cp_token *token = cp_lexer_peek_token (parser->lexer);
+      if (cp_parser_is_keyword (token, RID_CLASS)
+	  || cp_parser_is_keyword (token, RID_STRUCT))
 	{
-	    pedwarn (input_location, 0, "elaborated-type-specifier "
-		      "for a scoped enum must not use the %qD keyword",
-		      cp_lexer_peek_token (parser->lexer)->u.value);
+	  gcc_rich_location richloc (token->location);
+	  richloc.add_range (input_location, false);
+	  richloc.add_fixit_remove ();
+	  pedwarn_at_rich_loc (&richloc, 0, "elaborated-type-specifier for "
+			       "a scoped enum must not use the %qD keyword",
+			       token->u.value);
 	  /* Consume the `struct' or `class' and parse it anyway.  */
 	  cp_lexer_consume_token (parser->lexer);
 	}

gcc/testsuite/ChangeLog

+2017-04-25  Volker Reichelt  <v.reichelt@netcologne.de>
+
+	* g++.dg/cpp0x/enum34.C: New test.
+
 2017-04-25  Tom de Vries  <tom@codesourcery.com>
 
 	* lib/gcc-dg.exp (cleanup-after-saved-dg-test): Cleanup line number

gcc/testsuite/g++.dg/cpp0x/enum34.C

+// { dg-options "-fdiagnostics-show-caret" }
+// { dg-do compile { target c++11 } }
+
+enum class E;
+
+enum class E e;  /* { dg-warning "scoped enum must not use" }
+  { dg-begin-multiline-output "" }
+ enum class E e;
+ ~~~~ ^~~~~
+      -----
+  { dg-end-multiline-output "" } */