* parser.c (cp_parser_template_parameter_list): Simplify.

From-SVN: r134126

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0b7fc4ccc84d42b1c6691a59c106cedd9eea88f9..c344d56081c96087705f33146be061cae1058ce7 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-09  Volker Reichelt  <v.reichelt@netcologne.de>
+
+       * parser.c (cp_parser_template_parameter_list): Simplify.
+
 2008-04-07  James E. Wilson  <wilson@tuliptree.org>
 
        * pt.c (tsubst_copy, case SIZEOF_EXPR): Initialize len.

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 85295eb743c18f9de4fc2867d11a4d6ef8f6ce35..fd05bee6872b9ccddb04dcefe35d68a884d090fe 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -9303,7 +9303,6 @@ cp_parser_template_parameter_list (cp_parser* parser)
   while (true)
     {
       tree parameter;
-      cp_token *token;
       bool is_non_type;
       bool is_parameter_pack;
 
@@ -9324,10 +9323,8 @@ cp_parser_template_parameter_list (cp_parser* parser)
          parameter_list = chainon (parameter_list, err_parm);
        }
 
-      /* Peek at the next token.  */
-      token = cp_lexer_peek_token (parser->lexer);
-      /* If it's not a `,', we're done.  */
-      if (token->type != CPP_COMMA)
+      /* If the next token is not a `,', we're done.  */
+      if (cp_lexer_next_token_is_not (parser->lexer, CPP_COMMA))
        break;
       /* Otherwise, consume the `,' token.  */
       cp_lexer_consume_token (parser->lexer);