Index: ChangeLog
from Akim Demaille <[EMAIL PROTECTED]>
* data/lalr1.cc (yylex_): Honor %lex-param.
Index: data/lalr1.cc
===================================================================
RCS file: /cvsroot/bison/bison/data/lalr1.cc,v
retrieving revision 1.86
diff -u -u -r1.86 lalr1.cc
--- data/lalr1.cc 30 May 2005 07:02:40 -0000 1.86
+++ data/lalr1.cc 22 Jun 2005 15:37:03 -0000
@@ -838,11 +838,10 @@
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.