parser.c (cp_lexer_next_token_is_keyword): Simplify.

	* parser.c (cp_lexer_next_token_is_keyword): Simplify.

	* parser.c (clear_decl_specs): Remove prototype.

	* parser.c (cp_parser_expression_fn): Remove.

From-SVN: r110039

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2a9928e..42c69e8 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,11 @@
 2006-01-20  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
+       * parser.c (cp_lexer_next_token_is_keyword): Simplify.
+
+       * parser.c (clear_decl_specs): Remove prototype.
+
+       * parser.c (cp_parser_expression_fn): Remove.
+
        * call.c (add_builtin_candidates): Remove superfluous return.
        * name-lookup.c (do_toplevel_using_decl): Likewise.
        * parser.c (cp_parser_type_specifier_seq): Likewise.

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 814ee5a..148eb1d 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -497,12 +497,7 @@ cp_lexer_next_token_is_not (cp_lexer* lexer, enum cpp_ttype type)
 static inline bool
 cp_lexer_next_token_is_keyword (cp_lexer* lexer, enum rid keyword)
 {
-  cp_token *token;
-
-  /* Peek at the next token.  */
-  token = cp_lexer_peek_token (lexer);
-  /* Check to see if it is the indicated keyword.  */
-  return token->keyword == keyword;
+  return cp_lexer_peek_token (lexer)->keyword == keyword;
 }
 
 /* Return a pointer to the Nth token in the token stream.  If N is 1,
@@ -757,9 +752,6 @@ cp_token_cache_new (cp_token *first, cp_token *last)
 \f
 /* Decl-specifiers.  */
 
-static void clear_decl_specs
-  (cp_decl_specifier_seq *);
-
 /* Set *DECL_SPECS to represent an empty decl-specifier-seq.  */
 
 static void
@@ -1352,9 +1344,6 @@ typedef struct cp_parser GTY(())
   unsigned num_template_parameter_lists;
 } cp_parser;
 
-/* The type of a function that parses some kind of expression.  */
-typedef tree (*cp_parser_expression_fn) (cp_parser *);
-
 /* Prototypes.  */
 
 /* Constructors and destructors.  */