re PR c++/9188 ([New parser] Strange wording of error message)

	PR c++/9188
	* parser.c (cp_parser_type_parameter): Remove redundant `expect'
	in error message.
	(cp_parser_single_declaration): Likewise.

From-SVN: r63891

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5e04f442428cb7fef7e64e26e334ee4b75a444e3..8668f7889ad03f86d3b0f4f2472b6b0ba87f78c8 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-06  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+       PR c++/9188
+       * parser.c (cp_parser_type_parameter): Remove redundant `expect'
+       in error message.
+       (cp_parser_single_declaration): Likewise.
+
 2003-03-05  Jason Merrill  <jason@redhat.com>
 
        PR c++/9440

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index fb02453f55dc9583473d481c1a40f4fd2187fa35..e266938150941afc9d8ac2fc4a55e0843f73e18a 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -7754,7 +7754,7 @@ cp_parser_type_parameter (cp_parser* parser)
 
   /* Look for a keyword to tell us what kind of parameter this is.  */
   token = cp_parser_require (parser, CPP_KEYWORD, 
-                            "expected `class', `typename', or `template'");
+                            "`class', `typename', or `template'");
   if (!token)
     return error_mark_node;
 
@@ -13992,7 +13992,7 @@ cp_parser_single_declaration (cp_parser* parser,
   parser->qualifying_scope = NULL_TREE;
   parser->object_scope = NULL_TREE;
   /* Look for a trailing `;' after the declaration.  */
-  if (!cp_parser_require (parser, CPP_SEMICOLON, "expected `;'")
+  if (!cp_parser_require (parser, CPP_SEMICOLON, "`;'")
       && cp_parser_committed_to_tentative_parse (parser))
     cp_parser_skip_to_end_of_block_or_statement (parser);
   /* If it worked, set *FRIEND_P based on the DECL_SPECIFIERS.  */