* data/lalr1.cc: Use temporary variables instead of casts to

change integer types.
Suggested by Paul Eggert.

diff --git a/ChangeLog b/ChangeLog
index 2abe9c76940eeddab6ff66d12032cb2a7eb02355..0d891aa3f788b027bbb773afb9309afed2b90a6c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-21  Akim Demaille  <akim@epita.fr>
+
+       * data/lalr1.cc: Use temporary variables instead of casts to
+       change integer types.
+       Suggested by Paul Eggert.
+
 2003-02-21  Akim Demaille  <akim@epita.fr>
 
        * doc/bison.texinfo: Use "location" consistently to refer to @n,

diff --git a/data/lalr1.cc b/data/lalr1.cc
index e1ad791ae7e5cc01261f7f0ae9419c1bd4e05d21..2ef527b6e0547391ad94693c2d14f2de9942673f 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -432,8 +432,9 @@ yy::]b4_parser_class_name[::parse ()
       // Short files will use "unsigned char" for line numbers,
       // in which case they will be output as character litterals
       // by "<<".
+      unsigned yylineno = rline_[n_];
       YYCDEBUG << "Reducing via rule " << n_ - 1
-               << " (line " << static_cast <unsigned> (rline_[n_]) << "), ";
+               << " (line " << yylineno << "), ";
       for (]b4_int_type_for([b4_prhs])[ i = prhs_[n_];
           0 <= rhs_[i]; ++i)
        YYCDEBUG << name_[rhs_[i]] << ' ';
@@ -923,7 +924,9 @@ namespace yy
     /** \brief (column related) Advance to the COLUMNS next columns. */
     inline void columns (int columns = 1)
     {
-      if (int (initial_column) < columns + int (column))
+      int leftmost = initial_column;
+      int current  = column;
+      if (leftmost <= current + columns)
        column += columns;
       else
        column = initial_column;