From: Akim Demaille <demaille@gostai.com>
Date: Tue, 26 Aug 2008 20:09:30 +0000 (+0200)
Subject: Honor lex-params in %define lex_symbol mode.
X-Git-Tag: v2.7.90~1060
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/dd735e4ee62c176761d8128063b0e0027fc239c5

Honor lex-params in %define lex_symbol mode.

	* data/lalr1.cc: Use b4_lex_param.
---

diff --git a/ChangeLog b/ChangeLog
index 23fd42e4..0ba320e2 100644
--- 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 10669ff4..c2c634cf 100644
--- 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