Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-19 01:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
(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
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2004-12-15 Akim Demaille <akim@epita.fr>
* data/lalr1.cc (lex_): Rename as...
(yylex_): this.
Move the trace here.
Take the %name-prefix into account.
Reported by Alexandre Duret-Lutz.
2004-12-15 Akim Demaille <akim@epita.fr> 2004-12-15 Akim Demaille <akim@epita.fr>
Simplify the C++ parser constructor. Simplify the C++ parser constructor.

14
data/lalr1.cc
View File

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