Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-18 16:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

* data/lalr1.cc (yytranslate_): Rename token as t to avoid clashes

Browse Source 
with the member "token".
This commit is contained in:
Akim Demaille
2006-05-11 06:18:34 +00:00
parent 193d7c7054
commit 32c96bd755
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2006-05-11 Akim Demaille <akim@lrde.epita.fr>
* data/lalr1.cc (yytranslate_): Rename token as t to avoid clashes
with the member "token".
2006-04-27 Akim Demaille <akim@lrde.epita.fr> 2006-04-27 Akim Demaille <akim@lrde.epita.fr>
* data/glr.cc: Remove dead code. * data/glr.cc: Remove dead code.

10
data/lalr1.cc
View File

@@ -262,8 +262,8 @@ b4_error_verbose_if([, int tok])[);
virtual void yystack_print_ (); virtual void yystack_print_ ();
#endif #endif
/// Convert a scanner token number to a symbol number. /// Convert a scanner token number \a t to a symbol number.
token_number_type yytranslate_ (int token); token_number_type yytranslate_ (int t);
/// \brief Reclaim the memory associated to a symbol. /// \brief Reclaim the memory associated to a symbol.
/// \param yymsg Why this token is reclaimed. /// \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. */ /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
]b4_parser_class_name[::token_number_type ]b4_parser_class_name[::token_number_type
]b4_parser_class_name[::yytranslate_ (int token) ]b4_parser_class_name[::yytranslate_ (int t)
{ {
static static
const token_number_type const token_number_type
@@ -1056,8 +1056,8 @@ b4_error_verbose_if([, int tok])[)
{ {
]b4_translate[ ]b4_translate[
}; };
if ((unsigned int) token <= yyuser_token_number_max_) if ((unsigned int) t <= yyuser_token_number_max_)
return translate_table[token]; return translate_table[t];
else else
return yyundef_token_; return yyundef_token_;
} }