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

(yylex_): this.
Move the trace here.
Take the %name-prefix into account.
Reported by Alexandre Duret-Lutz.

diff --git a/ChangeLog b/ChangeLog
index 43cdc0085446611f00d3c7631cde68503e448ef6..3a3bb81da33da637da1cacc2f678579a42d460bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        Simplify the C++ parser constructor.

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 0ba7720d8e927dde460a95a2fead71521d318d7a..d81ab7a7bc2008595768f55470b74f74c28e1ce3 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -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
 }