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

diff --git a/ChangeLog b/ChangeLog
index aec1a9ad7cf05acce1baca4b469d06661d99be59..7a9b556576a47e8734cd519330870e7f5cb1412c 100644 (file)
--- 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.
 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 18388c34aea619b09f4251726276df0533b0cab1..ed311fd4e5e5b4e47ef606965fb54ca0e824f796 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -838,11 +838,10 @@ void
 yy::]b4_parser_class_name[::yylex_ ()
 {
   YYCDEBUG << _("Reading a token: ");
 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.
 }
 
 // Generate an error message, and invoke error.