Honor lex-params in %define lex_symbol mode.

[bison.git] / data / lalr1.cc

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(
       {
         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
 [        yyla.type = yytranslate_ (b4_c_function_call([yylex], [int],
                                     [[YYSTYPE*], [&yyla.value]][]dnl
 b4_locations_if([, [[location*], [&yyla.location]]])dnl