* data/lalr1.cc (lex_): Rename as...

(yylex_): this.
Move the trace here.
Take the %name-prefix into account.
Reported by Alexandre Duret-Lutz.
This commit is contained in:
Akim Demaille
2004-12-15 16:30:15 +00:00
parent a3cb624893
commit 2e1f5829ee
2 changed files with 14 additions and 8 deletions

View File

@@ -243,7 +243,7 @@ namespace yy
private:
virtual void lex_ ();
virtual void yylex_ ();
virtual void error_ ();
virtual void report_syntax_error_ ();
#if YYDEBUG
@@ -521,10 +521,7 @@ yybackup:
/* Read a look-ahead token. */
if (looka_ == empty_)
{
YYCDEBUG << "Reading a token: ";
lex_ ();
}
yylex_ ();
/* Convert token to internal form. */
if (looka_ <= eof_)
@@ -757,12 +754,13 @@ yyabortlab:
}
void
yy::]b4_parser_class_name[::lex_ ()
yy::]b4_parser_class_name[::yylex_ ()
{
YYCDEBUG << "Reading a token: ";
#if YYLSP_NEEDED
looka_ = yylex (&value, &location);
looka_ = ]m4_default(b4_prefix, [yy])[lex (&value, &location);
#else
looka_ = yylex (&value);
looka_ = ]m4_default(b4_prefix, [yy])[lex (&value);
#endif
}