Honor lex-params in %define lex_symbol mode.

	* data/lalr1.cc: Use b4_lex_param.

diff --git a/ChangeLog b/ChangeLog
index 23fd42e40418e2893972326f15b5f8216a825e48..0ba320e21a59a5e95e1955bd44f08d2820f18b8e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-13  Akim Demaille  <demaille@gostai.com>
+
+       Honor lex-params in %define lex_symbol mode.
+       * data/lalr1.cc: Use b4_lex_param.
+
 2008-11-13  Akim Demaille  <demaille@gostai.com>
 
        Simplify names.

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 10669ff49736e50036e642f4b45b0078bd8e7ef7..c2c634cf9459e8785792c1322941a0bcbd26bca8 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -1197,7 +1197,8 @@ m4_popdef([b4_at_dollar])])dnl
       {
         YYCDEBUG << "Reading a token: ";
 ]b4_lex_symbol_if(
-[        yyla = yylex();],
+[        yyla = b4_c_function_call([yylex], [symbol_type],
+                                   m4_ifdef([b4_lex_param], b4_lex_param));],
 [        yyla.type = yytranslate_ (b4_c_function_call([yylex], [int],
                                     [[YYSTYPE*], [&yyla.value]][]dnl
 b4_locations_if([, [[location*], [&yyla.location]]])dnl