From 32c96bd755ac7ddc9fa26c0cf1d5eddd181bc51a Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 11 May 2006 06:18:34 +0000 Subject: [PATCH] * data/lalr1.cc (yytranslate_): Rename token as t to avoid clashes with the member "token". --- ChangeLog | 5 +++++ data/lalr1.cc | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce2a3731..7708c89a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-05-11 Akim Demaille + + * data/lalr1.cc (yytranslate_): Rename token as t to avoid clashes + with the member "token". + 2006-04-27 Akim Demaille * data/glr.cc: Remove dead code. diff --git a/data/lalr1.cc b/data/lalr1.cc index d079933a..8affc736 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -262,8 +262,8 @@ b4_error_verbose_if([, int tok])[); virtual void yystack_print_ (); #endif - /// Convert a scanner token number to a symbol number. - token_number_type yytranslate_ (int token); + /// Convert a scanner token number \a t to a symbol number. + token_number_type yytranslate_ (int t); /// \brief Reclaim the memory associated to a symbol. /// \param yymsg Why this token is reclaimed. @@ -1048,7 +1048,7 @@ b4_error_verbose_if([, int tok])[) /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ ]b4_parser_class_name[::token_number_type - ]b4_parser_class_name[::yytranslate_ (int token) + ]b4_parser_class_name[::yytranslate_ (int t) { static const token_number_type @@ -1056,8 +1056,8 @@ b4_error_verbose_if([, int tok])[) { ]b4_translate[ }; - if ((unsigned int) token <= yyuser_token_number_max_) - return translate_table[token]; + if ((unsigned int) t <= yyuser_token_number_max_) + return translate_table[t]; else return yyundef_token_; } -- 2.45.2