* data/lalr1.cc (YYLLOC_DEFAULT): Fix its definition: be based on

[bison.git] / data / lalr1.cc

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 7ab5435a58de84b78ca9247c9ef8ec07f9cf4773..eb4376c04965df0d1fa9b23b2f57f01258b6d1f1 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -140,8 +140,7 @@ b4_syncline([@oline@], [@ofile@])],
 b4_syncline([@oline@], [@ofile@])[
 #ifndef YYLLOC_DEFAULT
 # define YYLLOC_DEFAULT(Current, Rhs, N) \
-   Current.last_line = Rhs[N].last_line; \
-   Current.last_column = Rhs[N].last_column;
+   Current.last = Rhs[N].last;
 #endif
 
 namespace yy
@@ -385,8 +384,10 @@ yy::]b4_parser_class_name[::parse ()
     goto yyacceptlab;
 
   /* Shift the lookahead token.  */
+#if YYDEBUG
   YYCDEBUG << "Shifting token " << looka_
-        << " (" << name_[ilooka_] << "), ";
+           << " (" << name_[ilooka_] << "), ";
+#endif
 
   /* Discard the token being shifted unless it is eof.  */
   if (looka_ != eof_)