From: Akim Demaille <akim@epita.fr>
Date: Wed, 22 Jun 2005 15:37:22 +0000 (+0000)
Subject: * data/lalr1.cc (yylex_): Honor %lex-param.
X-Git-Tag: BISON-2_1~120
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/99be023555b9091ce95d79c6fef81fe31c8586e5?ds=inline

* data/lalr1.cc (yylex_): Honor %lex-param.
---

diff --git a/ChangeLog b/ChangeLog
index aec1a9ad..7a9b5565 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-22  Akim Demaille  <akim@epita.fr>
+
+	* data/lalr1.cc (yylex_): Honor %lex-param.
+
 2005-06-22  Akim Demaille  <akim@epita.fr>
 
 	Start a set of simple examples.
diff --git a/data/lalr1.cc b/data/lalr1.cc
index 18388c34..ed311fd4 100644
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -838,11 +838,10 @@ void
 yy::]b4_parser_class_name[::yylex_ ()
 {
   YYCDEBUG << _("Reading a token: ");
-#if YYLSP_NEEDED
-  yylooka_ = yylex (&yylval, &yylloc);
-#else
-  yylooka_ = yylex (&yylval);
-#endif
+  yylooka_ = ]b4_c_function_call([yylex], [int],
+[[YYSTYPE*], [&yylval]][]dnl
+b4_location_if([, [[location*], [&yylloc]]])dnl
+m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;
 }
 
 // Generate an error message, and invoke error.