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

with the member "token".

diff --git a/ChangeLog b/ChangeLog
index ce2a3731646591653d1fd8ed543e07ee083b4a25..7708c89a95ed00652d6353a0d4156a0a1d360962 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * data/glr.cc: Remove dead code.
 2006-04-27  Akim Demaille  <akim@lrde.epita.fr>
 
        * data/glr.cc: Remove dead code.

diff --git a/data/lalr1.cc b/data/lalr1.cc
index d079933af5b82f4f8bee934a8c97d92b083ca4f6..8affc736095c4caa4c6a3feb14b466788761b890 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -262,8 +262,8 @@ b4_error_verbose_if([, int tok])[);
     virtual void yystack_print_ ();
 #endif
 
     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.
 
     /// \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
 
   /* 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
   {
     static
     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_)
-      return translate_table[token];
+    if ((unsigned int) t <= yyuser_token_number_max_)
+      return translate_table[t];

     else
       return yyundef_token_;
   }
     else
       return yyundef_token_;
   }